Index: Source/platform/graphics/GraphicsLayer.cpp |
diff --git a/Source/platform/graphics/GraphicsLayer.cpp b/Source/platform/graphics/GraphicsLayer.cpp |
index eb89f252fd7b0fbef63a82e4aeb672a97e50b840..db9089f36e3f59251d03bde296f72a6e10cbd795 100644 |
--- a/Source/platform/graphics/GraphicsLayer.cpp |
+++ b/Source/platform/graphics/GraphicsLayer.cpp |
@@ -38,7 +38,7 @@ |
#include "platform/scroll/ScrollableArea.h" |
#include "platform/text/TextStream.h" |
#include "public/platform/Platform.h" |
-#include "public/platform/WebAnimation.h" |
+#include "public/platform/WebCompositorAnimation.h" |
#include "public/platform/WebCompositorSupport.h" |
#include "public/platform/WebFilterOperations.h" |
#include "public/platform/WebFloatPoint.h" |
@@ -58,6 +58,12 @@ |
#include <stdio.h> |
#endif |
+using blink::Platform; |
+using blink::WebCompositorAnimation; |
+using blink::WebFilterOperations; |
+using blink::WebLayer; |
+using blink::WebPoint; |
+ |
namespace blink { |
typedef HashMap<const GraphicsLayer*, Vector<FloatRect> > RepaintMap; |
@@ -946,9 +952,9 @@ void GraphicsLayer::setContentsToNinePatch(Image* image, const IntRect& aperture |
setContentsTo(m_ninePatchLayer ? m_ninePatchLayer->layer() : 0); |
} |
-bool GraphicsLayer::addAnimation(PassOwnPtr<WebAnimation> popAnimation) |
+bool GraphicsLayer::addAnimation(PassOwnPtr<WebCompositorAnimation> popAnimation) |
{ |
- OwnPtr<WebAnimation> animation(popAnimation); |
+ OwnPtr<WebCompositorAnimation> animation(popAnimation); |
ASSERT(animation); |
platformLayer()->setAnimationDelegate(this); |
@@ -1027,13 +1033,13 @@ void GraphicsLayer::paint(GraphicsContext& context, const IntRect& clip) |
} |
-void GraphicsLayer::notifyAnimationStarted(double monotonicTime, WebAnimation::TargetProperty) |
+void GraphicsLayer::notifyAnimationStarted(double monotonicTime, WebCompositorAnimation::TargetProperty) |
{ |
if (m_client) |
m_client->notifyAnimationStarted(this, monotonicTime); |
} |
-void GraphicsLayer::notifyAnimationFinished(double, WebAnimation::TargetProperty) |
+void GraphicsLayer::notifyAnimationFinished(double, WebCompositorAnimation::TargetProperty) |
{ |
// Do nothing. |
} |