| Index: cc/layer_tree_host.cc
|
| diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
|
| index a571506afd5ed33242544ba619e3a3422d4e20fb..236a5884167308c9ccd4639c2fdb968949bbe2f5 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");
|
|
|