Index: cc/render_surface_impl.h |
diff --git a/cc/render_surface_impl.h b/cc/render_surface_impl.h |
index 340103a6665c5f6c03be4b1bdb792cf4f88d0c8a..9892c4218d76b36d2033c216c50c88c2002953f9 100644 |
--- a/cc/render_surface_impl.h |
+++ b/cc/render_surface_impl.h |
@@ -12,7 +12,7 @@ |
#include "cc/shared_quad_state.h" |
#include "ui/gfx/rect.h" |
#include "ui/gfx/rect_f.h" |
-#include <public/WebTransformationMatrix.h> |
+#include "ui/gfx/transform.h" |
namespace cc { |
@@ -46,17 +46,17 @@ public: |
bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; } |
void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; } |
- void setDrawTransform(const WebKit::WebTransformationMatrix& drawTransform) { m_drawTransform = drawTransform; } |
- const WebKit::WebTransformationMatrix& drawTransform() const { return m_drawTransform; } |
+ void setDrawTransform(const gfx::Transform& drawTransform) { m_drawTransform = drawTransform; } |
+ const gfx::Transform& drawTransform() const { return m_drawTransform; } |
- void setScreenSpaceTransform(const WebKit::WebTransformationMatrix& screenSpaceTransform) { m_screenSpaceTransform = screenSpaceTransform; } |
- const WebKit::WebTransformationMatrix& screenSpaceTransform() const { return m_screenSpaceTransform; } |
+ void setScreenSpaceTransform(const gfx::Transform& screenSpaceTransform) { m_screenSpaceTransform = screenSpaceTransform; } |
+ const gfx::Transform& screenSpaceTransform() const { return m_screenSpaceTransform; } |
- void setReplicaDrawTransform(const WebKit::WebTransformationMatrix& replicaDrawTransform) { m_replicaDrawTransform = replicaDrawTransform; } |
- const WebKit::WebTransformationMatrix& replicaDrawTransform() const { return m_replicaDrawTransform; } |
+ void setReplicaDrawTransform(const gfx::Transform& replicaDrawTransform) { m_replicaDrawTransform = replicaDrawTransform; } |
+ const gfx::Transform& replicaDrawTransform() const { return m_replicaDrawTransform; } |
- void setReplicaScreenSpaceTransform(const WebKit::WebTransformationMatrix& replicaScreenSpaceTransform) { m_replicaScreenSpaceTransform = replicaScreenSpaceTransform; } |
- const WebKit::WebTransformationMatrix& replicaScreenSpaceTransform() const { return m_replicaScreenSpaceTransform; } |
+ void setReplicaScreenSpaceTransform(const gfx::Transform& replicaScreenSpaceTransform) { m_replicaScreenSpaceTransform = replicaScreenSpaceTransform; } |
+ const gfx::Transform& replicaScreenSpaceTransform() const { return m_replicaScreenSpaceTransform; } |
bool targetSurfaceTransformsAreAnimating() const { return m_targetSurfaceTransformsAreAnimating; } |
void setTargetSurfaceTransformsAreAnimating(bool animating) { m_targetSurfaceTransformsAreAnimating = animating; } |
@@ -100,10 +100,10 @@ private: |
float m_drawOpacity; |
bool m_drawOpacityIsAnimating; |
- WebKit::WebTransformationMatrix m_drawTransform; |
- WebKit::WebTransformationMatrix m_screenSpaceTransform; |
- WebKit::WebTransformationMatrix m_replicaDrawTransform; |
- WebKit::WebTransformationMatrix m_replicaScreenSpaceTransform; |
+ gfx::Transform m_drawTransform; |
+ gfx::Transform m_screenSpaceTransform; |
+ gfx::Transform m_replicaDrawTransform; |
+ gfx::Transform m_replicaScreenSpaceTransform; |
bool m_targetSurfaceTransformsAreAnimating; |
bool m_screenSpaceTransformsAreAnimating; |