commit 8059eb9f6e24ed609393fbda4ad71edea03ac258
author joshualitt <joshualitt@chromium.org> Mon Dec 29 15:10:07 2014 -0800
committer Commit bot <commit-bot@chromium.org> Mon Dec 29 15:10:07 2014 -0800
tree c9a8e1881739206f49a5319bf1077a5900b42db1
parent 4f662e62cd44e302ef689fabdb2c0ae8d9471b02

Move ViewMatrix off of drawstate

BUG=skia:

Review URL: https://codereview.chromium.org/815553003

src/gpu/GrStencilAndCoverTextContext.cpp

diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/GrStencilAndCoverTextContext.cpp
index b5ab523..59995d0 100644
--- a/src/gpu/GrStencilAndCoverTextContext.cpp
+++ b/src/gpu/GrStencilAndCoverTextContext.cpp
@@ -347,7 +347,7 @@
 
     fStateRestore.set(&fDrawState);
 
-    fDrawState.setFromPaint(fPaint, fViewMatrix, fContext->getRenderTarget());
+    fDrawState.setFromPaint(fPaint, fContext->getRenderTarget());
 
     GR_STATIC_CONST_SAME_STENCIL(kStencilPass,
                                  kZero_StencilOp,
@@ -406,7 +406,9 @@
 
 void GrStencilAndCoverTextContext::flush() {
     if (fQueuedGlyphCount > 0) {
-        SkAutoTUnref<GrPathProcessor> pp(GrPathProcessor::Create(fPaint.getColor(), fLocalMatrix));
+        SkAutoTUnref<GrPathProcessor> pp(GrPathProcessor::Create(fPaint.getColor(),
+                                                                 fViewMatrix,
+                                                                 fLocalMatrix));
         fDrawTarget->drawPaths(&fDrawState, pp, fGlyphs,
                                fGlyphIndices, GrPathRange::kU16_PathIndexType,
                                get_xy_scalar_array(fGlyphPositions),