diff options
| author | noel <noel@chromium.org> | 2015-12-23 01:14:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-23 09:15:32 +0000 |
| commit | 51059d9d038aa255afdddfcbd3d418eb42b718ff (patch) | |
| tree | 5512cbc0356e5625f4420b4e85c84cb5d4b458ba /third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp | |
| parent | c84bb8292a926a8441160de8e043a04de50895ae (diff) | |
| download | chromium_src-51059d9d038aa255afdddfcbd3d418eb42b718ff.zip chromium_src-51059d9d038aa255afdddfcbd3d418eb42b718ff.tar.gz chromium_src-51059d9d038aa255afdddfcbd3d418eb42b718ff.tar.bz2 | |
Revert of Run smooth scroll animations on the compositor when possible (patchset #4 id:60001 of https://codereview.chromium.org/1534813004/ )
Reason for revert:
Appears to have made Linux debug builds fail the following tests:
virtual/threaded/fast/scroll-behavior/overflow-scroll-root-frame-animates.html
virtual/threaded/fast/scroll-behavior/overflow-scroll-animates.html
https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20%28dbg%29/builds/5360
Reverting to green the Blink tree.
Original issue's description:
> Run smooth scroll animations on the compositor when possible
>
> This CL implements "immediate retargeting" shown in the following diagram:
> https://docs.google.com/drawings/d/1z76m-GMDgLI-clkfroLJ-5yhsHkmriZr_swP0kn5iw4
>
> This CL does the following
> - Add a new state to ScrollAnimatorCompositorCoordinator to update the target
> offset on the compositor
> - Use the ScrollAnimatorCompositorCoordinator to schedule anim
> - Add plumbing from the animators to the animation controller to abort
> animations
>
> Sample test pages:
> yashmalik.com/nested_scroll_mousewheel_listener.html
> yashmalik.com/nested_scroll_mousewheel_listener_15ms_janky.html (tight loop in RAF)
>
> BUG=552556
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/5534a2b2972534b523014c803e1e0e0541855cc7
> Cr-Commit-Position: refs/heads/master@{#366685}
TBR=skobes@chromium.org,ajuma@chromium.org,vollick@chromium.org,rbyers@chromium.org,ymalik@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=552556
Review URL: https://codereview.chromium.org/1548883002
Cr-Commit-Position: refs/heads/master@{#366733}
Diffstat (limited to 'third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp')
| -rw-r--r-- | third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp b/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp index 3e29f04..6910c4f 100644 --- a/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp +++ b/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp @@ -64,12 +64,6 @@ void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset) m_runState = RunState::WaitingToSendToCompositor; } -void ProgrammaticScrollAnimator::cancelAnimation() -{ - ASSERT(m_runState != RunState::RunningOnCompositorButNeedsUpdate); - ScrollAnimatorCompositorCoordinator::cancelAnimation(); -} - void ProgrammaticScrollAnimator::tickAnimation(double monotonicTime) { if (m_runState != RunState::RunningOnMainThread) @@ -160,7 +154,6 @@ void ProgrammaticScrollAnimator::layerForCompositedScrollingDidChange(WebComposi void ProgrammaticScrollAnimator::notifyCompositorAnimationFinished(int groupId) { - ASSERT(m_runState != RunState::RunningOnCompositorButNeedsUpdate); ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); } |