Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(675)

Unified Diff: cc/LayerChromium.cpp

Issue 11078009: [cc] Use base ptr types for cc's CSS animation classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/LayerChromium.h ('k') | cc/LayerChromiumTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/LayerChromium.cpp
diff --git a/cc/LayerChromium.cpp b/cc/LayerChromium.cpp
index 9d1fda6df5a1e7789828425c7336474ba3298381..1f1551a578753c572b7f3c4f71a54054aae84d49 100644
--- a/cc/LayerChromium.cpp
+++ b/cc/LayerChromium.cpp
@@ -648,7 +648,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);
}
@@ -692,7 +692,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
@@ -703,7 +703,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();
@@ -735,9 +735,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();
@@ -745,11 +745,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
« no previous file with comments | « cc/LayerChromium.h ('k') | cc/LayerChromiumTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698