| 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");
|
|
|