| Index: third_party/WebKit/public/platform/WebLayer.h
|
| diff --git a/third_party/WebKit/public/platform/WebLayer.h b/third_party/WebKit/public/platform/WebLayer.h
|
| index 51c8619d42f8237e935357315b6bea33a789d02a..dd508780582275c1c3a664374508a435c59d7502 100644
|
| --- a/third_party/WebKit/public/platform/WebLayer.h
|
| +++ b/third_party/WebKit/public/platform/WebLayer.h
|
| @@ -41,7 +41,6 @@ class SkMatrix44;
|
| class SkImageFilter;
|
|
|
| namespace cc {
|
| -class Animation;
|
| class Layer;
|
| class LayerClient;
|
| class FilterOperations;
|
| @@ -49,7 +48,6 @@ class FilterOperations;
|
|
|
| namespace blink {
|
|
|
| -class WebCompositorAnimationDelegate;
|
| class WebLayerScrollClient;
|
| struct WebFloatPoint;
|
| struct WebLayerPositionConstraint;
|
| @@ -141,30 +139,8 @@ public:
|
| // TODO(loyso): This should use CompositorFilterOperation. crbug.com/584551
|
| virtual void setBackgroundFilters(const cc::FilterOperations&) = 0;
|
|
|
| - // An animation delegate is notified when animations are started and
|
| - // stopped. The WebLayer does not take ownership of the delegate, and it is
|
| - // the responsibility of the client to reset the layer's delegate before
|
| - // deleting the delegate.
|
| - virtual void setAnimationDelegate(WebCompositorAnimationDelegate*) = 0;
|
| -
|
| - // Returns false if the animation cannot be added.
|
| - // Takes ownership of the cc::Animation object.
|
| - // TODO(loyso): Erase it. crbug.com/575041
|
| - virtual bool addAnimation(cc::Animation*) = 0;
|
| -
|
| - // Removes all animations with the given id.
|
| - virtual void removeAnimation(int animationId) = 0;
|
| -
|
| - // Pauses all animations with the given id.
|
| - virtual void pauseAnimation(int animationId, double timeOffset) = 0;
|
| -
|
| - // Aborts all animations with the given id. Different from removeAnimation
|
| - // in that aborting an animation stops it from affecting both the pending
|
| - // and active tree.
|
| - virtual void abortAnimation(int animationId) = 0;
|
| -
|
| // Returns true if this layer has any active animations - useful for tests.
|
| - virtual bool hasActiveAnimation() = 0;
|
| + virtual bool hasActiveAnimationForTesting() = 0;
|
|
|
| // If a scroll parent is set, this layer will inherit its parent's scroll
|
| // delta and offset even though it will not be a descendant of the scroll
|
|
|