| Index: cc/test/CCAnimationTestCommon.h
|
| diff --git a/cc/test/CCAnimationTestCommon.h b/cc/test/CCAnimationTestCommon.h
|
| index 9f13643a4a433adc7e402b7071c6dfa46014ac9c..51f5a51305eb721ad459a24704dc26864c9bec61 100644
|
| --- a/cc/test/CCAnimationTestCommon.h
|
| +++ b/cc/test/CCAnimationTestCommon.h
|
| @@ -24,8 +24,8 @@ public:
|
| FakeFloatAnimationCurve();
|
| virtual ~FakeFloatAnimationCurve();
|
|
|
| - virtual double duration() const OVERRIDE { return 1; }
|
| - virtual float getValue(double now) const OVERRIDE { return 0; }
|
| + virtual double duration() const OVERRIDE;
|
| + virtual float getValue(double now) const OVERRIDE;
|
| virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const OVERRIDE;
|
| };
|
|
|
| @@ -34,7 +34,7 @@ public:
|
| FakeTransformTransition(double duration);
|
| virtual ~FakeTransformTransition();
|
|
|
| - virtual double duration() const OVERRIDE { return m_duration; }
|
| + virtual double duration() const OVERRIDE;
|
| virtual WebKit::WebTransformationMatrix getValue(double time) const OVERRIDE;
|
|
|
| virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const OVERRIDE;
|
| @@ -48,7 +48,7 @@ public:
|
| FakeFloatTransition(double duration, float from, float to);
|
| virtual ~FakeFloatTransition();
|
|
|
| - virtual double duration() const OVERRIDE { return m_duration; }
|
| + virtual double duration() const OVERRIDE;
|
| virtual float getValue(double time) const OVERRIDE;
|
|
|
| virtual PassOwnPtr<WebCore::CCAnimationCurve> clone() const OVERRIDE;
|
| @@ -65,11 +65,11 @@ public:
|
| virtual ~FakeLayerAnimationControllerClient();
|
|
|
| // 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 WebKit::WebTransformationMatrix& transform) OVERRIDE { m_transform = transform; }
|
| - virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE { return m_transform; }
|
| + virtual int id() const OVERRIDE;
|
| + virtual void setOpacityFromAnimation(float) OVERRIDE;
|
| + virtual float opacity() const OVERRIDE;
|
| + virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix&) OVERRIDE;
|
| + virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE;
|
|
|
| private:
|
| float m_opacity;
|
|
|