[cc] Fold more update calls into updateDrawProperties

cc/layer_tree_host_impl.cc

Index: cc/layer_tree_host_impl.cc
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index 01c2d2847dfa3c86a2ee4e9006691343ebad4c81..0131d3cc8e9ee0fc8488c6ebda45139c171d8de5 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -380,13 +380,6 @@ void LayerTreeHostImpl::trackDamageForAllSurfaces(LayerImpl* rootDrawLayer, cons
     }
 }
 
-void LayerTreeHostImpl::updateRootScrollLayerImplTransform()
-{
-    if (rootScrollLayer()) {
-        rootScrollLayer()->setImplTransform(implTransform());
-    }
-}
-
 void LayerTreeHostImpl::updateDrawProperties()
 {
     if (!needsUpdateDrawProperties())
@@ -398,20 +391,16 @@ void LayerTreeHostImpl::updateDrawProperties()
     if (!rootLayer())
         return;
 
-    calculateRenderSurfaceLayerList(m_renderSurfaceLayerList);
-}
+    if (!m_renderer) // For maxTextureSize.
+      return;
 
-void LayerTreeHostImpl::calculateRenderSurfaceLayerList(LayerList& renderSurfaceLayerList)
-{
-    DCHECK(renderSurfaceLayerList.empty());
-    DCHECK(rootLayer());
-    DCHECK(m_renderer); // For maxTextureSize.
-    {
-        updateRootScrollLayerImplTransform();
+    if (rootScrollLayer())
+      rootScrollLayer()->setImplTransform(implTransform());
 
-        TRACE_EVENT0("cc", "LayerTreeHostImpl::calcDrawEtc");
-        float pageScaleFactor = m_pinchZoomViewport.pageScaleFactor();
-        LayerTreeHostCommon::calculateDrawProperties(rootLayer(), deviceViewportSize(), m_deviceScaleFactor, pageScaleFactor, rendererCapabilities().maxTextureSize, renderSurfaceLayerList);
+    {
+      TRACE_EVENT0("cc", "LayerTreeHostImpl::calcDrawEtc");
+      float pageScaleFactor = m_pinchZoomViewport.pageScaleFactor();
+      LayerTreeHostCommon::calculateDrawProperties(rootLayer(), deviceViewportSize(), m_deviceScaleFactor, pageScaleFactor, rendererCapabilities().maxTextureSize, m_renderSurfaceLayerList);
     }
 }
 
@@ -512,6 +501,9 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)
     DCHECK(frame.renderPasses.empty());
 
     updateDrawProperties();
+    if (!canDraw())
+      return false;
+
     trackDamageForAllSurfaces(rootLayer(), *frame.renderSurfaceLayerList);
 
     TRACE_EVENT1("cc", "LayerTreeHostImpl::calculateRenderPasses", "renderSurfaceLayerList.size()", static_cast<long long unsigned>(frame.renderSurfaceLayerList->size()));
@@ -766,7 +758,6 @@ void LayerTreeHostImpl::removeRenderPasses(RenderPassCuller culler, FrameData& f
 bool LayerTreeHostImpl::prepareToDraw(FrameData& frame)
 {
     TRACE_EVENT0("cc", "LayerTreeHostImpl::prepareToDraw");
-    DCHECK(canDraw());
 
     if (m_tileManager)
         m_tileManager->CheckForCompletedSetPixels();
@@ -1190,25 +1181,7 @@ void LayerTreeHostImpl::setNeedsRedraw()
 
 bool LayerTreeHostImpl::ensureRenderSurfaceLayerList()
 {
-    // TODO(enne): See http://crbug.com/164949.  This function should really
-    // just call updateDrawProperties(), but that breaks a number of
-    // impl transform tests that don't expect the tree to be updated.
-    if (!rootLayer())
-        return false;
-    if (!m_renderer)
-        return false;
-
-    // We need both a non-empty render surface layer list and a root render
-    // surface to be able to iterate over the visible layers.
-    if (m_renderSurfaceLayerList.size() && rootLayer()->renderSurface())
-        return true;
-
-    // If we are called after setRootLayer() but before prepareToDraw(), we need
-    // to recalculate the visible layers. This prevents being unable to scroll
-    // during part of a commit.
-    setNeedsUpdateDrawProperties();
     updateDrawProperties();
-
     return m_renderSurfaceLayerList.size();
 }