1 files changed, 28 insertions, 22 deletions

diff --git a/Source/WebKit/chromium/tests/CCAnimationTestCommon.h b/Source/WebKit/chromium/tests/CCAnimationTestCommon.h
index d13e74ca1..776b75c8d 100644
--- a/Source/WebKit/chromium/tests/CCAnimationTestCommon.h
+++ b/Source/WebKit/chromium/tests/CCAnimationTestCommon.h
@@ -26,12 +26,12 @@
 #define CCAnimationTestCommon_h
 
 #include "cc/CCAnimationCurve.h"
-#include "cc/CCLayerAnimationControllerImpl.h"
+#include "cc/CCLayerAnimationController.h"
 
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
-class CCLayerAnimationController;
+class CCLayerImpl;
 class LayerChromium;
 }
 
@@ -42,9 +42,9 @@ public:
     FakeFloatAnimationCurve();
     virtual ~FakeFloatAnimationCurve();
 
-    virtual double duration() const { return 1; }
-    virtual float getValue(double now) const { return 0; }
-    virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const;
+    virtual double duration() const OVERRIDE { return 1; }
+    virtual float getValue(double now) const OVERRIDE { return 0; }
+    virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const OVERRIDE;
 };
 
 class FakeTransformTransition : public WebCore::CCTransformAnimationCurve {
@@ -52,10 +52,10 @@ public:
     FakeTransformTransition(double duration);
     virtual ~FakeTransformTransition();
 
-    virtual double duration() const { return m_duration; }
-    virtual WebCore::TransformationMatrix getValue(double time, const WebCore::IntSize&) const;
+    virtual double duration() const OVERRIDE { return m_duration; }
+    virtual WebCore::TransformationMatrix getValue(double time, const WebCore::IntSize&) const OVERRIDE;
 
-    virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const;
+    virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const OVERRIDE;
 
 private:
     double m_duration;
@@ -66,10 +66,10 @@ public:
     FakeFloatTransition(double duration, float from, float to);
     virtual ~FakeFloatTransition();
 
-    virtual double duration() const { return m_duration; }
-    virtual float getValue(double time) const;
+    virtual double duration() const OVERRIDE { return m_duration; }
+    virtual float getValue(double time) const OVERRIDE;
 
-    virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const;
+    virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const OVERRIDE;
 
 private:
     double m_duration;
@@ -77,17 +77,18 @@ private:
     float m_to;
 };
 
-class FakeLayerAnimationControllerImplClient : public WebCore::CCLayerAnimationControllerImplClient {
+class FakeLayerAnimationControllerClient : public WebCore::CCLayerAnimationControllerClient {
 public:
-    FakeLayerAnimationControllerImplClient();
-    virtual ~FakeLayerAnimationControllerImplClient();
+    FakeLayerAnimationControllerClient();
+    virtual ~FakeLayerAnimationControllerClient();
 
-    virtual int id() const { return 0; }
-    virtual float opacity() const { return m_opacity; }
-    virtual void setOpacity(float opacity) { m_opacity = opacity; }
-    virtual const WebCore::TransformationMatrix& transform() const { return m_transform; }
-    virtual void setTransform(const WebCore::TransformationMatrix& transform) { m_transform = transform; }
-    virtual const WebCore::IntSize& bounds() const { return m_bounds; }
+    // CCLayerAnimationControllerClient implementation
+    virtual int id() const OVERRIDE { return 0; }
+    virtual void setOpacityFromAnimation(float opacity) OVERRIDE { m_opacity = opacity; }
+    virtual float opacity() const OVERRIDE { return m_opacity; }
+    virtual void setTransformFromAnimation(const WebCore::TransformationMatrix& transform) OVERRIDE { m_transform = transform; }
+    virtual const WebCore::TransformationMatrix& transform() const OVERRIDE { return m_transform; }
+    virtual const WebCore::IntSize& bounds() const OVERRIDE { return m_bounds; }
 
 private:
     float m_opacity;
@@ -95,9 +96,14 @@ private:
     WebCore::IntSize m_bounds;
 };
 
-void addOpacityTransitionToController(WebCore::CCLayerAnimationController&, double duration, float startOpacity, float endOpacity);
+void addOpacityTransitionToController(WebCore::CCLayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
+void addAnimatedTransformToController(WebCore::CCLayerAnimationController&, double duration, int deltaX, int deltaY);
 
-void addOpacityTransitionToLayer(WebCore::LayerChromium&, double duration, float startOpacity, float endOpacity);
+void addOpacityTransitionToLayer(WebCore::LayerChromium&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
+void addOpacityTransitionToLayer(WebCore::CCLayerImpl&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
+
+void addAnimatedTransformToLayer(WebCore::LayerChromium&, double duration, int deltaX, int deltaY);
+void addAnimatedTransformToLayer(WebCore::CCLayerImpl&, double duration, int deltaX, int deltaY);
 
 } // namespace WebKitTests