Chromium Code Reviews| Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.h |
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.h b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.h |
| index 3503b7f1a0b5e0a8f8009496307d7a62f18c5035..240ecd84b6c39e9da89be81483b6b29efc131bd6 100644 |
| --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.h |
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorBase.h |
| @@ -35,6 +35,7 @@ |
| #include "platform/PlatformWheelEvent.h" |
| #include "platform/geometry/FloatSize.h" |
| #include "platform/heap/Handle.h" |
| +#include "platform/scroll/ScrollAnimatorCompositorCoordinator.h" |
| #include "platform/scroll/ScrollTypes.h" |
| #include "wtf/Forward.h" |
| @@ -43,8 +44,9 @@ namespace blink { |
| class FloatPoint; |
| class ScrollableArea; |
| class Scrollbar; |
| +class WebCompositorAnimationTimeline; |
| -class PLATFORM_EXPORT ScrollAnimatorBase : public NoBaseWillBeGarbageCollectedFinalized<ScrollAnimatorBase> { |
| +class PLATFORM_EXPORT ScrollAnimatorBase : public ScrollAnimatorCompositorCoordinator { |
| public: |
| static PassOwnPtrWillBeRawPtr<ScrollAnimatorBase> create(ScrollableArea*); |
| @@ -61,8 +63,6 @@ public: |
| virtual void scrollToOffsetWithoutAnimation(const FloatPoint&); |
| - ScrollableArea* scrollableArea() const { return m_scrollableArea; } |
| - |
| virtual void setIsActive() { } |
| #if OS(MACOSX) |
| @@ -76,9 +76,14 @@ public: |
| // area. |
| virtual float computeDeltaToConsume(ScrollbarOrientation, float pixelDelta) const; |
| - virtual void cancelAnimations() { } |
| - virtual void serviceScrollAnimations() { } |
| - virtual bool hasRunningAnimation() const { return false; } |
| + |
| + // ScrollAnimatorCompositorCoordinator implementation. |
| + ScrollableArea* scrollableArea() const override { return m_scrollableArea; } |
| + void tickAnimation(double monotonicTime) override { }; |
| + void cancelAnimation() { } |
|
ajuma
2015/12/18 19:02:54
Missing 'override'
ymalik
2015/12/18 19:35:47
Good catch. Thanks!
|
| + void updateCompositorAnimations() override { }; |
| + void notifyCompositorAnimationFinished(int groupId) override { }; |
| + void layerForCompositedScrollingDidChange(WebCompositorAnimationTimeline*) override { }; |
| virtual void contentAreaWillPaint() const { } |
| virtual void mouseEnteredContentArea() const { } |