Index: third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp |
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp |
index a01daa2ad01bbbd852ef45d151aa4978bf9bc0b1..a6dc9bffc3c47ebd627718a9fbf18deb93ab410c 100644 |
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp |
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp |
@@ -41,11 +41,11 @@ |
namespace blink { |
-PassOwnPtr<ScrollAnimatorBase> ScrollAnimatorBase::create(ScrollableArea* scrollableArea) |
+PassOwnPtrWillBeRawPtr<ScrollAnimatorBase> ScrollAnimatorBase::create(ScrollableArea* scrollableArea) |
{ |
if (scrollableArea && scrollableArea->scrollAnimatorEnabled()) |
- return adoptPtr(new ScrollAnimator(scrollableArea)); |
- return adoptPtr(new ScrollAnimatorBase(scrollableArea)); |
+ return adoptPtrWillBeNoop(new ScrollAnimator(scrollableArea)); |
+ return adoptPtrWillBeNoop(new ScrollAnimatorBase(scrollableArea)); |
} |
ScrollAnimator::ScrollAnimator(ScrollableArea* scrollableArea, WTF::TimeFunction timeFunction) |
@@ -150,4 +150,9 @@ void ScrollAnimator::animationTimerFired() |
notifyPositionChanged(); |
} |
+DEFINE_TRACE(ScrollAnimator) |
+{ |
+ ScrollAnimatorBase::trace(visitor); |
+} |
+ |
} // namespace blink |