| Index: Source/platform/graphics/GraphicsLayer.h
|
| diff --git a/Source/platform/graphics/GraphicsLayer.h b/Source/platform/graphics/GraphicsLayer.h
|
| index e6f8c1071070cb7f786597e11d12b82edbefe393..64cdab6cd5f2076faca634db7e3dcb3da3efe5da 100644
|
| --- a/Source/platform/graphics/GraphicsLayer.h
|
| +++ b/Source/platform/graphics/GraphicsLayer.h
|
| @@ -38,7 +38,7 @@
|
| #include "platform/graphics/OpaqueRectTrackingContentLayerDelegate.h"
|
| #include "platform/graphics/filters/FilterOperations.h"
|
| #include "platform/transforms/TransformationMatrix.h"
|
| -#include "public/platform/WebAnimationDelegate.h"
|
| +#include "public/platform/WebCompositorAnimationDelegate.h"
|
| #include "public/platform/WebContentLayer.h"
|
| #include "public/platform/WebImageLayer.h"
|
| #include "public/platform/WebLayerClient.h"
|
| @@ -51,7 +51,7 @@
|
|
|
| namespace blink {
|
| class GraphicsLayerFactoryChromium;
|
| -class WebAnimation;
|
| +class WebCompositorAnimation;
|
| class WebLayer;
|
| }
|
|
|
| @@ -82,7 +82,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 GraphicsContextPainter, public blink::WebAnimationDelegate, public blink::WebLayerScrollClient, public blink::WebLayerClient {
|
| +class PLATFORM_EXPORT GraphicsLayer : public GraphicsContextPainter, public blink::WebCompositorAnimationDelegate, public blink::WebLayerScrollClient, public blink::WebLayerClient {
|
| WTF_MAKE_NONCOPYABLE(GraphicsLayer); WTF_MAKE_FAST_ALLOCATED;
|
| public:
|
| static PassOwnPtr<GraphicsLayer> create(GraphicsLayerFactory*, GraphicsLayerClient*);
|
| @@ -204,7 +204,7 @@ public:
|
| // 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<blink::WebAnimation>);
|
| + bool addAnimation(PassOwnPtr<blink::WebCompositorAnimation>);
|
| void pauseAnimation(int animationId, double /*timeOffset*/);
|
| void removeAnimation(int animationId);
|
|
|
| @@ -252,9 +252,9 @@ public:
|
| // GraphicsContextPainter implementation.
|
| virtual void paint(GraphicsContext&, const IntRect& clip) OVERRIDE;
|
|
|
| - // WebAnimationDelegate implementation.
|
| - virtual void notifyAnimationStarted(double monotonicTime, blink::WebAnimation::TargetProperty) OVERRIDE;
|
| - virtual void notifyAnimationFinished(double monotonicTime, blink::WebAnimation::TargetProperty) OVERRIDE;
|
| + // WebCompositorAnimationDelegate implementation.
|
| + virtual void notifyAnimationStarted(double monotonicTime, blink::WebCompositorAnimation::TargetProperty) OVERRIDE;
|
| + virtual void notifyAnimationFinished(double monotonicTime, blink::WebCompositorAnimation::TargetProperty) OVERRIDE;
|
|
|
| // WebLayerScrollClient implementation.
|
| virtual void didScroll() OVERRIDE;
|
|
|