Index: cc/LayerChromium.cpp |
diff --git a/cc/LayerChromium.cpp b/cc/LayerChromium.cpp |
index d271eb47e12de5470eba0e9a4957052450bee326..39768d3b95dd7c57a33e82497402b26eeea35e68 100644 |
--- a/cc/LayerChromium.cpp |
+++ b/cc/LayerChromium.cpp |
@@ -656,7 +656,7 @@ void LayerChromium::setBoundsContainPageScale(bool boundsContainPageScale) |
void LayerChromium::createRenderSurface() |
{ |
ASSERT(!m_renderSurface); |
- m_renderSurface = adoptPtr(new RenderSurfaceChromium(this)); |
+ m_renderSurface = make_scoped_ptr(new RenderSurfaceChromium(this)); |
setRenderTarget(this); |
} |
@@ -700,7 +700,7 @@ void LayerChromium::setTransformFromAnimation(const WebTransformationMatrix& tra |
m_transform = transform; |
} |
-bool LayerChromium::addAnimation(PassOwnPtr<CCActiveAnimation> animation) |
+bool LayerChromium::addAnimation(scoped_ptr <CCActiveAnimation> animation) |
{ |
// WebCore currently assumes that accelerated animations will start soon |
// after the animation is added. However we cannot guarantee that if we do |
@@ -711,7 +711,7 @@ bool LayerChromium::addAnimation(PassOwnPtr<CCActiveAnimation> animation) |
if (!CCSettings::acceleratedAnimationEnabled()) |
return false; |
- m_layerAnimationController->addAnimation(animation); |
+ m_layerAnimationController->addAnimation(animation.Pass()); |
if (m_layerTreeHost) { |
m_layerTreeHost->didAddAnimation(); |
setNeedsCommit(); |
@@ -743,9 +743,9 @@ void LayerChromium::resumeAnimations(double monotonicTime) |
setNeedsCommit(); |
} |
-void LayerChromium::setLayerAnimationController(PassOwnPtr<CCLayerAnimationController> layerAnimationController) |
+void LayerChromium::setLayerAnimationController(scoped_ptr<CCLayerAnimationController> layerAnimationController) |
{ |
- m_layerAnimationController = layerAnimationController; |
+ m_layerAnimationController = layerAnimationController.Pass(); |
if (m_layerAnimationController) { |
m_layerAnimationController->setClient(this); |
m_layerAnimationController->setForceSync(); |
@@ -753,11 +753,11 @@ void LayerChromium::setLayerAnimationController(PassOwnPtr<CCLayerAnimationContr |
setNeedsCommit(); |
} |
-PassOwnPtr<CCLayerAnimationController> LayerChromium::releaseLayerAnimationController() |
+scoped_ptr<CCLayerAnimationController> LayerChromium::releaseLayerAnimationController() |
{ |
- OwnPtr<CCLayerAnimationController> toReturn = m_layerAnimationController.release(); |
+ scoped_ptr<CCLayerAnimationController> toReturn = m_layerAnimationController.Pass(); |
m_layerAnimationController = CCLayerAnimationController::create(this); |
- return toReturn.release(); |
+ return toReturn.Pass(); |
} |
bool LayerChromium::hasActiveAnimation() const |