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

Unified Diff: cc/TreeSynchronizerTest.cpp

Issue 11085029: [cc] Use base ptr types for cc's CSS animation classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/LayerChromiumTest.cpp ('k') | cc/test/CCAnimationTestCommon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/TreeSynchronizerTest.cpp
diff --git a/cc/TreeSynchronizerTest.cpp b/cc/TreeSynchronizerTest.cpp
index e1c811b8def9abcb584316542f87e62f2f0cc1d5..abc38e6379a5fa69f419849ee8478421e1f34c14 100644
--- a/cc/TreeSynchronizerTest.cpp
+++ b/cc/TreeSynchronizerTest.cpp
@@ -77,9 +77,9 @@ private:
class FakeLayerAnimationController : public CCLayerAnimationController {
public:
- static PassOwnPtr<FakeLayerAnimationController> create(CCLayerAnimationControllerClient* client)
+ static scoped_ptr<FakeLayerAnimationController> create(CCLayerAnimationControllerClient* client)
{
- return adoptPtr(new FakeLayerAnimationController(client));
+ return make_scoped_ptr(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));
+ layerTreeRoot->setLayerAnimationController(FakeLayerAnimationController::create(&dummy).PassAs<CCLayerAnimationController>());
EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerAnimationController())->synchronizedAnimations());
« no previous file with comments | « cc/LayerChromiumTest.cpp ('k') | cc/test/CCAnimationTestCommon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698