cc: Split out calcDrawEtc from drawLayers

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 198 matching lines @@
     , m_debugState(settings.initialDebugState)
     , m_deviceScaleFactor(1)
     , m_visible(true)
     , m_contentsTexturesPurged(false)
     , m_managedMemoryPolicy(PrioritizedResourceManager::defaultMemoryAllocationLimit(),
                             PriorityCalculator::allowEverythingCutoff(),
                             0,
                             PriorityCalculator::allowNothingCutoff())
     , m_backgroundColor(0)
     , m_hasTransparentBackground(false)
+    , m_needsUpdateDrawProperties(false)
     , m_pinchGestureActive(false)
     , m_fpsCounter(FrameRateCounter::create(m_proxy->hasImplThread()))
     , m_debugRectHistory(DebugRectHistory::create())
     , m_numImplThreadScrolls(0)
     , m_numMainThreadScrolls(0)
     , m_cumulativeNumLayersDrawn(0)
 {
     DCHECK(m_proxy->isImplThread());
     didVisibilityChange(this, m_visible);
 
@@ skipping 16 matching lines @@
     }
 }
 
 void LayerTreeHostImpl::beginCommit()
 {
 }
 
 void LayerTreeHostImpl::commitComplete()
 {
     TRACE_EVENT0("cc", "LayerTreeHostImpl::commitComplete");
+
+    // Impl-side painting needs an update immediately post-commit to have the
+    // opportunity to create tilings.  Other paths can call updateDrawProperties
+    // more lazily when needed prior to drawing.
+    setNeedsUpdateDrawProperties();
+    if (m_settings.implSidePainting)
+        updateDrawProperties();
+
     // Recompute max scroll position; must be after layer content bounds are
     // updated.
     updateMaxScrollOffset();
     m_client->sendManagedMemoryStats();
 }
 
 bool LayerTreeHostImpl::canDraw()
 {
     // Note: If you are changing this function or any other function that might
     // affect the result of canDraw, make sure to call m_client->onCanDrawStateChanged
@@ skipping 57 matching lines @@
         if (!m_settings.pageScalePinchZoomEnabled)
             anchor.Scale(1 / pageScale);
         m_pageScaleAnimation->zoomWithAnchor(anchor, pageScale, duration.InSecondsF());
     } else {
         gfx::Vector2dF scaledTargetOffset = targetOffset;
         if (!m_settings.pageScalePinchZoomEnabled)
             scaledTargetOffset.Scale(1 / pageScale);
         m_pageScaleAnimation->zoomTo(scaledTargetOffset, pageScale, duration.InSecondsF());
     }
 
+    setNeedsUpdateDrawProperties();
     m_client->setNeedsRedrawOnImplThread();
     m_client->setNeedsCommitOnImplThread();
 }
 
 void LayerTreeHostImpl::scheduleAnimation()
 {
     m_client->setNeedsRedrawOnImplThread();
 }
 
 bool LayerTreeHostImpl::haveTouchEventHandlersAt(const gfx::Point& viewportPoint)
@@ skipping 25 matching lines @@
     }
 }
 
 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);
+}
+
 void LayerTreeHostImpl::calculateRenderSurfaceLayerList(LayerList& renderSurfaceLayerList)
 {
     DCHECK(renderSurfaceLayerList.empty());
     DCHECK(rootLayer());
     DCHECK(m_renderer); // For maxTextureSize.
-
     {
         updateRootScrollLayerImplTransform();
 
         TRACE_EVENT0("cc", "LayerTreeHostImpl::calcDrawEtc");
         float pageScaleFactor = m_pinchZoomViewport.pageScaleFactor();
         LayerTreeHostCommon::calculateDrawProperties(rootLayer(), deviceViewportSize(), m_deviceScaleFactor, pageScaleFactor, rendererCapabilities().maxTextureSize, renderSurfaceLayerList);
-
-        trackDamageForAllSurfaces(rootLayer(), renderSurfaceLayerList);
     }
 }
 
 void LayerTreeHostImpl::FrameData::appendRenderPass(scoped_ptr<RenderPass> renderPass)
 {
     RenderPass* pass = renderPass.get();
     renderPasses.push_back(pass);
     renderPassesById.set(pass->id, renderPass.Pass());
 }
 
