cc: Split out calcDrawEtc from drawLayers

cc/layer_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_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/debug_colors.h"
@@ skipping 51 matching lines @@
 #ifndef NDEBUG
     DCHECK(!m_betweenWillDrawAndDidDraw);
 #endif
 }
 
 void LayerImpl::addChild(scoped_ptr<LayerImpl> child)
 {
     child->setParent(this);
     DCHECK_EQ(layerTreeHostImpl(), child->layerTreeHostImpl());
     m_children.append(child.Pass());
+    m_layerTreeHostImpl->setNeedsUpdateDrawProperties();
 }
 
 void LayerImpl::removeFromParent()
 {
     if (!m_parent)
         return;
 
     LayerImpl* parent = m_parent;
     m_parent = 0;
 
     for (size_t i = 0; i < parent->m_children.size(); ++i) {
         if (parent->m_children[i] == this) {
             parent->m_children.remove(i);
+            m_layerTreeHostImpl->setNeedsUpdateDrawProperties();
             return;
         }
     }
 }
 
 void LayerImpl::removeAllChildren()
 {
     while (m_children.size())
         m_children[0]->removeFromParent();
 }
 
 void LayerImpl::clearChildList()
 {

[danakj, 2012/12/07 23:12:49]

should this early-out if m_children.empty() now?

[enne (OOO), 2012/12/07 23:25:05]

Done.

     m_children.clear();
+    m_layerTreeHostImpl->setNeedsUpdateDrawProperties();
 }
 
 void LayerImpl::createRenderSurface()
 {
     DCHECK(!m_drawProperties.render_surface);
     m_drawProperties.render_surface = make_scoped_ptr(new RenderSurfaceImpl(this));
     m_drawProperties.render_target = this;
 }
 
 int LayerImpl::descendantsDrawContent()
@@ skipping 253 matching lines @@
     LayerImpl* current = this->m_parent;
     while (current && !current->m_drawProperties.render_surface) {
         if (current->m_layerSurfacePropertyChanged)
             return true;
         current = current->m_parent;
     }
 
     return false;
 }
 
+void LayerImpl::noteLayerSurfacePropertyChanged()
+{
+    m_layerSurfacePropertyChanged = true;
+    m_layerTreeHostImpl->setNeedsUpdateDrawProperties();
+}
+
+void LayerImpl::noteLayerPropertyChanged()
+{
+    m_layerPropertyChanged = true;
+    m_layerTreeHostImpl->setNeedsUpdateDrawProperties();
+}
+
 void LayerImpl::noteLayerPropertyChangedForSubtree()
 {
-    m_layerPropertyChanged = true;
+    noteLayerPropertyChanged();
     noteLayerPropertyChangedForDescendants();
 }
 
 void LayerImpl::noteLayerPropertyChangedForDescendants()
 {
+    m_layerTreeHostImpl->setNeedsUpdateDrawProperties();
     for (size_t i = 0; i < m_children.size(); ++i)
         m_children[i]->noteLayerPropertyChangedForSubtree();
 }
 
 const char* LayerImpl::layerTypeAsString() const
 {
     return "Layer";
 }
 
 void LayerImpl::resetAllChangeTrackingForSubtree()
