Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(484)

Side by Side Diff: cc/scheduler.cc

Issue 12022043: cc: Fix inappropriate use of term "texture". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/InitializeTile/UploadTile/ and s/CompletedSetPixels/CompletedTileUploads/ Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/scheduler.h ('k') | cc/scheduler_state_machine.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/scheduler.h" 5 #include "cc/scheduler.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 m_stateMachine.setNeedsForcedCommit(); 65 m_stateMachine.setNeedsForcedCommit();
66 processScheduledActions(); 66 processScheduledActions();
67 } 67 }
68 68
69 void Scheduler::setNeedsRedraw() 69 void Scheduler::setNeedsRedraw()
70 { 70 {
71 m_stateMachine.setNeedsRedraw(); 71 m_stateMachine.setNeedsRedraw();
72 processScheduledActions(); 72 processScheduledActions();
73 } 73 }
74 74
75 void Scheduler::didSwapUseIncompleteTexture() 75 void Scheduler::didSwapUseIncompleteTile()
76 { 76 {
77 m_stateMachine.didSwapUseIncompleteTexture(); 77 m_stateMachine.didSwapUseIncompleteTile();
78 processScheduledActions(); 78 processScheduledActions();
79 } 79 }
80 80
81 void Scheduler::setNeedsForcedRedraw() 81 void Scheduler::setNeedsForcedRedraw()
82 { 82 {
83 m_stateMachine.setNeedsForcedRedraw(); 83 m_stateMachine.setNeedsForcedRedraw();
84 processScheduledActions(); 84 processScheduledActions();
85 } 85 }
86 86
87 void Scheduler::setMainThreadNeedsLayerTextures() 87 void Scheduler::setMainThreadNeedsLayerTextures()
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 176
177 switch (action) { 177 switch (action) {
178 case SchedulerStateMachine::ACTION_NONE: 178 case SchedulerStateMachine::ACTION_NONE:
179 break; 179 break;
180 case SchedulerStateMachine::ACTION_BEGIN_FRAME: 180 case SchedulerStateMachine::ACTION_BEGIN_FRAME:
181 m_client->scheduledActionBeginFrame(); 181 m_client->scheduledActionBeginFrame();
182 break; 182 break;
183 case SchedulerStateMachine::ACTION_COMMIT: 183 case SchedulerStateMachine::ACTION_COMMIT:
184 m_client->scheduledActionCommit(); 184 m_client->scheduledActionCommit();
185 break; 185 break;
186 case SchedulerStateMachine::ACTION_CHECK_FOR_NEW_TEXTURES: 186 case SchedulerStateMachine::ACTION_CHECK_FOR_COMPLETED_TILE_UPLOADS:
187 m_client->scheduledActionCheckForCompletedTextures(); 187 m_client->scheduledActionCheckForCompletedTileUploads();
188 break; 188 break;
189 case SchedulerStateMachine::ACTION_ACTIVATE_PENDING_TREE_IF_NEEDED: 189 case SchedulerStateMachine::ACTION_ACTIVATE_PENDING_TREE_IF_NEEDED:
190 m_client->scheduledActionActivatePendingTreeIfNeeded(); 190 m_client->scheduledActionActivatePendingTreeIfNeeded();
191 break; 191 break;
192 case SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE: { 192 case SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE: {
193 ScheduledActionDrawAndSwapResult result = m_client->scheduledActionD rawAndSwapIfPossible(); 193 ScheduledActionDrawAndSwapResult result = m_client->scheduledActionD rawAndSwapIfPossible();
194 m_stateMachine.didDrawIfPossibleCompleted(result.didDraw); 194 m_stateMachine.didDrawIfPossibleCompleted(result.didDraw);
195 if (result.didSwap) 195 if (result.didSwap)
196 m_frameRateController->didBeginFrame(); 196 m_frameRateController->didBeginFrame();
197 break; 197 break;
(...skipping 12 matching lines...) Expand all
210 } 210 }
211 action = m_stateMachine.nextAction(); 211 action = m_stateMachine.nextAction();
212 } 212 }
213 213
214 // Activate or deactivate the frame rate controller. 214 // Activate or deactivate the frame rate controller.
215 m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded()); 215 m_frameRateController->setActive(m_stateMachine.vsyncCallbackNeeded());
216 m_client->didAnticipatedDrawTimeChange(m_frameRateController->nextTickTime() ); 216 m_client->didAnticipatedDrawTimeChange(m_frameRateController->nextTickTime() );
217 } 217 }
218 218
219 } // namespace cc 219 } // namespace cc
OLDNEW
« no previous file with comments | « cc/scheduler.h ('k') | cc/scheduler_state_machine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698