| Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
|
| diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
|
| index 9dfdf2426ecf5fe277a1009d797d0954c24b0dcd..88e1335d7633289e2005496329b1f5a563e273de 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h
|
| @@ -46,7 +46,6 @@
|
| #include "platform/graphics/paint/PaintController.h"
|
| #include "platform/heap/Handle.h"
|
| #include "platform/transforms/TransformationMatrix.h"
|
| -#include "public/platform/WebCompositorAnimationDelegate.h"
|
| #include "public/platform/WebContentLayer.h"
|
| #include "public/platform/WebImageLayer.h"
|
| #include "public/platform/WebLayerScrollClient.h"
|
| @@ -65,7 +64,6 @@ class LinkHighlight;
|
| class JSONObject;
|
| class PaintController;
|
| class ScrollableArea;
|
| -class CompositorAnimation;
|
| class WebLayer;
|
|
|
| typedef Vector<GraphicsLayer*, 64> GraphicsLayerVector;
|
| @@ -73,7 +71,7 @@ typedef Vector<GraphicsLayer*, 64> GraphicsLayerVector;
|
| // GraphicsLayer is an abstraction for a rendering surface with backing store,
|
| // which may have associated transformation and animations.
|
|
|
| -class PLATFORM_EXPORT GraphicsLayer : public WebCompositorAnimationDelegate, public WebLayerScrollClient, public cc::LayerClient, public DisplayItemClient {
|
| +class PLATFORM_EXPORT GraphicsLayer : public WebLayerScrollClient, public cc::LayerClient, public DisplayItemClient {
|
| WTF_MAKE_NONCOPYABLE(GraphicsLayer); USING_FAST_MALLOC(GraphicsLayer);
|
| public:
|
| static PassOwnPtr<GraphicsLayer> create(GraphicsLayerFactory*, GraphicsLayerClient*);
|
| @@ -194,14 +192,6 @@ public:
|
| // Set that the position/size of the contents (image or video).
|
| void setContentsRect(const IntRect&);
|
|
|
| - // Return true if the animation is handled by the compositing system. If this returns
|
| - // false, the animation will be run by AnimationController.
|
| - // These methods handle both transitions and keyframe animations.
|
| - bool addAnimation(PassOwnPtr<CompositorAnimation>);
|
| - void pauseAnimation(int animationId, double /*timeOffset*/);
|
| - void removeAnimation(int animationId);
|
| - void abortAnimation(int animationId);
|
| -
|
| // Layer contents
|
| void setContentsToImage(Image*, RespectImageOrientationEnum = DoNotRespectImageOrientation);
|
| void setContentsToPlatformLayer(WebLayer* layer) { setContentsTo(layer); }
|
| @@ -242,11 +232,6 @@ public:
|
| IntRect interestRect();
|
| void paint(const IntRect* interestRect, GraphicsContext::DisabledMode = GraphicsContext::NothingDisabled);
|
|
|
| - // WebCompositorAnimationDelegate implementation.
|
| - void notifyAnimationStarted(double monotonicTime, int group) override;
|
| - void notifyAnimationFinished(double monotonicTime, int group) override;
|
| - void notifyAnimationAborted(double monotonicTime, int group) override;
|
| -
|
| // WebLayerScrollClient implementation.
|
| void didScroll() override;
|
|
|
|
|