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

Unified Diff: cc/scrollbar_animation_controller.cc

Issue 11138029: cc: Remove wtf includes from layer_impl.h (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/scrollbar_animation_controller.h ('k') | cc/scrollbar_animation_controller_linear_fade.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scrollbar_animation_controller.cc
diff --git a/cc/scrollbar_animation_controller.cc b/cc/scrollbar_animation_controller.cc
index 89f74cb55ead58446537318609e8c7a7b732d0df..cdd0974141b9fa36a7b65be7ce647713fd3017e3 100644
--- a/cc/scrollbar_animation_controller.cc
+++ b/cc/scrollbar_animation_controller.cc
@@ -16,16 +16,16 @@
namespace cc {
#if OS(ANDROID)
-PassOwnPtr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
+scoped_ptr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
{
static const double fadeoutDelay = 0.3;
static const double fadeoutLength = 0.3;
return CCScrollbarAnimationControllerLinearFade::create(scrollLayer, fadeoutDelay, fadeoutLength);
jamesr 2012/10/16 00:23:50 I think you need a least a .Pass() here for this t
}
#else
-PassOwnPtr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
+scoped_ptr<CCScrollbarAnimationController> CCScrollbarAnimationController::create(CCLayerImpl* scrollLayer)
{
- return adoptPtr(new CCScrollbarAnimationController(scrollLayer));
+ return make_scoped_ptr(new CCScrollbarAnimationController(scrollLayer));
}
#endif
« no previous file with comments | « cc/scrollbar_animation_controller.h ('k') | cc/scrollbar_animation_controller_linear_fade.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698