Index: cc/gl_renderer.h |
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h |
index 7116413b8592685c7866ee348b85f5eeb9b61e19..f8381ecc3feab149045fa132c10c6c5fd4b95d44 100644 |
--- a/cc/gl_renderer.h |
+++ b/cc/gl_renderer.h |
@@ -87,15 +87,15 @@ protected: |
virtual void ensureScissorTestDisabled() OVERRIDE; |
private: |
- static void toGLMatrix(float*, const WebKit::WebTransformationMatrix&); |
+ static void toGLMatrix(float*, const gfx::Transform&); |
static int priorityCutoffValue(WebKit::WebGraphicsMemoryAllocation::PriorityCutoff); |
void drawCheckerboardQuad(const DrawingFrame&, const CheckerboardDrawQuad*); |
void drawDebugBorderQuad(const DrawingFrame&, const DebugBorderDrawQuad*); |
scoped_ptr<ScopedResource> drawBackgroundFilters( |
DrawingFrame&, const RenderPassDrawQuad*, const WebKit::WebFilterOperations&, |
- const WebKit::WebTransformationMatrix& contentsDeviceTransform, |
- const WebKit::WebTransformationMatrix& contentsDeviceTransformInverse); |
+ const gfx::Transform& contentsDeviceTransform, |
+ const gfx::Transform& contentsDeviceTransformInverse); |
void drawRenderPassQuad(DrawingFrame&, const RenderPassDrawQuad*); |
void drawSolidColorQuad(const DrawingFrame&, const SolidColorDrawQuad*); |
void drawStreamVideoQuad(const DrawingFrame&, const StreamVideoDrawQuad*); |
@@ -106,9 +106,9 @@ private: |
void setShaderOpacity(float opacity, int alphaLocation); |
void setShaderQuadF(const gfx::QuadF&, int quadLocation); |
- void drawQuadGeometry(const DrawingFrame&, const WebKit::WebTransformationMatrix& drawTransform, const gfx::RectF& quadRect, int matrixLocation); |
+ void drawQuadGeometry(const DrawingFrame&, const gfx::Transform& drawTransform, const gfx::RectF& quadRect, int matrixLocation); |
- void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const gfx::Rect&, const WebKit::WebTransformationMatrix& drawMatrix); |
+ void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const gfx::Rect&, const gfx::Transform& drawMatrix); |
bool useScopedTexture(DrawingFrame&, const ScopedResource*, const gfx::Rect& viewportRect); |