| Index: third_party/WebKit/Source/platform/scroll/ScrollAnimator.h
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.h b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.h
|
| index 2084860ebd6547a512bc568d22b3772f70c24821..623b7ecbfd517a37ce508f1243a081b8a3479c5e 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.h
|
| @@ -43,7 +43,7 @@ namespace blink {
|
| class ScrollAnimatorTest;
|
| class CompositorAnimationTimeline;
|
|
|
| -class PLATFORM_EXPORT ScrollAnimator final : public ScrollAnimatorBase {
|
| +class PLATFORM_EXPORT ScrollAnimator : public ScrollAnimatorBase {
|
| public:
|
| explicit ScrollAnimator(ScrollableArea*, WTF::TimeFunction = WTF::monotonicallyIncreasingTime);
|
| ~ScrollAnimator() override;
|
| @@ -58,6 +58,7 @@ public:
|
| // ScrollAnimatorCompositorCoordinator implementation.
|
| void tickAnimation(double monotonicTime) override;
|
| void cancelAnimation() override;
|
| + void takeoverCompositorAnimation() override;
|
| void resetAnimationState() override;
|
| void updateCompositorAnimations() override;
|
| void notifyCompositorAnimationFinished(int groupId) override;
|
| @@ -67,6 +68,9 @@ public:
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| protected:
|
| + // Returns whether or not the animation was sent to the compositor.
|
| + virtual bool sendAnimationToCompositor();
|
| +
|
| void notifyAnimationTakeover(
|
| double monotonicTime,
|
| double animationStartTime,
|
|
|