cc: Pass LayerTreeHostImpl to LayerImpl constructor

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"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/math_util.h"
 #include "cc/proxy.h"
 #include "cc/quad_sink.h"
 #include "cc/scrollbar_animation_controller.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect_conversions.h"
 
 namespace cc {
 
-LayerImpl::LayerImpl(int id)
+LayerImpl::LayerImpl(LayerTreeHostImpl* hostImpl, int id)
     : m_parent(0)
     , m_maskLayerId(-1)
     , m_replicaLayerId(-1)
     , m_layerId(id)
-    , m_layerTreeHostImpl(0)
+    , m_layerTreeHostImpl(hostImpl)
     , m_anchorPoint(0.5, 0.5)
     , m_anchorPointZ(0)
     , m_contentsScaleX(1.0)
     , m_contentsScaleY(1.0)
     , m_scrollable(false)
     , m_shouldScrollOnMainThread(false)
     , m_haveWheelEventHandlers(false)
     , m_backgroundColor(0)
     , m_doubleSided(true)
     , m_layerPropertyChanged(false)
     , m_layerSurfacePropertyChanged(false)
     , m_masksToBounds(false)
     , m_contentsOpaque(false)
     , m_preserves3D(false)
     , m_useParentBackfaceVisibility(false)
     , m_drawCheckerboardForMissingTiles(false)
     , m_useLCDText(false)
     , m_drawsContent(false)
     , m_forceRenderSurface(false)
     , m_isContainerForFixedPositionLayers(false)
     , m_fixedToContainerLayer(false)
     , m_drawDepth(0)
 #ifndef NDEBUG
     , m_betweenWillDrawAndDidDraw(false)
 #endif
     , m_layerAnimationController(LayerAnimationController::create())
 {
     DCHECK(m_layerId > 0);
+    DCHECK(m_layerTreeHostImpl);
     m_layerAnimationController->setId(m_layerId);
+    m_layerAnimationController->setAnimationRegistrar(hostImpl);
 }
 
 LayerImpl::~LayerImpl()
 {
 #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());
 }
 
 void LayerImpl::removeFromParent()
 {
     if (!m_parent)
         return;
 
     LayerImpl* parent = m_parent;
     m_parent = 0;
@@ skipping 30 matching lines @@
     for (size_t i = 0; i < m_children.size(); ++i) {
         if (m_children[i]->drawsContent())
             ++result;
         result += m_children[i]->descendantsDrawContent();
         if (result > 1)
             return result;
     }
     return result;
 }
 
-void LayerImpl::setLayerTreeHostImpl(LayerTreeHostImpl* hostImpl)
-{
-    m_layerTreeHostImpl = hostImpl;
-    m_layerAnimationController->setAnimationRegistrar(hostImpl);
-}
-
 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const
 {
   scoped_ptr<SharedQuadState> state = SharedQuadState::Create();
   state->SetAll(m_drawProperties.target_space_transform,
                 m_drawProperties.visible_content_rect,
                 m_drawProperties.drawable_content_rect,
                 m_drawProperties.clip_rect,
                 m_drawProperties.is_clipped,
                 m_drawProperties.opacity);
   return state.Pass();
@@ skipping 11 matching lines @@
 void LayerImpl::didDraw(ResourceProvider*)
 {
 #ifndef NDEBUG
     DCHECK(m_betweenWillDrawAndDidDraw);
     m_betweenWillDrawAndDidDraw = false;
 #endif
 }
 
 bool LayerImpl::showDebugBorders() const
 {
-    if (!m_layerTreeHostImpl)
-        return false;
     return m_layerTreeHostImpl->debugState().showDebugBorders;
 }
 
 void LayerImpl::getDebugBorderProperties(SkColor* color, float* width) const
 {
     if (m_drawsContent) {
         *color = DebugColors::ContentLayerBorderColor();
         *width = DebugColors::ContentLayerBorderWidth(m_layerTreeHostImpl);
         return;
     }
@@ skipping 262 matching lines @@
     m_bounds = bounds;
 
     if (masksToBounds())
         noteLayerPropertyChangedForSubtree();
     else
         m_layerPropertyChanged = true;
 }
 
 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)
         return;
 
     m_maskLayerId = newLayerId;
     noteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::setReplicaLayer(scoped_ptr<LayerImpl> replicaLayer)
 {
+    if (replicaLayer)
+        DCHECK_EQ(layerTreeHostImpl(), replicaLayer->layerTreeHostImpl());
     m_replicaLayer = replicaLayer.Pass();
 
     int newLayerId = m_replicaLayer ? m_replicaLayer->id() : -1;
     if (newLayerId == m_replicaLayerId)
         return;
 
     m_replicaLayerId = newLayerId;
     noteLayerPropertyChangedForSubtree();
 }
 
@@ skipping 247 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