[cc] Fold more update calls into updateDrawProperties

cc/layer_tree_host_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer_tree_host_impl.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
@@ skipping 362 matching lines @@
     // damage rect. The root damage rect is then used to scissor each surface.
 
     for (int surfaceIndex = renderSurfaceLayerList.size() - 1; surfaceIndex >= 0 ; --surfaceIndex) {
         LayerImpl* renderSurfaceLayer = renderSurfaceLayerList[surfaceIndex];
         RenderSurfaceImpl* renderSurface = renderSurfaceLayer->renderSurface();
         DCHECK(renderSurface);
         renderSurface->damageTracker()->updateDamageTrackingState(renderSurface->layerList(), renderSurfaceLayer->id(), renderSurface->surfacePropertyChangedOnlyFromDescendant(), renderSurface->contentRect(), renderSurfaceLayer->maskLayer(), renderSurfaceLayer->filters(), renderSurfaceLayer->filter().get());
     }
 }
 
-void LayerTreeHostImpl::updateRootScrollLayerImplTransform()
-{
-    if (rootScrollLayer()) {
-        rootScrollLayer()->setImplTransform(implTransform());
-    }
-}
-
 void LayerTreeHostImpl::updateDrawProperties()
 {
     if (!needsUpdateDrawProperties())
         return;
 
     m_renderSurfaceLayerList.clear();
     m_needsUpdateDrawProperties = false;
 
     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.
+    if (rootScrollLayer())
+      rootScrollLayer()->setImplTransform(implTransform());
+
     {
-        updateRootScrollLayerImplTransform();
-
-        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);
     }
 }
 
 void LayerTreeHostImpl::FrameData::appendRenderPass(scoped_ptr<RenderPass> renderPass)
 {
     RenderPass* pass = renderPass.get();
     renderPasses.push_back(pass);
     renderPassesById.set(pass->id, renderPass.Pass());
 }
 
@@ skipping 80 matching lines @@
         quad->SetNew(sharedQuadState, layerRect, screenBackgroundColor);
         quadCuller.append(quad.PassAs<DrawQuad>(), appendQuadsData);
     }
 }
 
 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()));
 
     // Create the render passes in dependency order.
     for (int surfaceIndex = frame.renderSurfaceLayerList->size() - 1; surfaceIndex >= 0 ; --surfaceIndex) {
         LayerImpl* renderSurfaceLayer = (*frame.renderSurfaceLayerList)[surfaceIndex];
         renderSurfaceLayer->renderSurface()->appendRenderPasses(frame);
     }
 
@@ skipping 234 matching lines @@
             removeRenderPassesRecursive(renderPassQuad->render_pass_id, frame);
             it = frame.renderPasses.size() - positionFromEnd;
             DCHECK(it >= 0);
         }
     }
 }
 
 bool LayerTreeHostImpl::prepareToDraw(FrameData& frame)
 {
     TRACE_EVENT0("cc", "LayerTreeHostImpl::prepareToDraw");
-    DCHECK(canDraw());
 
     if (m_tileManager)
         m_tileManager->CheckForCompletedSetPixels();
 
     frame.renderSurfaceLayerList = &m_renderSurfaceLayerList;
     frame.renderPasses.clear();
     frame.renderPassesById.clear();
     frame.willDrawLayers.clear();
 
     if (!calculateRenderPasses(frame))
@@ skipping 116 matching lines @@
     rootLayer()->resetAllChangeTrackingForSubtree();
 }
 
 void LayerTreeHostImpl::didDrawAllLayers(const FrameData& frame)
 {
     for (size_t i = 0; i < frame.willDrawLayers.size(); ++i)
         frame.willDrawLayers[i]->didDraw(m_resourceProvider.get());
 
     // Once all layers have been drawn, pending texture uploads should no
     // longer block future uploads.
-    m_resourceProvider->markPendingUploadsAsNonBlocking();
+    if (m_resourceProvider)
+      m_resourceProvider->markPendingUploadsAsNonBlocking();
 }
 
 void LayerTreeHostImpl::finishAllRendering()
 {
     if (m_renderer)
         m_renderer->finish();
 }
 
 bool LayerTreeHostImpl::isContextLost()
 {
@@ skipping 269 matching lines @@
 void LayerTreeHostImpl::setNeedsRedraw()
 {
     m_client->setNeedsRedrawOnImplThread();
 }
 
 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;
+
+    // TODO(nduca): Try to delete this before landing.

[enne (OOO), 2012/12/12 18:44:24]

I just checked.  This function can just call updateDrawProperties() and it'll do
the right thing, thanks to all your test changes.  :)

 
     // 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();
@@ skipping 510 matching lines @@
     ScrollbarAnimationController* scrollbarController = layer->scrollbarAnimationController();
     double monotonicTime = (time - base::TimeTicks()).InSecondsF();
     if (scrollbarController && scrollbarController->animate(monotonicTime))
         m_client->setNeedsRedrawOnImplThread();
 
     for (size_t i = 0; i < layer->children().size(); ++i)
         animateScrollbarsRecursive(layer->children()[i], time);
 }
 
 }  // namespace cc