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

Unified Diff: cc/scheduler_state_machine.cc

Issue 11361223: cc: Remove cc::settings, move them to LayerTreeSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Using WebLayerTreeSettings for things WebKit can set Created 8 years, 1 month 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: cc/scheduler_state_machine.cc
diff --git a/cc/scheduler_state_machine.cc b/cc/scheduler_state_machine.cc
index d0a3577074748461f950e92409b293fc7b8fcbee..887b988777266a0210cb243bcf544a241a2577de 100644
--- a/cc/scheduler_state_machine.cc
+++ b/cc/scheduler_state_machine.cc
@@ -6,7 +6,6 @@
#include "base/logging.h"
#include "base/stringprintf.h"
-#include "cc/settings.h"
namespace cc {
@@ -29,6 +28,7 @@ SchedulerStateMachine::SchedulerStateMachine()
, m_drawIfPossibleFailed(false)
, m_textureState(LAYER_TEXTURE_STATE_UNLOCKED)
, m_contextState(CONTEXT_ACTIVE)
+ , m_settingsJankInsteadOfCheckerboard(false)
{
}
@@ -262,7 +262,7 @@ void SchedulerStateMachine::didDrawIfPossibleCompleted(bool success)
m_needsRedraw = true;
m_needsCommit = true;
m_consecutiveFailedDraws++;
- if (!Settings::jankInsteadOfCheckerboard() && m_consecutiveFailedDraws >= m_maximumNumberOfFailedDrawsBeforeDrawIsForced) {
+ if (!m_settingsJankInsteadOfCheckerboard && m_consecutiveFailedDraws >= m_maximumNumberOfFailedDrawsBeforeDrawIsForced) {
m_consecutiveFailedDraws = 0;
// We need to force a draw, but it doesn't make sense to do this until
// we've committed and have new textures.

Powered by Google App Engine
This is Rietveld 408576698