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

Unified Diff: cc/software_renderer.cc

Issue 11361129: Don't invert contentsDeviceTransform twice when rendering render passes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
« cc/gl_renderer.cc ('K') | « cc/gl_renderer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« cc/gl_renderer.cc ('K') | « cc/gl_renderer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698