@@ skipping 79 matching lines @@
         scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();
         quad->SetNew(sharedQuadState, layerRect, screenBackgroundColor);
         quadCuller.append(quad.PassAs<DrawQuad>(), appendQuadsData);
     }
 }
 
 bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)
 {
     DCHECK(frame.renderPasses.empty());
 
-    calculateRenderSurfaceLayerList(*frame.renderSurfaceLayerList);
+    updateDrawProperties();
+    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);
     }
 
     bool recordMetricsForFrame = m_settings.showOverdrawInTracing && base::debug::TraceLog::GetInstance() && base::debug::TraceLog::GetInstance()->IsEnabled();
@@ skipping 25 matching lines @@
         if (it.representsContributingRenderSurface()) {
             RenderPass::Id contributingRenderPassId = it->renderSurface()->renderPassId();
             RenderPass* contributingRenderPass = frame.renderPassesById.get(contributingRenderPassId);
             appendQuadsForRenderSurfaceLayer(targetRenderPass, *it, contributingRenderPass, occlusionTracker, appendQuadsData);
         } else if (it.representsItself() && !it->visibleContentRect().IsEmpty()) {
             bool hasOcclusionFromOutsideTargetSurface;
             bool implDrawTransformIsUnknown = false;
             if (occlusionTracker.occluded(it->renderTarget(), it->visibleContentRect(), it->drawTransform(), implDrawTransformIsUnknown, it->drawableContentRect(), &hasOcclusionFromOutsideTargetSurface))
                 appendQuadsData.hadOcclusionFromOutsideTargetSurface |= hasOcclusionFromOutsideTargetSurface;
             else {
+                DCHECK_EQ(this, it->layerTreeHostImpl());
                 it->willDraw(m_resourceProvider.get());
                 frame.willDrawLayers.push_back(*it);
 
                 if (it->hasContributingDelegatedRenderPasses()) {
                     RenderPass::Id contributingRenderPassId = it->firstContributingRenderPassId();
                     while (frame.renderPassesById.contains(contributingRenderPassId)) {
                         RenderPass* renderPass = frame.renderPassesById.get(contributingRenderPassId);
   
                         AppendQuadsData appendQuadsData(renderPass->id);
                         appendQuadsForLayer(renderPass, *it, occlusionTracker, appendQuadsData);
@@ skipping 165 matching lines @@
 {
     TRACE_EVENT0("cc", "LayerTreeHostImpl::prepareToDraw");
     DCHECK(canDraw());
 
     if (m_tileManager)
         m_tileManager->CheckForCompletedSetPixels();
 
     frame.renderSurfaceLayerList = &m_renderSurfaceLayerList;
     frame.renderPasses.clear();
     frame.renderPassesById.clear();
-    frame.renderSurfaceLayerList->clear();
     frame.willDrawLayers.clear();
 
     if (!calculateRenderPasses(frame))
         return false;
 
     // If we return true, then we expect drawLayers() to be called before this function is called again.
     return true;
 }
 
 void LayerTreeHostImpl::enforceManagedMemoryPolicy(const ManagedMemoryPolicy& policy)
@@ skipping 175 matching lines @@
 
     if (layerImpl->drawsContent() && layerImpl->parent() && layerImpl->parent()->scrollable())
         return layerImpl->parent();
 
     return 0;
 }
 
 void LayerTreeHostImpl::setRootLayer(scoped_ptr<LayerImpl> layer)
 {
   m_activeTree->SetRootLayer(layer.Pass());
+  setNeedsUpdateDrawProperties();

[danakj, 2012/12/07 21:14:02]

nit: 4 space indents

[enne (OOO), 2012/12/07 23:03:00]

Done.

 }
 
 scoped_ptr<LayerImpl> LayerTreeHostImpl::detachLayerTree()
 {
-  scoped_ptr<LayerImpl> layer = m_activeTree->DetachLayerTree();
-  m_renderSurfaceLayerList.clear();
-  return layer.Pass();
+    scoped_ptr<LayerImpl> layer = m_activeTree->DetachLayerTree();
+    m_renderSurfaceLayerList.clear();
+    setNeedsUpdateDrawProperties();
+    return layer.Pass();
 }
 
 void LayerTreeHostImpl::setVisible(bool visible)
 {
     DCHECK(m_proxy->isImplThread());
 
     if (m_visible == visible)
         return;
     m_visible = visible;
     didVisibilityChange(this, m_visible);
@@ skipping 112 matching lines @@
 }
 
 void LayerTreeHostImpl::setPageScaleFactorAndLimits(float pageScaleFactor, float minPageScaleFactor, float maxPageScaleFactor)
 {
     if (!pageScaleFactor)
       return;
 
     float pageScaleChange = pageScaleFactor / m_pinchZoomViewport.pageScaleFactor();
     m_pinchZoomViewport.setPageScaleFactorAndLimits(pageScaleFactor, minPageScaleFactor, maxPageScaleFactor);
 
-    if (!m_settings.pageScalePinchZoomEnabled) {
-        if (pageScaleChange != 1)
-            adjustScrollsForPageScaleChange(rootScrollLayer(), pageScaleChange);
-    }
+    if (!m_settings.pageScalePinchZoomEnabled && pageScaleChange != 1)
+        adjustScrollsForPageScaleChange(rootScrollLayer(), pageScaleChange);
 
     // Clamp delta to limits and refresh display matrix.
     setPageScaleDelta(m_pinchZoomViewport.pageScaleDelta() / m_pinchZoomViewport.sentPageScaleDelta());
     m_pinchZoomViewport.setSentPageScaleDelta(1);
 }
 
 void LayerTreeHostImpl::setPageScaleDelta(float delta)
 {
     m_pinchZoomViewport.setPageScaleDelta(delta);
 
@@ skipping 47 matching lines @@
         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.
-    m_renderSurfaceLayerList.clear();
-    calculateRenderSurfaceLayerList(m_renderSurfaceLayerList);
+    setNeedsUpdateDrawProperties();

[danakj, 2012/12/07 21:14:02]

Ok, throw a big TODO here please and file a bug. The above check can be a false
positive now.

[enne (OOO), 2012/12/07 23:03:00]

Done.  https://code.google.com/p/chromium/issues/detail?id=164949

+    updateDrawProperties();
 
     return m_renderSurfaceLayerList.size();
 }
 
 InputHandlerClient::ScrollStatus LayerTreeHostImpl::scrollBegin(gfx::Point viewportPoint, InputHandlerClient::ScrollInputType type)
 {
     TRACE_EVENT0("cc", "LayerTreeHostImpl::scrollBegin");
 
     DCHECK(!currentlyScrollingLayer());
     clearCurrentlyScrollingLayer();
@@ skipping 32 matching lines @@
             potentiallyScrollingLayerImpl = scrollLayerImpl;
     }
 
     if (potentiallyScrollingLayerImpl) {
         m_activeTree->set_currently_scrolling_layer(potentiallyScrollingLayerImpl);
         // Gesture events need to be transformed from viewport coordinates to local layer coordinates
         // so that the scrolling contents exactly follow the user's finger. In contrast, wheel
         // events are already in local layer coordinates so we can just apply them directly.
         m_scrollDeltaIsInViewportSpace = (type == Gesture);
         m_numImplThreadScrolls++;
+        setNeedsUpdateDrawProperties();
         return ScrollStarted;
     }
     return ScrollIgnored;
 }
 
 static gfx::Vector2dF scrollLayerWithViewportSpaceDelta(PinchZoomViewport* viewport, LayerImpl& layerImpl, float scaleFromViewportToScreenSpace, gfx::PointF viewportPoint, gfx::Vector2dF viewportDelta)
 {
     // Layers with non-invertible screen space transforms should not have passed the scroll hit
     // test in the first place.
     DCHECK(layerImpl.screenSpaceTransform().IsInvertible());
@@ skipping 94 matching lines @@
         gfx::Vector2dF perpendicularAxis(-appliedDelta.y(), appliedDelta.x());
         pendingDelta = MathUtil::projectVector(pendingDelta, perpendicularAxis);
 
         if (gfx::ToFlooredVector2d(pendingDelta).IsZero())
             break;
     }
 
     if (didScroll) {
         m_client->setNeedsCommitOnImplThread();
         m_client->setNeedsRedrawOnImplThread();
+        setNeedsUpdateDrawProperties();
     }
     return didScroll;
 }
 
 void LayerTreeHostImpl::clearCurrentlyScrollingLayer()
 {
     m_activeTree->ClearCurrentlyScrollingLayer();
 }
 
 void LayerTreeHostImpl::scrollEnd()
@@ skipping 34 matching lines @@
     }
 
     gfx::Vector2dF scrollOverflow = m_settings.pageScalePinchZoomEnabled ? m_pinchZoomViewport.applyScroll(move) : move;
     rootScrollLayer()->scrollBy(scrollOverflow);
 
     if (rootScrollLayer()->scrollbarAnimationController())
         rootScrollLayer()->scrollbarAnimationController()->didPinchGestureUpdate();
 
     m_client->setNeedsCommitOnImplThread();
     m_client->setNeedsRedrawOnImplThread();
