diff options
| author | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 08:30:58 +0000 |
|---|---|---|
| committer | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 08:30:58 +0000 |
| commit | b207e268e982d39f2e2002ab1ed8ea27b10b77be (patch) | |
| tree | 30bac266c16a3f74b53c55aa8dc3e35b0ab023fb /cc/TreeSynchronizerTest.cpp | |
| parent | 71eb2e7981b70013a2c44e32c6e75a54889ac747 (diff) | |
| download | chromium_src-b207e268e982d39f2e2002ab1ed8ea27b10b77be.zip chromium_src-b207e268e982d39f2e2002ab1ed8ea27b10b77be.tar.gz chromium_src-b207e268e982d39f2e2002ab1ed8ea27b10b77be.tar.bz2 | |
Revert 160630 - [cc] Use base ptr types for cc's CSS animation classes
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11078009
TBR=enne@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160635 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/TreeSynchronizerTest.cpp')
| -rw-r--r-- | cc/TreeSynchronizerTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/TreeSynchronizerTest.cpp b/cc/TreeSynchronizerTest.cpp index abc38e6..e1c811b8 100644 --- a/cc/TreeSynchronizerTest.cpp +++ b/cc/TreeSynchronizerTest.cpp @@ -77,9 +77,9 @@ private: class FakeLayerAnimationController : public CCLayerAnimationController { public: - static scoped_ptr<FakeLayerAnimationController> create(CCLayerAnimationControllerClient* client) + static PassOwnPtr<FakeLayerAnimationController> create(CCLayerAnimationControllerClient* client) { - return make_scoped_ptr(new FakeLayerAnimationController(client)); + return adoptPtr(new FakeLayerAnimationController(client)); } bool synchronizedAnimations() const { return m_synchronizedAnimations; } @@ -392,7 +392,7 @@ TEST(TreeSynchronizerTest, synchronizeAnimations) scoped_refptr<LayerChromium> layerTreeRoot = LayerChromium::create(); FakeLayerAnimationControllerClient dummy; - layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::create(&dummy).PassAs<CCLayerAnimationController>()); + layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::create(&dummy)); EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerAnimationController())->synchronizedAnimations()); |