Chromium Code Reviews| 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 |