summaryrefslogtreecommitdiffstats
path: root/cc/blink
diff options
context:
space:
mode:
authornoel <noel@chromium.org>2015-12-23 01:14:42 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-23 09:15:32 +0000
commit51059d9d038aa255afdddfcbd3d418eb42b718ff (patch)
tree5512cbc0356e5625f4420b4e85c84cb5d4b458ba /cc/blink
parentc84bb8292a926a8441160de8e043a04de50895ae (diff)
downloadchromium_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 'cc/blink')
-rw-r--r--cc/blink/web_compositor_animation_player_impl.cc4
-rw-r--r--cc/blink/web_compositor_animation_player_impl.h1
-rw-r--r--cc/blink/web_layer_impl.cc4
-rw-r--r--cc/blink/web_layer_impl.h1
4 files changed, 0 insertions, 10 deletions
diff --git a/cc/blink/web_compositor_animation_player_impl.cc b/cc/blink/web_compositor_animation_player_impl.cc
index 150ec93..b73d8d8 100644
--- a/cc/blink/web_compositor_animation_player_impl.cc
+++ b/cc/blink/web_compositor_animation_player_impl.cc
@@ -68,8 +68,4 @@ void WebCompositorAnimationPlayerImpl::pauseAnimation(int animation_id,
animation_player_->PauseAnimation(animation_id, time_offset);
}
-void WebCompositorAnimationPlayerImpl::abortAnimation(int animation_id) {
- animation_player_->AbortAnimation(animation_id);
-}
-
} // namespace cc_blink
diff --git a/cc/blink/web_compositor_animation_player_impl.h b/cc/blink/web_compositor_animation_player_impl.h
index 429438f..0cc6975 100644
--- a/cc/blink/web_compositor_animation_player_impl.h
+++ b/cc/blink/web_compositor_animation_player_impl.h
@@ -36,7 +36,6 @@ class WebCompositorAnimationPlayerImpl
void addAnimation(blink::WebCompositorAnimation* animation) override;
void removeAnimation(int animation_id) override;
void pauseAnimation(int animation_id, double time_offset) override;
- void abortAnimation(int animation_id) override;
private:
scoped_refptr<cc::AnimationPlayer> animation_player_;
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index 88601b5..2210a9e 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -278,10 +278,6 @@ void WebLayerImpl::pauseAnimation(int animation_id, double time_offset) {
layer_->PauseAnimation(animation_id, time_offset);
}
-void WebLayerImpl::abortAnimation(int animation_id) {
- layer_->AbortAnimation(animation_id);
-}
-
bool WebLayerImpl::hasActiveAnimation() {
return layer_->HasActiveAnimation();
}
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h
index 3fd0bcc..a1b762b 100644
--- a/cc/blink/web_layer_impl.h
+++ b/cc/blink/web_layer_impl.h
@@ -113,7 +113,6 @@ class WebLayerImpl : public blink::WebLayer {
void removeAnimation(int animation_id,
blink::WebCompositorAnimation::TargetProperty) override;
void pauseAnimation(int animation_id, double time_offset) override;
- void abortAnimation(int animation_id) override;
bool hasActiveAnimation() override;
void setForceRenderSurface(bool force) override;
void setScrollPositionDouble(blink::WebDoublePoint position) override;