cc: Add id->LayerImpl map to LayerTreeImpl

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 "base/values.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 38 matching lines @@
     , m_isContainerForFixedPositionLayers(false)
     , m_fixedToContainerLayer(false)
     , m_drawDepth(0)
 #ifndef NDEBUG
     , m_betweenWillDrawAndDidDraw(false)
 #endif
     , m_layerAnimationController(LayerAnimationController::create(this))
 {
     DCHECK(m_layerId > 0);
     DCHECK(m_layerTreeImpl);
+    m_layerTreeImpl->RegisterLayer(this);
 }
 
 LayerImpl::~LayerImpl()
 {
 #ifndef NDEBUG
     DCHECK(!m_betweenWillDrawAndDidDraw);
 #endif
+    m_layerTreeImpl->UnregisterLayer(this);
 }
 
 void LayerImpl::addChild(scoped_ptr<LayerImpl> child)
 {
     child->setParent(this);
     DCHECK_EQ(layerTreeImpl(), child->layerTreeImpl());
     m_children.append(child.Pass());
     layerTreeImpl()->SetNeedsUpdateDrawProperties();
 }
 
@@ skipping 411 matching lines @@
     m_bounds = bounds;
 
     if (masksToBounds())
         noteLayerPropertyChangedForSubtree();
     else
         noteLayerPropertyChanged();
 }
 
 void LayerImpl::setMaskLayer(scoped_ptr<LayerImpl> maskLayer)
 {
-    if (maskLayer)
+    int newLayerId = maskLayer ? maskLayer->id() : -1;
+
+    if (maskLayer) {
         DCHECK_EQ(layerTreeImpl(), maskLayer->layerTreeImpl());
-    m_maskLayer = maskLayer.Pass();
-
-    int newLayerId = m_maskLayer ? m_maskLayer->id() : -1;
-    if (newLayerId == m_maskLayerId)
+        DCHECK_NE(newLayerId, m_maskLayerId);
+    } else if (newLayerId == m_maskLayerId)

[danakj, 2012/12/13 23:57:11]

This is "if (!maskLayer && newLayerId == m_maskLayerId)"

I don't think you meant else if?

[enne (OOO), 2012/12/14 00:21:12]

No, I meant else if.  This is the case where "if you don't have a mask layer and
you're assigning a null mask layer, then return and don't call
noteLayerPropertyBlahBlah".

If I didn't do the else if, then you could drop maskLayer on the floor, like
you're worried about below.

[danakj, 2012/12/14 00:23:15]

OOhh. ok!

         return;

[danakj, 2012/12/13 23:57:11]

If the ids match, we're going to free the maskLayer passed in here? This seems
super weird. We used to always assign the pointer before.

I suspect this is never called with a non-NULL pointer where the layerId ==
maskLayerId. It seems impossible without breaking a pointer out of scoped_ptr.
So this check seems weird to me.

 
+    m_maskLayer = maskLayer.Pass();
     m_maskLayerId = newLayerId;
     noteLayerPropertyChangedForSubtree();
 }
 
+scoped_ptr<LayerImpl> LayerImpl::takeMaskLayer()
+{
+  m_maskLayerId = -1;
+  return m_maskLayer.Pass();
+}
+
 void LayerImpl::setReplicaLayer(scoped_ptr<LayerImpl> replicaLayer)
 {
-    if (replicaLayer)
+    int newLayerId = replicaLayer ? replicaLayer->id() : -1;
+
+    if (replicaLayer) {
         DCHECK_EQ(layerTreeImpl(), replicaLayer->layerTreeImpl());
-    m_replicaLayer = replicaLayer.Pass();
-
-    int newLayerId = m_replicaLayer ? m_replicaLayer->id() : -1;
-    if (newLayerId == m_replicaLayerId)
+        DCHECK_NE(newLayerId, m_replicaLayerId);
+    } else if (newLayerId == m_replicaLayerId)
         return;
 
+    m_replicaLayer = replicaLayer.Pass();
     m_replicaLayerId = newLayerId;
     noteLayerPropertyChangedForSubtree();
 }
 
+scoped_ptr<LayerImpl> LayerImpl::takeReplicaLayer()
+{
+  m_replicaLayerId = -1;
+  return m_replicaLayer.Pass();
+}
+
 void LayerImpl::setDrawsContent(bool drawsContent)
 {
     if (m_drawsContent == drawsContent)
         return;
 
     m_drawsContent = drawsContent;
     noteLayerPropertyChanged();
 }
 
 void LayerImpl::setAnchorPoint(const gfx::PointF& anchorPoint)
@@ skipping 235 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