Revert 160631 - [cc] Store CCLayerImpls as scoped_ptrs

cc/CCLayerImpl.cpp

 // 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 "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "CCLayerImpl.h"
 
@@ skipping 56 matching lines @@
 }
 
 CCLayerImpl::~CCLayerImpl()
 {
     ASSERT(CCProxy::isImplThread());
 #ifndef NDEBUG
     ASSERT(!m_betweenWillDrawAndDidDraw);
 #endif
 }
 
-void CCLayerImpl::addChild(scoped_ptr<CCLayerImpl> child)
+void CCLayerImpl::addChild(PassOwnPtr<CCLayerImpl> child)
 {
     child->setParent(this);
-    m_children.append(child.Pass());
+    m_children.append(child);
 }
 
 void CCLayerImpl::removeFromParent()
 {
     if (!m_parent)
         return;
 
     CCLayerImpl* parent = m_parent;
     m_parent = 0;
 
@@ skipping 313 matching lines @@
         return;
 
     m_bounds = bounds;
 
     if (masksToBounds())
         noteLayerPropertyChangedForSubtree();
     else
         m_layerPropertyChanged = true;
 }
 
-void CCLayerImpl::setMaskLayer(scoped_ptr<CCLayerImpl> maskLayer)
+void CCLayerImpl::setMaskLayer(PassOwnPtr<CCLayerImpl> maskLayer)
 {
-    m_maskLayer = maskLayer.Pass();
+    m_maskLayer = maskLayer;
 
     int newLayerId = m_maskLayer ? m_maskLayer->id() : -1;
     if (newLayerId == m_maskLayerId)
         return;
 
     m_maskLayerId = newLayerId;
     noteLayerPropertyChangedForSubtree();
 }
 
-void CCLayerImpl::setReplicaLayer(scoped_ptr<CCLayerImpl> replicaLayer)
+void CCLayerImpl::setReplicaLayer(PassOwnPtr<CCLayerImpl> replicaLayer)
 {
-    m_replicaLayer = replicaLayer.Pass();
+    m_replicaLayer = replicaLayer;
 
     int newLayerId = m_replicaLayer ? m_replicaLayer->id() : -1;
     if (newLayerId == m_replicaLayerId)
         return;
 
     m_replicaLayerId = newLayerId;
     noteLayerPropertyChangedForSubtree();
 }
 
 void CCLayerImpl::setDrawsContent(bool drawsContent)
@@ skipping 235 matching lines @@
     if (!m_scrollbarAnimationController)
         m_scrollbarAnimationController = CCScrollbarAnimationController::create(this);
     m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
     m_scrollbarAnimationController->updateScrollOffset(this);
 }
 
 }
 
 
 #endif // USE(ACCELERATED_COMPOSITING)