Index: cc/scheduler_state_machine.cc |
diff --git a/cc/scheduler_state_machine.cc b/cc/scheduler_state_machine.cc |
index f9d8cbc8f5b90b834ab8a1102f5de8b3b9384221..60a1ce9a3a1dffb0892ebf0fc45e3f64660f43bf 100644 |
--- a/cc/scheduler_state_machine.cc |
+++ b/cc/scheduler_state_machine.cc |
@@ -6,11 +6,13 @@ |
#include "base/logging.h" |
#include "base/stringprintf.h" |
+#include "cc/layer_tree_settings.h" |
namespace cc { |
-SchedulerStateMachine::SchedulerStateMachine() |
- : m_commitState(COMMIT_STATE_IDLE) |
+SchedulerStateMachine::SchedulerStateMachine(const LayerTreeSettings &layerTreeSettings) |
nduca
2013/01/15 01:54:54
I'm not liking the machine having access to all th
brianderson
2013/01/15 02:01:56
Sounds good.
|
+ : m_layerTreeSettings(layerTreeSettings) |
+ , m_commitState(COMMIT_STATE_IDLE) |
, m_currentFrameNumber(0) |
, m_lastFrameNumberWhereDrawWasCalled(-1) |
, m_lastFrameNumberWhereTreeActivationAttempted(-1) |
@@ -209,7 +211,8 @@ void SchedulerStateMachine::updateState(Action action) |
m_commitState = COMMIT_STATE_WAITING_FOR_FIRST_FORCED_DRAW; |
else |
m_commitState = COMMIT_STATE_WAITING_FOR_FIRST_DRAW; |
- m_needsRedraw = true; |
+ if (!m_layerTreeSettings.implSidePainting) |
+ m_needsRedraw = true; |
if (m_drawIfPossibleFailed) |
m_lastFrameNumberWhereDrawWasCalled = -1; |