| Index: Source/core/animation/CompositorAnimationsTestHelper.h
|
| diff --git a/Source/core/animation/CompositorAnimationsTestHelper.h b/Source/core/animation/CompositorAnimationsTestHelper.h
|
| index 901a4596ab14b34ec56dcac428ed25a9d17e7857..994b928dda44dfd37a82b62c43fa5ca2de480fac 100644
|
| --- a/Source/core/animation/CompositorAnimationsTestHelper.h
|
| +++ b/Source/core/animation/CompositorAnimationsTestHelper.h
|
| @@ -65,14 +65,14 @@ inline void PrintTo(const WebFloatKeyframe& frame, ::std::ostream* os)
|
|
|
| // -----------------------------------------------------------------------
|
|
|
| -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());
|
|
|
| @@ -89,25 +89,25 @@ public:
|
| 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
|
|
|
| @@ -119,7 +119,7 @@ public:
|
|
|
| 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*());
|
| };
|
|
|
|
|