| 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 21f3fb5dca734d9f7c3b34644bffd7af4a091bbb..883acc4c674e36e315c663b72fb3a91a27212a08 100644
|
| --- a/third_party/WebKit/public/platform/WebLayer.h
|
| +++ b/third_party/WebKit/public/platform/WebLayer.h
|
| @@ -42,12 +42,14 @@ class SkMatrix44;
|
| class SkImageFilter;
|
|
|
| namespace cc {
|
| +class Animation;
|
| class Layer;
|
| class LayerClient;
|
| +class FilterOperations;
|
| }
|
|
|
| namespace blink {
|
| -class WebCompositorAnimation;
|
| +
|
| class WebCompositorAnimationDelegate;
|
| class WebFilterOperations;
|
| class WebLayerScrollClient;
|
| @@ -134,11 +136,11 @@ public:
|
|
|
| // Clear the filters in use by passing in a newly instantiated
|
| // WebFilterOperations object.
|
| - virtual void setFilters(const WebFilterOperations&) = 0;
|
| + virtual void setFilters(const cc::FilterOperations&) = 0;
|
|
|
| // Clear the background filters in use by passing in a newly instantiated
|
| // WebFilterOperations object.
|
| - virtual void setBackgroundFilters(const WebFilterOperations&) = 0;
|
| + 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
|
| @@ -146,10 +148,10 @@ public:
|
| // deleting the delegate.
|
| virtual void setAnimationDelegate(WebCompositorAnimationDelegate*) = 0;
|
|
|
| -
|
| // Returns false if the animation cannot be added.
|
| - // Takes ownership of the WebCompositorAnimation object.
|
| - virtual bool addAnimation(WebCompositorAnimation*) = 0;
|
| + // 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;
|
|
|