summaryrefslogtreecommitdiffstats
path: root/cc/software_renderer.cc
diff options
context:
space:
mode:
authorshawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-15 07:49:40 +0000
committershawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-15 07:49:40 +0000
commit78634b0c0110540942123e08138341c09b308734 (patch)
tree4836a18c9c85f19e8695940157569672a254bd21 /cc/software_renderer.cc
parentbe9764cd5e2d38ce276f428dd23658862bf888e2 (diff)
downloadchromium_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/software_renderer.cc')
-rw-r--r--cc/software_renderer.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 44e758d..785ed6b 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -183,7 +183,8 @@ void SoftwareRenderer::drawQuad(DrawingFrame& frame, const DrawQuad* quad)
TRACE_EVENT0("cc", "SoftwareRenderer::drawQuad");
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();
SkMatrix skDeviceMatrix;
toSkMatrix(&skDeviceMatrix, contentsDeviceTransform);
m_skCurrentCanvas->setMatrix(skDeviceMatrix);