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

Unified Diff: Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp

Issue 10690121: Merge 121076 - [chromium] LayerRendererChromium is not getting visibility messages in single thread… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp (revision 122257)
+++ Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp (working copy)
@@ -26,6 +26,8 @@
#include "cc/CCSchedulerStateMachine.h"
+#include <stdio.h>
+
namespace WebCore {
CCSchedulerStateMachine::CCSchedulerStateMachine()
@@ -281,6 +283,12 @@
m_commitState = COMMIT_STATE_UPDATING_RESOURCES;
}
+void CCSchedulerStateMachine::beginFrameAborted()
+{
+ ASSERT(m_commitState == COMMIT_STATE_FRAME_IN_PROGRESS);
+ m_commitState = COMMIT_STATE_IDLE;
+}
+
void CCSchedulerStateMachine::beginUpdateMoreResourcesComplete(bool morePending)
{
ASSERT(m_commitState == COMMIT_STATE_UPDATING_RESOURCES);

Powered by Google App Engine
This is Rietveld 408576698