diff options
author | shawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 07:49:40 +0000 |
---|---|---|
committer | shawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 07:49:40 +0000 |
commit | 78634b0c0110540942123e08138341c09b308734 (patch) | |
tree | 4836a18c9c85f19e8695940157569672a254bd21 /cc/gl_renderer.cc | |
parent | be9764cd5e2d38ce276f428dd23658862bf888e2 (diff) | |
download | chromium_src-78634b0c0110540942123e08138341c09b308734.zip chromium_src-78634b0c0110540942123e08138341c09b308734.tar.gz chromium_src-78634b0c0110540942123e08138341c09b308734.tar.bz2 |
Migrate more functions from MathUtil to gfx::Transform
This patch (1) removes rotateEulerAngles entirely (2) migrates some util
functions from MathUtil to transform_util, and (3) moves all the MathUtil unit
tests that actually belonged in ui/gfx/.
BUG=159972
Review URL: https://chromiumcodereview.appspot.com/11774005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/gl_renderer.cc')
-rw-r--r-- | cc/gl_renderer.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc index 83827a2..e9fe3fc 100644 --- a/cc/gl_renderer.cc +++ b/cc/gl_renderer.cc @@ -519,7 +519,8 @@ void GLRenderer::drawRenderPassQuad(DrawingFrame& frame, const RenderPassDrawQua gfx::Transform quadRectMatrix; quadRectTransform(&quadRectMatrix, quad->quadTransform(), quad->rect); - gfx::Transform contentsDeviceTransform = MathUtil::to2dTransform(frame.windowMatrix * frame.projectionMatrix * quadRectMatrix); + gfx::Transform contentsDeviceTransform = frame.windowMatrix * frame.projectionMatrix * quadRectMatrix; + contentsDeviceTransform.FlattenTo2d(); // Can only draw surface if device matrix is invertible. gfx::Transform contentsDeviceTransformInverse(gfx::Transform::kSkipInitialization); @@ -665,7 +666,7 @@ void GLRenderer::drawRenderPassQuad(DrawingFrame& frame, const RenderPassDrawQua GLC(context(), context()->uniform3fv(shaderEdgeLocation, 8, edge)); } - // Map device space quad to surface space. contentsDeviceTransform has no 3d component since it was generated with to2dTransform() so we don't need to project. + // Map device space quad to surface space. contentsDeviceTransform has no 3d component since it was flattened, so we don't need to project. gfx::QuadF surfaceQuad = MathUtil::mapQuad(contentsDeviceTransformInverse, deviceLayerEdges.ToQuadF(), clipped); DCHECK(!clipped); @@ -770,7 +771,8 @@ void GLRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQuad* qua gfx::QuadF localQuad; - gfx::Transform deviceTransform = MathUtil::to2dTransform(frame.windowMatrix * frame.projectionMatrix * quad->quadTransform()); + gfx::Transform deviceTransform = frame.windowMatrix * frame.projectionMatrix * quad->quadTransform(); + deviceTransform.FlattenTo2d(); if (!deviceTransform.IsInvertible()) return; @@ -861,7 +863,7 @@ void GLRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQuad* qua // Create device space quad. 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. + // Map device space quad to local space. deviceTransform has no 3d component since it was flattened, so we don't need to project. // We should have already checked that the transform was uninvertible above. gfx::Transform inverseDeviceTransform(gfx::Transform::kSkipInitialization); bool didInvert = deviceTransform.GetInverse(&inverseDeviceTransform); |