diff options
| author | loyso <loyso@chromium.org> | 2016-01-27 07:09:59 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-27 15:11:06 +0000 |
| commit | aa6dcbe9992ae5aa506bb0a69945acef8350078e (patch) | |
| tree | 16180f9c82af817284f8c4934fc8db21be227e0f /cc/blink | |
| parent | 240253407e781f78b65f96332061519b754abdcb (diff) | |
| download | chromium_src-aa6dcbe9992ae5aa506bb0a69945acef8350078e.zip chromium_src-aa6dcbe9992ae5aa506bb0a69945acef8350078e.tar.gz chromium_src-aa6dcbe9992ae5aa506bb0a69945acef8350078e.tar.bz2 | |
CC Animation: Remove meaningless method from WebLayer.
We always create new animations with unique ids. So the removeAnimation(unique_id, target_property) call on adding a new animation is meaningless.
This change allows us to forward declare WebCompositorAnimation class for WebLayer interface.
BUG=577016
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1637083004
Cr-Commit-Position: refs/heads/master@{#371788}
Diffstat (limited to 'cc/blink')
| -rw-r--r-- | cc/blink/web_layer_impl.cc | 7 | ||||
| -rw-r--r-- | cc/blink/web_layer_impl.h | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc index 41efb47..ce26503 100644 --- a/cc/blink/web_layer_impl.cc +++ b/cc/blink/web_layer_impl.cc @@ -265,13 +265,6 @@ void WebLayerImpl::removeAnimation(int animation_id) { layer_->RemoveAnimation(animation_id); } -void WebLayerImpl::removeAnimation( - int animation_id, - blink::WebCompositorAnimation::TargetProperty target_property) { - layer_->RemoveAnimation( - animation_id, static_cast<Animation::TargetProperty>(target_property)); -} - void WebLayerImpl::pauseAnimation(int animation_id, double time_offset) { layer_->PauseAnimation(animation_id, time_offset); } diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h index f63ba55..d0afa5f 100644 --- a/cc/blink/web_layer_impl.h +++ b/cc/blink/web_layer_impl.h @@ -18,7 +18,6 @@ #include "cc/layers/layer_client.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebColor.h" -#include "third_party/WebKit/public/platform/WebCompositorAnimation.h" #include "third_party/WebKit/public/platform/WebDoublePoint.h" #include "third_party/WebKit/public/platform/WebFloatPoint.h" #include "third_party/WebKit/public/platform/WebLayer.h" @@ -110,8 +109,6 @@ class WebLayerImpl : public blink::WebLayer { blink::WebCompositorAnimationDelegate* delegate) override; bool addAnimation(blink::WebCompositorAnimation* animation) override; void removeAnimation(int animation_id) override; - 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; |