| Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h
|
| index f10acb31d9b79778dea83d4b918041c2feaf3d6d..440aa7e445f6dfc848e99b6ad234cefda4eba95f 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h
|
| @@ -22,9 +22,9 @@ public:
|
| virtual ~ScrollAnimatorCompositorCoordinator();
|
|
|
| bool hasAnimationThatRequiresService() const;
|
| - void cancelAnimation();
|
|
|
| virtual void resetAnimationState();
|
| + virtual void cancelAnimation();
|
|
|
| virtual ScrollableArea* scrollableArea() const = 0;
|
| virtual void tickAnimation(double monotonicTime) = 0;
|
| @@ -39,6 +39,7 @@ protected:
|
|
|
| bool addAnimation(PassOwnPtr<WebCompositorAnimation>);
|
| void removeAnimation();
|
| + void abortAnimation();
|
|
|
| void compositorAnimationFinished(int groupId);
|
| void reattachCompositorPlayerIfNeeded(WebCompositorAnimationTimeline*);
|
| @@ -62,6 +63,9 @@ protected:
|
| // Running an animation on the compositor.
|
| RunningOnCompositor,
|
|
|
| + // Running an animation on the compositor but needs update.
|
| + RunningOnCompositorButNeedsUpdate,
|
| +
|
| // Running an animation on the main thread.
|
| RunningOnMainThread,
|
|
|
|
|