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

Unified Diff: cc/gl_renderer.cc

Issue 11644008: Migrate from MathUtil::inverse() to gfx::Transform::GetInverse() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Partially addressed uninvertible cases Created 8 years 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
Index: cc/gl_renderer.cc
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index c98b3e0e6f73578ef3acf707932100624e8a8f6e..04fad09895b280f65f6c54ef25e9f1146be8ea22 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -522,10 +522,10 @@ void GLRenderer::drawRenderPassQuad(DrawingFrame& frame, const RenderPassDrawQua
gfx::Transform contentsDeviceTransform = MathUtil::to2dTransform(frame.windowMatrix * frame.projectionMatrix * quadRectMatrix);
// Can only draw surface if device matrix is invertible.
- if (!contentsDeviceTransform.IsInvertible())
+ gfx::Transform contentsDeviceTransformInverse(gfx::Transform::kSkipInitialization);
+ if (!contentsDeviceTransform.GetInverse(&contentsDeviceTransformInverse))
return;
- gfx::Transform contentsDeviceTransformInverse = MathUtil::inverse(contentsDeviceTransform);
scoped_ptr<ScopedResource> backgroundTexture = drawBackgroundFilters(
frame, quad, contentsDeviceTransform, contentsDeviceTransformInverse);
@@ -862,8 +862,11 @@ void GLRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQuad* qua
LayerQuad deviceQuad(leftEdge, topEdge, rightEdge, bottomEdge);
// Map device space quad to local space. deviceTransform has no 3d component since it was generated with to2dTransform() so we don't need to project.
- gfx::Transform deviceTransformInverse = MathUtil::inverse(deviceTransform);
- localQuad = MathUtil::mapQuad(deviceTransformInverse, deviceQuad.ToQuadF(), clipped);
+ // We should have already checked that the transform was uninvertible above.
+ gfx::Transform inverseDeviceTransform(gfx::Transform::kSkipInitialization);
+ bool didInvert = deviceTransform.GetInverse(&inverseDeviceTransform);
+ DCHECK(didInvert);
+ localQuad = MathUtil::mapQuad(inverseDeviceTransform, deviceQuad.ToQuadF(), clipped);
// We should not DCHECK(!clipped) here, because anti-aliasing inflation may cause deviceQuad to become
// clipped. To our knowledge this scenario does not need to be handled differently than the unclipped case.
« cc/direct_renderer.cc ('K') | « cc/direct_renderer.cc ('k') | cc/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698