[cc] Store CCLayerImpls as scoped_ptrs

cc/CCDelegatedRendererLayerImplTest.cpp

 // Copyright 2012 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 "config.h"
 
 #include "CCDelegatedRendererLayerImpl.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCGeometryTestUtils.h"
@@ skipping 81 matching lines @@
     CCSharedQuadState* sharedState = quadSink.useSharedQuadState(CCSharedQuadState::create(WebTransformationMatrix(), outputRect, outputRect, 1, false));
     scoped_ptr<CCRenderPassDrawQuad> quad = CCRenderPassDrawQuad::create(sharedState, outputRect, contributingPass->id(), false, 0, outputRect, 0, 0, 0, 0);
     quadSink.append(quad.PassAs<CCDrawQuad>(), data);
 }
 
 class CCDelegatedRendererLayerImplTestSimple : public CCDelegatedRendererLayerImplTest {
 public:
     CCDelegatedRendererLayerImplTestSimple()
         : CCDelegatedRendererLayerImplTest()
     {
-        OwnPtr<CCSolidColorLayerImpl> rootLayer = CCSolidColorLayerImpl::create(1);
-        OwnPtr<CCSolidColorLayerImpl> layerBefore = CCSolidColorLayerImpl::create(2);
-        OwnPtr<CCSolidColorLayerImpl> layerAfter = CCSolidColorLayerImpl::create(3);
-        OwnPtr<CCDelegatedRendererLayerImpl> delegatedRendererLayer = CCDelegatedRendererLayerImpl::create(4);
+        scoped_ptr<CCLayerImpl> rootLayer = CCSolidColorLayerImpl::create(1).PassAs<CCLayerImpl>();
+        scoped_ptr<CCLayerImpl> layerBefore = CCSolidColorLayerImpl::create(2).PassAs<CCLayerImpl>();
+        scoped_ptr<CCLayerImpl> layerAfter = CCSolidColorLayerImpl::create(3).PassAs<CCLayerImpl>();
+        scoped_ptr<CCDelegatedRendererLayerImpl> delegatedRendererLayer = CCDelegatedRendererLayerImpl::create(4);
 
         m_hostImpl->setViewportSize(IntSize(100, 100), IntSize(100, 100));
         rootLayer->setBounds(IntSize(100, 100));
 
         layerBefore->setPosition(IntPoint(20, 20));
         layerBefore->setBounds(IntSize(14, 14));
         layerBefore->setContentBounds(IntSize(14, 14));
         layerBefore->setDrawsContent(true);
         layerBefore->setForceRenderSurface(true);
 
@@ skipping 23 matching lines @@
 
         // The RenderPasses should be taken by the layer.
         EXPECT_EQ(0u, delegatedRenderPasses.size());
 
         m_rootLayerPtr = rootLayer.get();
         m_layerBeforePtr = layerBefore.get();
         m_layerAfterPtr = layerAfter.get();
         m_delegatedRendererLayerPtr = delegatedRendererLayer.get();
 
         // Force the delegated RenderPasses to come before the RenderPass from layerAfter.
-        layerAfter->addChild(delegatedRendererLayer.release());
-        rootLayer->addChild(layerAfter.release());
+        layerAfter->addChild(delegatedRendererLayer.PassAs<CCLayerImpl>());
+        rootLayer->addChild(layerAfter.Pass());
 
         // Get the RenderPass generated by layerBefore to come before the delegated RenderPasses.
-        rootLayer->addChild(layerBefore.release());
+        rootLayer->addChild(layerBefore.Pass());
 
-        m_hostImpl->setRootLayer(rootLayer.release());
+        m_hostImpl->setRootLayer(rootLayer.Pass());
     }
 
 protected:
-    CCSolidColorLayerImpl* m_rootLayerPtr;
-    CCSolidColorLayerImpl* m_layerBeforePtr;
-    CCSolidColorLayerImpl* m_layerAfterPtr;
+    CCLayerImpl* m_rootLayerPtr;
+    CCLayerImpl* m_layerBeforePtr;
+    CCLayerImpl* m_layerAfterPtr;
     CCDelegatedRendererLayerImpl* m_delegatedRendererLayerPtr;
 };
 
 TEST_F(CCDelegatedRendererLayerImplTestSimple, AddsContributingRenderPasses)
 {
     CCLayerTreeHostImpl::FrameData frame;
     EXPECT_TRUE(m_hostImpl->prepareToDraw(frame));
     m_hostImpl->drawLayers(frame);
     m_hostImpl->didDrawAllLayers(frame);
 
@@ skipping 203 matching lines @@
     EXPECT_TRANSFORMATION_MATRIX_EQ(WebTransformationMatrix(), frame.renderPasses[2]->quadList()[1]->quadTransform());
     ASSERT_EQ(1u, frame.renderPasses[1]->quadList().size());
     EXPECT_TRANSFORMATION_MATRIX_EQ(WebTransformationMatrix(), frame.renderPasses[1]->quadList()[0]->quadTransform());
 }
 
 class CCDelegatedRendererLayerImplTestSharedData : public CCDelegatedRendererLayerImplTest {
 public:
     CCDelegatedRendererLayerImplTestSharedData()
         : CCDelegatedRendererLayerImplTest()
     {
-        OwnPtr<CCLayerImpl> rootLayer = CCLayerImpl::create(1);
-        OwnPtr<CCDelegatedRendererLayerImpl> delegatedRendererLayer = CCDelegatedRendererLayerImpl::create(2);
+        scoped_ptr<CCLayerImpl> rootLayer = CCLayerImpl::create(1);
+        scoped_ptr<CCDelegatedRendererLayerImpl> delegatedRendererLayer = CCDelegatedRendererLayerImpl::create(2);
 
         m_hostImpl->setViewportSize(IntSize(100, 100), IntSize(100, 100));
         rootLayer->setBounds(IntSize(100, 100));
 
         delegatedRendererLayer->setPosition(IntPoint(20, 20));
         delegatedRendererLayer->setBounds(IntSize(20, 20));
         delegatedRendererLayer->setContentBounds(IntSize(20, 20));
         delegatedRendererLayer->setDrawsContent(true);
         WebTransformationMatrix transform;
         transform.translate(10, 10);
@@ skipping 10 matching lines @@
         quadSink.append(CCSolidColorDrawQuad::create(sharedState, IntRect(10, 0, 10, 10), 3u).PassAs<CCDrawQuad>(), data);
         quadSink.append(CCSolidColorDrawQuad::create(sharedState, IntRect(10, 10, 10, 10), 4u).PassAs<CCDrawQuad>(), data);
         delegatedRendererLayer->setRenderPasses(delegatedRenderPasses);
 
         // The RenderPasses should be taken by the layer.
         EXPECT_EQ(0u, delegatedRenderPasses.size());
 
         m_rootLayerPtr = rootLayer.get();
         m_delegatedRendererLayerPtr = delegatedRendererLayer.get();
 
-        rootLayer->addChild(delegatedRendererLayer.release());
+        rootLayer->addChild(delegatedRendererLayer.PassAs<CCLayerImpl>());
 
-        m_hostImpl->setRootLayer(rootLayer.release());
+        m_hostImpl->setRootLayer(rootLayer.Pass());
     }
 
 protected:
     CCLayerImpl* m_rootLayerPtr;
     CCDelegatedRendererLayerImpl* m_delegatedRendererLayerPtr;
 };
 
 TEST_F(CCDelegatedRendererLayerImplTestSharedData, SharedData)
 {
     CCLayerTreeHostImpl::FrameData frame;
@@ skipping 15 matching lines @@
     EXPECT_EQ(sharedState, quadList[3]->sharedQuadState());
 
     // The state should be transformed only once.
     EXPECT_RECT_EQ(IntRect(30, 30, 50, 50), sharedState->clippedRectInTarget);
     WebTransformationMatrix expected;
     expected.translate(30, 30);
     EXPECT_TRANSFORMATION_MATRIX_EQ(expected, sharedState->quadTransform);
 }
 
 } // namespace