summaryrefslogtreecommitdiffstats
path: root/cc/test/animation_test_common.h
diff options
context:
space:
mode:
authorshawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-27 08:29:00 +0000
committershawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-27 08:29:00 +0000
commitc8686a05e1fa4cb3aa82690d7450791828096840 (patch)
treec43ef1a56ac27a06bc1ed7c069850cf7c6790002 /cc/test/animation_test_common.h
parent5006a4185d3a95976ced07022188f9abb48790be (diff)
downloadchromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.zip
chromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.tar.gz
chromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.tar.bz2
Animation code is not yet migrated by this patch, due to WebTransformOperations.
BUG=159972 Review URL: https://codereview.chromium.org/11308153 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/animation_test_common.h')
-rw-r--r--cc/test/animation_test_common.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h
index 6839800..d293206 100644
--- a/cc/test/animation_test_common.h
+++ b/cc/test/animation_test_common.h
@@ -69,12 +69,12 @@ public:
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;
+ virtual void setTransformFromAnimation(const gfx::Transform&) OVERRIDE;
+ virtual const gfx::Transform& transform() const OVERRIDE;
private:
float m_opacity;
- WebKit::WebTransformationMatrix m_transform;
+ gfx::Transform m_transform;
};
int addOpacityTransitionToController(cc::LayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);