Rename WebAnimation to WebCompositorAnimation

Source/core/animation/CompositorAnimationsTestHelper.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 47 matching lines @@
     return a.time == b.time && a.value == b.value;
 }
 
 inline void PrintTo(const WebFloatKeyframe& frame, ::std::ostream* os)
 {
     *os << "WebFloatKeyframe@" << &frame << "(" << frame.time << ", " << frame.value << ")";
 }
 
 // -----------------------------------------------------------------------
 
-class WebAnimationMock : public blink::WebAnimation {
+class WebCompositorAnimationMock : public blink::WebCompositorAnimation {
 private:
-    blink::WebAnimation::TargetProperty m_property;
+    blink::WebCompositorAnimation::TargetProperty m_property;
 
 public:
     // Target Property is set through the constructor.
-    WebAnimationMock(blink::WebAnimation::TargetProperty p) : m_property(p) { }
-    virtual blink::WebAnimation::TargetProperty targetProperty() const { return m_property; };
+    WebCompositorAnimationMock(blink::WebCompositorAnimation::TargetProperty p) : m_property(p) { }
+    virtual blink::WebCompositorAnimation::TargetProperty targetProperty() const { return m_property; };
 
     MOCK_METHOD0(id, int());
 
     MOCK_CONST_METHOD0(iterations, int());
     MOCK_METHOD1(setIterations, void(int));
 
     MOCK_CONST_METHOD0(startTime, double());
     MOCK_METHOD1(setStartTime, void(double));
 
     MOCK_CONST_METHOD0(timeOffset, double());
     MOCK_METHOD1(setTimeOffset, void(double));
 
     MOCK_CONST_METHOD0(alternatesDirection, bool());
     MOCK_METHOD1(setAlternatesDirection, void(bool));
 
     MOCK_METHOD0(delete_, void());
-    ~WebAnimationMock() { delete_(); }
+    ~WebCompositorAnimationMock() { delete_(); }
 };
 
-template<typename CurveType, blink::WebAnimationCurve::AnimationCurveType CurveId, typename KeyframeType>
-class WebAnimationCurveMock : public CurveType {
+template<typename CurveType, blink::WebCompositorAnimationCurve::AnimationCurveType CurveId, typename KeyframeType>
+class WebCompositorAnimationCurveMock : public CurveType {
 public:
     MOCK_METHOD1_T(add, void(const KeyframeType&));
-    MOCK_METHOD2_T(add, void(const KeyframeType&, blink::WebAnimationCurve::TimingFunctionType));
+    MOCK_METHOD2_T(add, void(const KeyframeType&, blink::WebCompositorAnimationCurve::TimingFunctionType));
     MOCK_METHOD5_T(add, void(const KeyframeType&, double, double, double, double));
 
     MOCK_CONST_METHOD1_T(getValue, float(double)); // Only on WebFloatAnimationCurve, but can't hurt to have here.
 
-    virtual blink::WebAnimationCurve::AnimationCurveType type() const { return CurveId; };
+    virtual blink::WebCompositorAnimationCurve::AnimationCurveType type() const { return CurveId; };
 
     MOCK_METHOD0(delete_, void());
-    ~WebAnimationCurveMock() { delete_(); }
+    ~WebCompositorAnimationCurveMock() { delete_(); }
 };
 
-typedef WebAnimationCurveMock<blink::WebFloatAnimationCurve, blink::WebAnimationCurve::AnimationCurveTypeFloat, blink::WebFloatKeyframe> WebFloatAnimationCurveMock;
+typedef WebCompositorAnimationCurveMock<blink::WebFloatAnimationCurve, blink::WebCompositorAnimationCurve::AnimationCurveTypeFloat, blink::WebFloatKeyframe> WebFloatAnimationCurveMock;
 
 } // namespace blink
 
 namespace blink {
 
 class AnimationCompositorAnimationsTestBase : public ::testing::Test {
 public:
     AnimationCompositorAnimationsTestBase() : m_proxyPlatform(&m_mockCompositor) { };
 
     class WebCompositorSupportMock : public blink::WebCompositorSupport {
     public:
-        MOCK_METHOD3(createAnimation, blink::WebAnimation*(const blink::WebAnimationCurve& curve, blink::WebAnimation::TargetProperty target, int animationId));
+        MOCK_METHOD3(createAnimation, blink::WebCompositorAnimation*(const blink::WebCompositorAnimationCurve& curve, blink::WebCompositorAnimation::TargetProperty target, int animationId));
         MOCK_METHOD0(createFloatAnimationCurve, blink::WebFloatAnimationCurve*());
     };
 
 private:
     class PlatformProxy : public blink::Platform {
     public:
         PlatformProxy(WebCompositorSupportMock** compositor) : m_compositor(compositor) { }
 
         virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) { ASSERT_NOT_REACHED(); }
     private:
@@ skipping 22 matching lines @@
     void setCompositorForTesting(WebCompositorSupportMock& mock)
     {
         ASSERT(!m_mockCompositor);
         m_mockCompositor = &mock;
     }
 };
 
 }
 
 #endif