cc: Move updateDrawProperties to LayerTreeImpl

cc/layer_tree_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_impl.h"
 
+#include "base/debug/trace_event.h"
 #include "cc/layer_tree_host_common.h"
 #include "cc/layer_tree_host_impl.h"
 #include "ui/gfx/vector2d_conversions.h"
 
 namespace cc {
 
 LayerTreeImpl::LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl)
     : layer_tree_host_impl_(layer_tree_host_impl)
     , source_frame_number_(-1)
     , hud_layer_(0)
@@ skipping 40 matching lines @@
 
   layer_tree_host_impl_->OnCanDrawStateChangedForTree(this);
 }
 
 scoped_ptr<LayerImpl> LayerTreeImpl::DetachLayerTree() {
   // Clear all data structures that have direct references to the layer tree.
   scrolling_layer_id_from_previous_tree_ =
     currently_scrolling_layer_ ? currently_scrolling_layer_->id() : 0;
   currently_scrolling_layer_ = NULL;
 
+  render_surface_layer_list_.clear();
+  SetNeedsUpdateDrawProperties();
   return root_layer_.Pass();
 }
 
 void LayerTreeImpl::ClearCurrentlyScrollingLayer() {
   currently_scrolling_layer_ = NULL;
   scrolling_layer_id_from_previous_tree_ = 0;
 }
 
 void LayerTreeImpl::UpdateMaxScrollOffset() {
   if (!root_scroll_layer() || !root_scroll_layer()->children().size())
@@ skipping 22 matching lines @@
       gfx::RectF(view_bounds).bottom_right();
   max_scroll.Scale(1 / device_scale_factor());
 
   // The viewport may be larger than the contents in some cases, such as
   // having a vertical scrollbar but no horizontal overflow.
   max_scroll.ClampToMin(gfx::Vector2dF());
 
   root_scroll_layer()->setMaxScrollOffset(gfx::ToFlooredVector2d(max_scroll));
 }
 
+void LayerTreeImpl::UpdateDrawProperties() {
+  render_surface_layer_list_.clear();
+  if (!RootLayer())
+    return;
+
+  if (root_scroll_layer()) {
+    root_scroll_layer()->setImplTransform(
+        layer_tree_host_impl_->implTransform());
+  }
+
+  {
+    TRACE_EVENT0("cc", "LayerTreeImpl::UpdateDrawProperties");
+    LayerTreeHostCommon::calculateDrawProperties(
+        RootLayer(),
+        device_viewport_size(),
+        device_scale_factor(),
+        pinch_zoom_viewport().pageScaleFactor(),
+        layer_tree_host_impl_->rendererCapabilities().maxTextureSize,
+        settings().canUseLCDText,
+        render_surface_layer_list_);
+  }
+}
+
+static void ClearRenderSurfacesOnLayerImplRecursive(LayerImpl* current)
+{
+    DCHECK(current);
+    for (size_t i = 0; i < current->children().size(); ++i)
+        ClearRenderSurfacesOnLayerImplRecursive(current->children()[i]);
+    current->clearRenderSurface();
+}
+
+void LayerTreeImpl::ClearRenderSurfaces() {
+  ClearRenderSurfacesOnLayerImplRecursive(RootLayer());
+  render_surface_layer_list_.clear();
+  SetNeedsUpdateDrawProperties();
+}
+
+const LayerTreeImpl::LayerList& LayerTreeImpl::RenderSurfaceLayerList() const {
+  // If this assert triggers, then the list is dirty.
+  DCHECK(!layer_tree_host_impl_->needsUpdateDrawProperties());
+  return render_surface_layer_list_;
+}
+
 gfx::Size LayerTreeImpl::ContentSize() const {
   // TODO(aelias): Hardcoding the first child here is weird. Think of
   // a cleaner way to get the contentBounds on the Impl side.
   if (!root_scroll_layer() || root_scroll_layer()->children().isEmpty())
     return gfx::Size();
   return root_scroll_layer()->children()[0]->contentBounds();
 }
 
 LayerImpl* LayerTreeImpl::LayerById(int id) {
   LayerIdMap::iterator iter = layer_id_map_.find(id);
@@ skipping 86 matching lines @@
 
 AnimationRegistrar* LayerTreeImpl::animationRegistrar() const {
   return layer_tree_host_impl_->animationRegistrar();
 }
 
 const PinchZoomViewport& LayerTreeImpl::pinch_zoom_viewport() const {
   return layer_tree_host_impl_->pinchZoomViewport();
 }
 
 } // namespace cc