+    setNeedsUpdateDrawProperties();
 }
 
 void LayerTreeHostImpl::pinchGestureEnd()
 {
     m_pinchGestureActive = false;
 
     if (rootScrollLayer() && rootScrollLayer()->scrollbarAnimationController())
         rootScrollLayer()->scrollbarAnimationController()->didPinchGestureEnd();
 
     m_client->setNeedsCommitOnImplThread();
@@ skipping 116 matching lines @@
     double monotonicTime = (time - base::TimeTicks()).InSecondsF();
     gfx::Vector2dF scrollTotal = rootScrollLayer()->scrollOffset() + rootScrollLayer()->scrollDelta();
 
     setPageScaleDelta(m_pageScaleAnimation->pageScaleFactorAtTime(monotonicTime) / m_pinchZoomViewport.pageScaleFactor());
     gfx::Vector2dF nextScroll = m_pageScaleAnimation->scrollOffsetAtTime(monotonicTime);
 
     if (!m_settings.pageScalePinchZoomEnabled)
         nextScroll.Scale(m_pinchZoomViewport.pageScaleFactor());
     rootScrollLayer()->scrollBy(nextScroll - scrollTotal);
     m_client->setNeedsRedrawOnImplThread();
+    setNeedsUpdateDrawProperties();
 
     if (m_pageScaleAnimation->isAnimationCompleteAtTime(monotonicTime)) {
         m_pageScaleAnimation.reset();
         m_client->setNeedsCommitOnImplThread();
     }
 }
 
 void LayerTreeHostImpl::animateLayers(base::TimeTicks monotonicTime, base::Time wallClockTime)
 {
     if (!m_settings.acceleratedAnimationEnabled || m_activeAnimationControllers.empty() || !rootLayer())
         return;
 
     TRACE_EVENT0("cc", "LayerTreeHostImpl::animateLayers");
 
     double monotonicSeconds = (monotonicTime - base::TimeTicks()).InSecondsF();
 
     scoped_ptr<AnimationEventsVector> events(make_scoped_ptr(new AnimationEventsVector));
     AnimationControllerSet copy = m_activeAnimationControllers;
     for (AnimationControllerSet::iterator iter = copy.begin(); iter != copy.end(); ++iter)
         (*iter)->animate(monotonicSeconds, events.get());
 
+    if (copy.size() > 0)

[danakj, 2012/12/07 21:14:02]

nit: !copy.empty()

Or even better, save !m_activeAnimationControllers.empty() in nicely named temp
bool before the iteration.

[enne (OOO), 2012/12/07 23:03:00]

Actually, there's an early out for no active controllers earlier in the
function, so removed.

+      m_client->setNeedsRedrawOnImplThread();

[danakj, 2012/12/07 21:14:02]

did you mean to setNeedsUpdateDrawProperties() here too?

[enne (OOO), 2012/12/07 23:03:00]

Done.

+
     if (!events->empty())
         m_client->postAnimationEventsToMainThreadOnImplThread(events.Pass(), wallClockTime);
 
-    m_client->setNeedsRedrawOnImplThread();
     setBackgroundTickingEnabled(!m_visible && !m_activeAnimationControllers.empty());
 }
 
 base::TimeDelta LayerTreeHostImpl::lowFrequencyAnimationInterval() const
 {
     return base::TimeDelta::FromSeconds(1);
 }
 
 void LayerTreeHostImpl::sendDidLoseOutputSurfaceRecursive(LayerImpl* current)
 {
@@ skipping 12 matching lines @@
     DCHECK(current);
     for (size_t i = 0; i < current->children().size(); ++i)
         clearRenderSurfacesOnLayerImplRecursive(current->children()[i]);
     current->clearRenderSurface();
 }
 
 void LayerTreeHostImpl::clearRenderSurfaces()
 {
     clearRenderSurfacesOnLayerImplRecursive(rootLayer());
     m_renderSurfaceLayerList.clear();
+    setNeedsUpdateDrawProperties();
 }
 
 std::string LayerTreeHostImpl::layerTreeAsText() const
 {
     std::string str;
     if (rootLayer()) {
         str = rootLayer()->layerTreeAsText();
         str +=  "RenderSurfaces:\n";
         dumpRenderSurfaces(&str, 1, rootLayer());
     }
@@ skipping 62 matching lines @@
 
 void LayerTreeHostImpl::UnregisterAnimationController(LayerAnimationController* controller) {
 #if !defined(NDEBUG)
     if (ContainsKey(m_allAnimationControllers, controller))
         m_allAnimationControllers.erase(controller);
 #endif
     DidDeactivateAnimationController(controller);
 }
 
 }  // namespace cc