cc: Move updateDrawProperties to LayerTreeImpl

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 355 matching lines @@
     m_client->setNeedsRedrawOnImplThread();
 }
 
 bool LayerTreeHostImpl::haveTouchEventHandlersAt(const gfx::Point& viewportPoint)
 {
 
     gfx::PointF deviceViewportPoint = gfx::ScalePoint(viewportPoint, m_deviceScaleFactor);
 
     // First find out which layer was hit from the saved list of visible layers
     // in the most recent frame.
-    LayerImpl* layerImpl = LayerTreeHostCommon::findLayerThatIsHitByPoint(deviceViewportPoint, m_renderSurfaceLayerList);
+    LayerImpl* layerImpl = LayerTreeHostCommon::findLayerThatIsHitByPoint(deviceViewportPoint, activeTree()->RenderSurfaceLayerList());
 
     // Walk up the hierarchy and look for a layer with a touch event handler region that the given point hits.
     for (; layerImpl; layerImpl = layerImpl->parent()) {
       if (LayerTreeHostCommon::layerHasTouchEventHandlersAt(deviceViewportPoint,layerImpl))
           return true;
     }
 
     return false;
 }
 
 void LayerTreeHostImpl::trackDamageForAllSurfaces(LayerImpl* rootDrawLayer, const LayerList& renderSurfaceLayerList)
 {
     // For now, we use damage tracking to compute a global scissor. To do this, we must
     // compute all damage tracking before drawing anything, so that we know the root
     // 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::updateDrawProperties()
 {
     if (!needsUpdateDrawProperties())
         return;
 
-    m_renderSurfaceLayerList.clear();
-    m_needsUpdateDrawProperties = false;
-
-    if (!rootLayer())
-        return;
-
-    if (!m_renderer) // For maxTextureSize.
+    if (!m_renderer) { // For maxTextureSize.
+      // This will get set if renderer gets initialized.
+      m_needsUpdateDrawProperties = false;
       return;
-
-    if (rootScrollLayer())
-      rootScrollLayer()->setImplTransform(implTransform());
-
-    {
-        TRACE_EVENT0("cc", "LayerTreeHostImpl::calcDrawEtc");
-        float pageScaleFactor = m_pinchZoomViewport.pageScaleFactor();
-        LayerTreeHostCommon::calculateDrawProperties(rootLayer(), deviceViewportSize(), m_deviceScaleFactor, pageScaleFactor, rendererCapabilities().maxTextureSize, m_settings.canUseLCDText, m_renderSurfaceLayerList);
     }
 
-    // TODO(nduca): Move this to LayerTreeImpl
-    // Note: pending tree calcDrawProperties must follow the active tree one,
-    // as some properties are synced from active -> pending.
-    if (pendingTree() && pendingTree()->RootLayer())
-    {
-        float pageScaleFactor = m_pinchZoomViewport.pageScaleFactor();
-        LayerList dummyList;
-        LayerTreeHostCommon::calculateDrawProperties(pendingTree()->RootLayer(), deviceViewportSize(), m_deviceScaleFactor, pageScaleFactor, rendererCapabilities().maxTextureSize, m_settings.canUseLCDText, dummyList);
-    }
+    activeTree()->UpdateDrawProperties();
+    if (pendingTree())
+      pendingTree()->UpdateDrawProperties();
+
+    m_needsUpdateDrawProperties = false;
 }
 
 void LayerTreeHostImpl::FrameData::appendRenderPass(scoped_ptr<RenderPass> renderPass)
 {
     RenderPass* pass = renderPass.get();
     renderPasses.push_back(pass);
     renderPassesById.set(pass->id, renderPass.Pass());
 }
 
 static void appendQuadsForLayer(RenderPass* targetRenderPass, LayerImpl* layer, OcclusionTrackerImpl& occlusionTracker, AppendQuadsData& appendQuadsData)
@@ skipping 78 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());
 
-    updateDrawProperties();
     if (!canDraw() || !rootLayer())
       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];
@@ skipping 217 matching lines @@
 }
 
 bool LayerTreeHostImpl::prepareToDraw(FrameData& frame)
 {
     TRACE_EVENT0("cc", "LayerTreeHostImpl::prepareToDraw");
 
     if (m_tileManager)
         m_tileManager->CheckForCompletedSetPixels();
 
     activatePendingTreeIfNeeded();
+    updateDrawProperties();
 
-    frame.renderSurfaceLayerList = &m_renderSurfaceLayerList;
+    frame.renderSurfaceLayerList = &activeTree()->RenderSurfaceLayerList();
     frame.renderPasses.clear();
     frame.renderPassesById.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;
 }
