Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1990)

Unified Diff: cc/test/CCAnimationTestCommon.h

Issue 11108020: [cc] Change cc_tests.gyp filenames to Chromium style (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/solid_color_layer_impl_unittest.cc ('k') | cc/test/CCAnimationTestCommon.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/CCAnimationTestCommon.h
diff --git a/cc/test/CCAnimationTestCommon.h b/cc/test/CCAnimationTestCommon.h
index a768930afe2b600a3e1458af37bb3a233944198a..975865b514f34b288d689a9ed5b2a5e636175ccc 100644
--- a/cc/test/CCAnimationTestCommon.h
+++ b/cc/test/CCAnimationTestCommon.h
@@ -2,91 +2,5 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CCAnimationTestCommon_h
-#define CCAnimationTestCommon_h
-
-#include "CCActiveAnimation.h"
-#include "CCAnimationCurve.h"
-#include "CCLayerAnimationController.h"
-#include "IntSize.h"
-
-namespace cc {
-class CCLayerImpl;
-class LayerChromium;
-}
-
-namespace WebKitTests {
-
-class FakeFloatAnimationCurve : public cc::CCFloatAnimationCurve {
-public:
- FakeFloatAnimationCurve();
- explicit FakeFloatAnimationCurve(double duration);
- virtual ~FakeFloatAnimationCurve();
-
- virtual double duration() const OVERRIDE;
- virtual float getValue(double now) const OVERRIDE;
- virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE;
-
-private:
- double m_duration;
-};
-
-class FakeTransformTransition : public cc::CCTransformAnimationCurve {
-public:
- FakeTransformTransition(double duration);
- virtual ~FakeTransformTransition();
-
- virtual double duration() const OVERRIDE;
- virtual WebKit::WebTransformationMatrix getValue(double time) const OVERRIDE;
-
- virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE;
-
-private:
- double m_duration;
-};
-
-class FakeFloatTransition : public cc::CCFloatAnimationCurve {
-public:
- FakeFloatTransition(double duration, float from, float to);
- virtual ~FakeFloatTransition();
-
- virtual double duration() const OVERRIDE;
- virtual float getValue(double time) const OVERRIDE;
-
- virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE;
-
-private:
- double m_duration;
- float m_from;
- float m_to;
-};
-
-class FakeLayerAnimationControllerClient : public cc::CCLayerAnimationControllerClient {
-public:
- FakeLayerAnimationControllerClient();
- virtual ~FakeLayerAnimationControllerClient();
-
- // CCLayerAnimationControllerClient implementation
- 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;
- WebKit::WebTransformationMatrix m_transform;
-};
-
-void addOpacityTransitionToController(cc::CCLayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
-void addAnimatedTransformToController(cc::CCLayerAnimationController&, double duration, int deltaX, int deltaY);
-
-void addOpacityTransitionToLayer(cc::LayerChromium&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
-void addOpacityTransitionToLayer(cc::CCLayerImpl&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
-
-void addAnimatedTransformToLayer(cc::LayerChromium&, double duration, int deltaX, int deltaY);
-void addAnimatedTransformToLayer(cc::CCLayerImpl&, double duration, int deltaX, int deltaY);
-
-} // namespace WebKitTests
-
-#endif // CCAnimationTesctCommon_h
+// Temporary forwarding header
+#include "cc/test/animation_test_common.h"
« no previous file with comments | « cc/solid_color_layer_impl_unittest.cc ('k') | cc/test/CCAnimationTestCommon.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698