| 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 6819510c50b43c8c4dbd2589c698f84585f8be53..9b69df747f69c2eef0b5c786e4b457f06511894c 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.h
|
| @@ -114,6 +114,12 @@ protected:
|
| // on the main thread. This could happen if a main thread scrolling
|
| // reason is added while animating the scroll offset.
|
| RunningOnCompositorButNeedsTakeover,
|
| +
|
| + // Waiting to cancel the animation currently running on the compositor
|
| + // while another animation is requested. In this case, the currently
|
| + // running animation is aborted and an animation to the new target
|
| + // from the current position is started.
|
| + WaitingToCancelOnCompositorButNewScroll,
|
| };
|
|
|
| OwnPtr<CompositorAnimationPlayer> m_compositorPlayer;
|
|
|