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

Unified Diff: cc/layer_tree_host.cc

Issue 11186039: Move CC switches to cc/switches.h. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix ChromeOS and rename CCSettings to Settings Created 8 years, 2 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: cc/layer_tree_host.cc
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index 8d4d63b47f56d07804af7aa56f7a177aad7fba68..6b251fa6dad3586f7a488005697f073905a349cc 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -546,7 +546,7 @@ void CCLayerTreeHost::updateLayers(LayerChromium* rootLayer, CCTextureUpdateQueu
LayerList updateList;
{
- if (CCSettings::pageScalePinchZoomEnabled()) {
+ if (Settings::pageScalePinchZoomEnabled()) {
LayerChromium* rootScroll = findFirstScrollableLayer(rootLayer);
if (rootScroll)
rootScroll->setImplTransform(m_implTransform);
@@ -777,7 +777,7 @@ void CCLayerTreeHost::setDeviceScaleFactor(float deviceScaleFactor)
void CCLayerTreeHost::animateLayers(double monotonicTime)
{
- if (!CCSettings::acceleratedAnimationEnabled() || !m_needsAnimateLayers)
+ if (!Settings::acceleratedAnimationEnabled() || !m_needsAnimateLayers)
return;
TRACE_EVENT0("cc", "CCLayerTreeHostImpl::animateLayers");

Powered by Google App Engine
This is Rietveld 408576698