@@ skipping 265 matching lines @@
 }
 
 void LayerTreeHostImpl::activatePendingTree()
 {
     CHECK(m_pendingTree);
     m_activeTree.swap(m_pendingTree);
     // TODO(enne): consider recycling this tree to prevent layer churn
     m_pendingTree.reset();
     m_client->onCanDrawStateChanged(canDraw());
     m_client->onHasPendingTreeStateChanged(pendingTree());
-
-    // TODO(nduca): Once render surface layer list moves to the tree so
-    // that updateDrawProperties() affects both trees, this will be
-    // unnecessary.
-    setNeedsUpdateDrawProperties();
 }
 
 scoped_ptr<LayerImpl> LayerTreeHostImpl::detachLayerTree()
 {
     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;
@@ skipping 35 matching lines @@
 
     if (outputSurface->Capabilities().has_parent_compositor)
         m_renderer = DelegatingRenderer::Create(this, resourceProvider.get());
     else if (outputSurface->Context3D())
         m_renderer = GLRenderer::create(this, outputSurface.get(), resourceProvider.get());
     else if (outputSurface->SoftwareDevice())
         m_renderer = SoftwareRenderer::create(this, resourceProvider.get(), outputSurface->SoftwareDevice());
     if (!m_renderer)
         return false;
 
+    setNeedsUpdateDrawProperties();
     m_resourceProvider = resourceProvider.Pass();
     m_outputSurface = outputSurface.Pass();
 
     if (!m_visible)
         m_renderer->setVisible(m_visible);
 
     m_client->onCanDrawStateChanged(canDraw());
 
     return true;
 }
@@ skipping 90 matching lines @@
 }
 
 void LayerTreeHostImpl::setNeedsRedraw()
 {
     m_client->setNeedsRedrawOnImplThread();
 }
 
 bool LayerTreeHostImpl::ensureRenderSurfaceLayerList()
 {
     updateDrawProperties();
-    return m_renderSurfaceLayerList.size();
+    return activeTree()->RenderSurfaceLayerList().size();
 }
 
 InputHandlerClient::ScrollStatus LayerTreeHostImpl::scrollBegin(gfx::Point viewportPoint, InputHandlerClient::ScrollInputType type)
 {
     TRACE_EVENT0("cc", "LayerTreeHostImpl::scrollBegin");
 
     DCHECK(!currentlyScrollingLayer());
     clearCurrentlyScrollingLayer();
 
     if (!ensureRenderSurfaceLayerList())
         return ScrollIgnored;
 
     gfx::PointF deviceViewportPoint = gfx::ScalePoint(viewportPoint, m_deviceScaleFactor);
 
     // First find out which layer was hit from the saved list of visible layers
     // in the most recent frame.
-    LayerImpl* layerImpl = LayerTreeHostCommon::findLayerThatIsHitByPoint(deviceViewportPoint, m_renderSurfaceLayerList);
+    LayerImpl* layerImpl = LayerTreeHostCommon::findLayerThatIsHitByPoint(deviceViewportPoint, activeTree()->RenderSurfaceLayerList());
 
     // Walk up the hierarchy and look for a scrollable layer.
     LayerImpl* potentiallyScrollingLayerImpl = 0;
     for (; layerImpl; layerImpl = layerImpl->parent()) {
         // The content layer can also block attempts to scroll outside the main thread.
         if (layerImpl->tryScroll(deviceViewportPoint, type) == ScrollOnMainThread) {
             m_numMainThreadScrolls++;
             return ScrollOnMainThread;
         }
 
@@ skipping 368 matching lines @@
     DCHECK(current);
     current->didLoseOutputSurface();
     if (current->maskLayer())
         sendDidLoseOutputSurfaceRecursive(current->maskLayer());
     if (current->replicaLayer())
         sendDidLoseOutputSurfaceRecursive(current->replicaLayer());
     for (size_t i = 0; i < current->children().size(); ++i)
         sendDidLoseOutputSurfaceRecursive(current->children()[i]);
 }
 
-static void clearRenderSurfacesOnLayerImplRecursive(LayerImpl* current)
-{
-    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();
+    activeTree()->ClearRenderSurfaces();
+    if (pendingTree())
+        pendingTree()->ClearRenderSurfaces();
 }
 
 std::string LayerTreeHostImpl::layerTreeAsText() const
 {
     std::string str;
     if (rootLayer()) {
         str = rootLayer()->layerTreeAsText();
         str +=  "RenderSurfaces:\n";
         dumpRenderSurfaces(&str, 1, rootLayer());
     }
@@ skipping 79 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