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

Unified Diff: cc/scheduler_state_machine.h

Issue 11571049: cc: Make the scheduler compositeAndReadback flow not race with WAITING_FOR_FIRST_DRAW (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indents Created 8 years 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
« no previous file with comments | « cc/layer_tree_host_unittest.cc ('k') | cc/scheduler_state_machine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scheduler_state_machine.h
diff --git a/cc/scheduler_state_machine.h b/cc/scheduler_state_machine.h
index 51b8dddc7b658106aa8a4c2014766f47d4c4a087..1c3905899b4d8755895d5817bbf52dd436d342bc 100644
--- a/cc/scheduler_state_machine.h
+++ b/cc/scheduler_state_machine.h
@@ -31,7 +31,8 @@ public:
COMMIT_STATE_FRAME_IN_PROGRESS,
COMMIT_STATE_READY_TO_COMMIT,
COMMIT_STATE_WAITING_FOR_FIRST_DRAW,
- };
+ COMMIT_STATE_WAITING_FOR_FIRST_FORCED_DRAW,
+ };
enum TextureState {
LAYER_TEXTURE_STATE_UNLOCKED,
@@ -47,7 +48,8 @@ public:
bool commitPending() const
{
- return m_commitState != COMMIT_STATE_IDLE;
+ return m_commitState == COMMIT_STATE_FRAME_IN_PROGRESS ||
+ m_commitState == COMMIT_STATE_READY_TO_COMMIT;
}
bool redrawPending() const { return m_needsRedraw; }
« no previous file with comments | « cc/layer_tree_host_unittest.cc ('k') | cc/scheduler_state_machine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698