diff options
| author | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 06:54:41 +0000 |
|---|---|---|
| committer | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 06:54:41 +0000 |
| commit | 28468de002bfefc84895e854d358bef0abd88ae6 (patch) | |
| tree | 2c44dd1b5121d5f1b90f88688f5d375d5a66bfa5 /cc/LayerChromium.cpp | |
| parent | d9543896f8112191cc1e7cd56c0f53e768710940 (diff) | |
| download | chromium_src-28468de002bfefc84895e854d358bef0abd88ae6.zip chromium_src-28468de002bfefc84895e854d358bef0abd88ae6.tar.gz chromium_src-28468de002bfefc84895e854d358bef0abd88ae6.tar.bz2 | |
Revert 161488 - [cc] Use base ptr types for cc's CSS animation classes
(Reverting as it seemed to cause build errors on Win Builder (dbg))
Rerelanding https://codereview.chromium.org/11085029/
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11091057
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/11092097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/LayerChromium.cpp')
| -rw-r--r-- | cc/LayerChromium.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cc/LayerChromium.cpp b/cc/LayerChromium.cpp index 55093d6..43145b6 100644 --- a/cc/LayerChromium.cpp +++ b/cc/LayerChromium.cpp @@ -657,7 +657,7 @@ void LayerChromium::setBoundsContainPageScale(bool boundsContainPageScale) void LayerChromium::createRenderSurface() { ASSERT(!m_renderSurface); - m_renderSurface = make_scoped_ptr(new RenderSurfaceChromium(this)); + m_renderSurface = adoptPtr(new RenderSurfaceChromium(this)); setRenderTarget(this); } @@ -701,7 +701,7 @@ void LayerChromium::setTransformFromAnimation(const WebTransformationMatrix& tra m_transform = transform; } -bool LayerChromium::addAnimation(scoped_ptr <CCActiveAnimation> animation) +bool LayerChromium::addAnimation(PassOwnPtr<CCActiveAnimation> animation) { // WebCore currently assumes that accelerated animations will start soon // after the animation is added. However we cannot guarantee that if we do @@ -712,7 +712,7 @@ bool LayerChromium::addAnimation(scoped_ptr <CCActiveAnimation> animation) if (!CCSettings::acceleratedAnimationEnabled()) return false; - m_layerAnimationController->addAnimation(animation.Pass()); + m_layerAnimationController->addAnimation(animation); if (m_layerTreeHost) { m_layerTreeHost->didAddAnimation(); setNeedsCommit(); @@ -744,9 +744,9 @@ void LayerChromium::resumeAnimations(double monotonicTime) setNeedsCommit(); } -void LayerChromium::setLayerAnimationController(scoped_ptr<CCLayerAnimationController> layerAnimationController) +void LayerChromium::setLayerAnimationController(PassOwnPtr<CCLayerAnimationController> layerAnimationController) { - m_layerAnimationController = layerAnimationController.Pass(); + m_layerAnimationController = layerAnimationController; if (m_layerAnimationController) { m_layerAnimationController->setClient(this); m_layerAnimationController->setForceSync(); @@ -754,11 +754,11 @@ void LayerChromium::setLayerAnimationController(scoped_ptr<CCLayerAnimationContr setNeedsCommit(); } -scoped_ptr<CCLayerAnimationController> LayerChromium::releaseLayerAnimationController() +PassOwnPtr<CCLayerAnimationController> LayerChromium::releaseLayerAnimationController() { - scoped_ptr<CCLayerAnimationController> toReturn = m_layerAnimationController.Pass(); + OwnPtr<CCLayerAnimationController> toReturn = m_layerAnimationController.release(); m_layerAnimationController = CCLayerAnimationController::create(this); - return toReturn.Pass(); + return toReturn.release(); } bool LayerChromium::hasActiveAnimation() const |