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

Side by Side Diff: cc/CCSchedulerStateMachine.cpp

Issue 10879109: Update libcc / bindings snapshot to WebKit r126830 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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/CCRenderSurfaceTest.cpp ('k') | cc/CCSchedulerStateMachineTest.cpp » ('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 "config.h" 5 #include "config.h"
6 6
7 #include "CCSchedulerStateMachine.h" 7 #include "CCSchedulerStateMachine.h"
8 8
9 namespace WebCore { 9 namespace WebCore {
10 10
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 void CCSchedulerStateMachine::beginFrameComplete() 276 void CCSchedulerStateMachine::beginFrameComplete()
277 { 277 {
278 ASSERT(m_commitState == COMMIT_STATE_FRAME_IN_PROGRESS); 278 ASSERT(m_commitState == COMMIT_STATE_FRAME_IN_PROGRESS);
279 m_commitState = COMMIT_STATE_UPDATING_RESOURCES; 279 m_commitState = COMMIT_STATE_UPDATING_RESOURCES;
280 } 280 }
281 281
282 void CCSchedulerStateMachine::beginFrameAborted() 282 void CCSchedulerStateMachine::beginFrameAborted()
283 { 283 {
284 ASSERT(m_commitState == COMMIT_STATE_FRAME_IN_PROGRESS); 284 ASSERT(m_commitState == COMMIT_STATE_FRAME_IN_PROGRESS);
285 m_commitState = COMMIT_STATE_IDLE; 285 m_commitState = COMMIT_STATE_IDLE;
286 setNeedsCommit();
286 } 287 }
287 288
288 void CCSchedulerStateMachine::beginUpdateMoreResourcesComplete(bool morePending) 289 void CCSchedulerStateMachine::beginUpdateMoreResourcesComplete(bool morePending)
289 { 290 {
290 ASSERT(m_commitState == COMMIT_STATE_UPDATING_RESOURCES); 291 ASSERT(m_commitState == COMMIT_STATE_UPDATING_RESOURCES);
291 ASSERT(m_updateMoreResourcesPending); 292 ASSERT(m_updateMoreResourcesPending);
292 m_updateMoreResourcesPending = false; 293 m_updateMoreResourcesPending = false;
293 if (!morePending) 294 if (!morePending)
294 m_commitState = COMMIT_STATE_READY_TO_COMMIT; 295 m_commitState = COMMIT_STATE_READY_TO_COMMIT;
295 } 296 }
(...skipping 11 matching lines...) Expand all
307 m_contextState = CONTEXT_ACTIVE; 308 m_contextState = CONTEXT_ACTIVE;
308 setNeedsCommit(); 309 setNeedsCommit();
309 } 310 }
310 311
311 void CCSchedulerStateMachine::setMaximumNumberOfFailedDrawsBeforeDrawIsForced(in t numDraws) 312 void CCSchedulerStateMachine::setMaximumNumberOfFailedDrawsBeforeDrawIsForced(in t numDraws)
312 { 313 {
313 m_maximumNumberOfFailedDrawsBeforeDrawIsForced = numDraws; 314 m_maximumNumberOfFailedDrawsBeforeDrawIsForced = numDraws;
314 } 315 }
315 316
316 } 317 }
OLDNEW
« no previous file with comments | « cc/CCRenderSurfaceTest.cpp ('k') | cc/CCSchedulerStateMachineTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698