@@ skipping 29 matching lines @@
 void LayerImpl::setBounds(const gfx::Size& bounds)
 {
     if (m_bounds == bounds)
         return;
 
     m_bounds = bounds;
 
     if (masksToBounds())
         noteLayerPropertyChangedForSubtree();
     else
-        m_layerPropertyChanged = true;
+        noteLayerPropertyChanged();
 }
 
 void LayerImpl::setMaskLayer(scoped_ptr<LayerImpl> maskLayer)
 {
     if (maskLayer)
         DCHECK_EQ(layerTreeHostImpl(), maskLayer->layerTreeHostImpl());
     m_maskLayer = maskLayer.Pass();
 
     int newLayerId = m_maskLayer ? m_maskLayer->id() : -1;
     if (newLayerId == m_maskLayerId)
@@ skipping 16 matching lines @@
     m_replicaLayerId = newLayerId;
     noteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::setDrawsContent(bool drawsContent)
 {
     if (m_drawsContent == drawsContent)
         return;
 
     m_drawsContent = drawsContent;
-    m_layerPropertyChanged = true;
+    noteLayerPropertyChanged();
 }
 
 void LayerImpl::setAnchorPoint(const gfx::PointF& anchorPoint)
 {
     if (m_anchorPoint == anchorPoint)
         return;
 
     m_anchorPoint = anchorPoint;
     noteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::setAnchorPointZ(float anchorPointZ)
 {
     if (m_anchorPointZ == anchorPointZ)
         return;
 
     m_anchorPointZ = anchorPointZ;
     noteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::setBackgroundColor(SkColor backgroundColor)
 {
     if (m_backgroundColor == backgroundColor)
         return;
 
     m_backgroundColor = backgroundColor;
-    m_layerPropertyChanged = true;
+    noteLayerPropertyChanged();
 }
 
 void LayerImpl::setFilters(const WebKit::WebFilterOperations& filters)
 {
     if (m_filters == filters)
         return;
 
     DCHECK(!m_filter);
     m_filters = filters;
     noteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::setBackgroundFilters(const WebKit::WebFilterOperations& backgroundFilters)
 {
     if (m_backgroundFilters == backgroundFilters)
         return;
 
     m_backgroundFilters = backgroundFilters;
-    m_layerPropertyChanged = true;
+    noteLayerPropertyChanged();
 }
 
 void LayerImpl::setFilter(const skia::RefPtr<SkImageFilter>& filter)
 {
     if (m_filter.get() == filter.get())
         return;
 
     DCHECK(m_filters.isEmpty());
     m_filter = filter;
     noteLayerPropertyChangedForSubtree();
@@ skipping 14 matching lines @@
         return;
 
     m_contentsOpaque = opaque;
     noteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::setOpacity(float opacity)
 {
     if (!m_layerAnimationController->setOpacity(opacity))
         return;
-    m_layerSurfacePropertyChanged = true;
+
+    noteLayerSurfacePropertyChanged();
 }
 
 float LayerImpl::opacity() const
 {
     return m_layerAnimationController->opacity();
 }
 
 bool LayerImpl::opacityIsAnimating() const
 {
     return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Opacity);
@@ skipping 24 matching lines @@
 
     m_sublayerTransform = sublayerTransform;
     // sublayer transform does not affect the current layer; it affects only its children.
     noteLayerPropertyChangedForDescendants();
 }
 
 void LayerImpl::setTransform(const gfx::Transform& transform)
 {
     if (!m_layerAnimationController->setTransform(transform))
         return;
-    m_layerSurfacePropertyChanged = true;
+
+    noteLayerSurfacePropertyChanged();
 }
 
 const gfx::Transform& LayerImpl::transform() const
 {
     return m_layerAnimationController->transform();
 }
 
 bool LayerImpl::transformIsAnimating() const
 {
     return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Transform);
 }
 
 void LayerImpl::setContentBounds(const gfx::Size& contentBounds)
 {
     if (m_contentBounds == contentBounds)
         return;
 
     m_contentBounds = contentBounds;
-    m_layerPropertyChanged = true;
+    noteLayerPropertyChanged();
 }
 
 void LayerImpl::setContentsScale(float contentsScaleX, float contentsScaleY)
 {
     if (m_contentsScaleX == contentsScaleX && m_contentsScaleY == contentsScaleY)
         return;
 
     m_contentsScaleX = contentsScaleX;
     m_contentsScaleY = contentsScaleY;
-    m_layerPropertyChanged = true;
+    noteLayerPropertyChanged();
 }
 
 void LayerImpl::setScrollOffset(gfx::Vector2d scrollOffset)
 {
     if (m_scrollOffset == scrollOffset)
         return;
 
     m_scrollOffset = scrollOffset;
     noteLayerPropertyChangedForSubtree();
 }
@@ skipping 31 matching lines @@
         return visibleContentRect();
     return Region();
 }
 
 void LayerImpl::didLoseOutputSurface()
 {
 }
 
 void LayerImpl::setMaxScrollOffset(gfx::Vector2d maxScrollOffset)
 {
+    if (m_maxScrollOffset == maxScrollOffset)
+        return;
     m_maxScrollOffset = maxScrollOffset;
 
+    m_layerTreeHostImpl->setNeedsUpdateDrawProperties();
+
     if (!m_scrollbarAnimationController)
         return;
     m_scrollbarAnimationController->updateScrollOffset(this);
 }
 
 ScrollbarLayerImpl* LayerImpl::horizontalScrollbarLayer()
 {
     return m_scrollbarAnimationController ? m_scrollbarAnimationController->horizontalScrollbarLayer() : 0;
 }
 
@@ skipping 22 matching lines @@
 
 void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer)
 {
     if (!m_scrollbarAnimationController)
         m_scrollbarAnimationController = ScrollbarAnimationController::create(this);
     m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
     m_scrollbarAnimationController->updateScrollOffset(this);
 }
 
 }  // namespace cc