Index: cc/software_renderer.cc |
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc |
index a32160d55c42c40689f19b1320f0f227f0f001c1..e8ade9052d294d9368b7b5cbdb1d706b8aa7e90c 100644 |
--- a/cc/software_renderer.cc |
+++ b/cc/software_renderer.cc |
@@ -182,9 +182,9 @@ void SoftwareRenderer::drawQuad(DrawingFrame& frame, const DrawQuad* quad) |
{ |
WebTransformationMatrix quadRectMatrix; |
quadRectTransform(&quadRectMatrix, quad->quadTransform(), quad->quadRect()); |
- WebTransformationMatrix contentsDeviceTransform = (frame.windowMatrix * frame.projectionMatrix * quadRectMatrix).to2dTransform(); |
+ WebTransformationMatrix deviceMatrix = (frame.windowMatrix * frame.projectionMatrix * quadRectMatrix).to2dTransform(); |
SkMatrix skDeviceMatrix; |
- toSkMatrix(&skDeviceMatrix, contentsDeviceTransform); |
+ toSkMatrix(&skDeviceMatrix, deviceMatrix); |
m_skCurrentCanvas->setMatrix(skDeviceMatrix); |
m_skCurrentPaint.reset(); |
@@ -258,7 +258,6 @@ void SoftwareRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureD |
const SkBitmap* bitmap = lock.skBitmap(); |
gfx::RectF uvRect = gfx::ScaleRect(quad->uvRect(), bitmap->width(), bitmap->height()); |
SkRect skUvRect = toSkRect(uvRect); |
- |
if (quad->flipped()) |
m_skCurrentCanvas->scale(1, -1); |
m_skCurrentCanvas->drawBitmapRectToRect(*bitmap, &skUvRect, |