Revert 160631 - [cc] Store CCLayerImpls as scoped_ptrs

cc/CCOcclusionTrackerTest.cpp

Index: cc/CCOcclusionTrackerTest.cpp
===================================================================
--- cc/CCOcclusionTrackerTest.cpp	(revision 160631)
+++ cc/CCOcclusionTrackerTest.cpp	(working copy)
@@ -110,26 +110,18 @@
     typedef RenderSurfaceChromium RenderSurfaceType;
     typedef TestContentLayerChromium ContentLayerType;
     typedef scoped_refptr<LayerChromium> LayerPtrType;
+    typedef scoped_refptr<LayerChromium> PassLayerPtrType;
     typedef scoped_refptr<ContentLayerType> ContentLayerPtrType;
+    typedef scoped_refptr<ContentLayerType> PassContentLayerPtrType;
     typedef CCLayerIterator<LayerChromium, std::vector<scoped_refptr<LayerChromium> >, RenderSurfaceChromium, CCLayerIteratorActions::FrontToBack> LayerIterator;
     typedef CCOcclusionTracker OcclusionTrackerType;
 
-    static LayerPtrType createLayer()
+    static PassLayerPtrType createLayer()
     {
         return LayerChromium::create();
     }
-    static ContentLayerPtrType createContentLayer() { return make_scoped_refptr(new ContentLayerType()); }
+    static PassContentLayerPtrType createContentLayer() { return make_scoped_refptr(new ContentLayerType()); }
 
-    static LayerPtrType passLayerPtr(ContentLayerPtrType& layer)
-    {
-        return layer.release();
-    }
-
-    static LayerPtrType passLayerPtr(LayerPtrType& layer)
-    {
-        return layer.release();
-    }
-
     static void destroyLayer(LayerPtrType& layer)
     {
         layer = NULL;
@@ -140,28 +132,20 @@
     typedef CCLayerImpl LayerType;
     typedef CCRenderSurface RenderSurfaceType;
     typedef TestContentLayerImpl ContentLayerType;
-    typedef scoped_ptr<CCLayerImpl> LayerPtrType;
-    typedef scoped_ptr<ContentLayerType> ContentLayerPtrType;
+    typedef OwnPtr<CCLayerImpl> LayerPtrType;
+    typedef PassOwnPtr<CCLayerImpl> PassLayerPtrType;
+    typedef OwnPtr<ContentLayerType> ContentLayerPtrType;
+    typedef PassOwnPtr<ContentLayerType> PassContentLayerPtrType;
     typedef CCLayerIterator<CCLayerImpl, std::vector<CCLayerImpl*>, CCRenderSurface, CCLayerIteratorActions::FrontToBack> LayerIterator;
     typedef CCOcclusionTrackerImpl OcclusionTrackerType;
 
-    static LayerPtrType createLayer() { return CCLayerImpl::create(nextCCLayerImplId++); }
-    static ContentLayerPtrType createContentLayer() { return make_scoped_ptr(new ContentLayerType(nextCCLayerImplId++)); }
+    static PassLayerPtrType createLayer() { return CCLayerImpl::create(nextCCLayerImplId++); }
+    static PassContentLayerPtrType createContentLayer() { return adoptPtr(new ContentLayerType(nextCCLayerImplId++)); }
     static int nextCCLayerImplId;
 
-    static LayerPtrType passLayerPtr(LayerPtrType& layer)
-    {
-        return layer.Pass();
-    }
-
-    static LayerPtrType passLayerPtr(ContentLayerPtrType& layer)
-    {
-        return layer.PassAs<LayerType>();
-    }
-
     static void destroyLayer(LayerPtrType& layer)
     {
-        layer.reset();
+        layer.clear();
     }
 };
 
@@ -193,7 +177,7 @@
         setProperties(layerPtr, transform, position, bounds);
 
         ASSERT(!m_root);
-        m_root = Types::passLayerPtr(layer);
+        m_root = layer.release();
         return layerPtr;
     }
 
@@ -202,7 +186,7 @@
         typename Types::LayerPtrType layer(Types::createLayer());
         typename Types::LayerType* layerPtr = layer.get();
         setProperties(layerPtr, transform, position, bounds);
-        parent->addChild(Types::passLayerPtr(layer));
+        parent->addChild(layer.release());
         return layerPtr;
     }
 
@@ -231,7 +215,7 @@
                 layerPtr->setOpaqueContentsRect(IntRect());
         }
 
-        parent->addChild(Types::passLayerPtr(layer));
+        parent->addChild(layer.release());
         return layerPtr;
     }
 
@@ -240,7 +224,7 @@
         typename Types::ContentLayerPtrType layer(Types::createContentLayer());
         typename Types::ContentLayerType* layerPtr = layer.get();
         setProperties(layerPtr, transform, position, bounds);
-        setReplica(owningLayer, Types::passLayerPtr(layer));
+        setReplica(owningLayer, layer.release());
         return layerPtr;
     }
 
@@ -249,7 +233,7 @@
         typename Types::ContentLayerPtrType layer(Types::createContentLayer());
         typename Types::ContentLayerType* layerPtr = layer.get();
         setProperties(layerPtr, identityMatrix, FloatPoint(), bounds);
-        setMask(owningLayer, Types::passLayerPtr(layer));
+        setMask(owningLayer, layer.release());
         return layerPtr;
     }
 
@@ -370,9 +354,9 @@
         m_replicaLayers.push_back(layer);
     }
 
-    void setReplica(CCLayerImpl* owningLayer, scoped_ptr<CCLayerImpl> layer)
+    void setReplica(CCLayerImpl* owningLayer, PassOwnPtr<CCLayerImpl> layer)
     {
-        owningLayer->setReplicaLayer(layer.Pass());
+        owningLayer->setReplicaLayer(layer);
     }
 
     void setMask(LayerChromium* owningLayer, scoped_refptr<LayerChromium> layer)
@@ -381,9 +365,9 @@
         m_maskLayers.push_back(layer);
     }
 
-    void setMask(CCLayerImpl* owningLayer, scoped_ptr<CCLayerImpl> layer)
+    void setMask(CCLayerImpl* owningLayer, PassOwnPtr<CCLayerImpl> layer)
     {
-        owningLayer->setMaskLayer(layer.Pass());
+        owningLayer->setMaskLayer(layer);
     }
 
     // These hold ownership of the layers for the duration of the test.