commit 5531d51ce7426bdae7563547326fcf0bf926a083
author joshualitt <joshualitt@chromium.org> Wed Dec 17 15:50:11 2014 -0800
committer Commit bot <commit-bot@chromium.org> Wed Dec 17 15:50:11 2014 -0800
tree 111625235b55e016756b32d9904d6d3bf059c73c
parent 1b28a3a4890e3b84b43181b3fe3690ac565930dc

remove view matrix from context

BUG=skia:

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

src/gpu/GrDistanceFieldTextContext.cpp

diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp
index a052b64..a6cb285 100755
--- a/src/gpu/GrDistanceFieldTextContext.cpp
+++ b/src/gpu/GrDistanceFieldTextContext.cpp
@@ -79,7 +79,7 @@
     SkSafeSetNull(fGammaTexture);
 }
 
-bool GrDistanceFieldTextContext::canDraw(const SkPaint& paint) {
+bool GrDistanceFieldTextContext::canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) {
     if (!fEnableDFRendering && !paint.isDistanceFieldTextTEMP()) {
         return false;
     }
@@ -98,7 +98,7 @@
 
     // TODO: choose an appropriate maximum scale for distance fields and
     //       enable perspective
-    if (SkDraw::ShouldDrawTextAsPaths(paint, fContext->getMatrix())) {
+    if (SkDraw::ShouldDrawTextAsPaths(paint, viewMatrix)) {
         return false;
     }
 
@@ -110,7 +110,7 @@
 
     fStrike = NULL;
 
-    const SkMatrix& ctm = fContext->getMatrix();
+    const SkMatrix& ctm = fViewMatrix;
 
     // getMaxScale doesn't support perspective, so neither do we at the moment
     SkASSERT(!ctm.hasPerspective());
@@ -200,8 +200,9 @@
 }
 
 void GrDistanceFieldTextContext::onDrawText(const GrPaint& paint, const SkPaint& skPaint,
-                                          const char text[], size_t byteLength,
-                                          SkScalar x, SkScalar y) {
+                                            const SkMatrix& viewMatrix,
+                                            const char text[], size_t byteLength,
+                                            SkScalar x, SkScalar y) {
     SkASSERT(byteLength == 0 || text != NULL);
 
     // nothing to draw
@@ -209,6 +210,7 @@
         return;
     }
 
+    fViewMatrix = viewMatrix;
     SkDrawCacheProc          glyphCacheProc = skPaint.getDrawCacheProc();
     SkAutoGlyphCache         autoCache(skPaint, &fDeviceProperties, NULL);
     SkGlyphCache*            cache = autoCache.getCache();
@@ -258,13 +260,14 @@
     y -= alignY;
     SkPoint offset = SkPoint::Make(x, y);
 
-    this->drawPosText(paint, skPaint, text, byteLength, positions.begin(), 2, offset);
+    this->drawPosText(paint, skPaint, viewMatrix, text, byteLength, positions.begin(), 2, offset);
 }
 
 void GrDistanceFieldTextContext::onDrawPosText(const GrPaint& paint, const SkPaint& skPaint,
-                                             const char text[], size_t byteLength,
-                                             const SkScalar pos[], int scalarsPerPosition,
-                                             const SkPoint& offset) {
+                                               const SkMatrix& viewMatrix,
+                                               const char text[], size_t byteLength,
+                                               const SkScalar pos[], int scalarsPerPosition,
+                                               const SkPoint& offset) {
 
     SkASSERT(byteLength == 0 || text != NULL);
     SkASSERT(1 == scalarsPerPosition || 2 == scalarsPerPosition);
@@ -274,6 +277,7 @@
         return;
     }
 
+    fViewMatrix = viewMatrix;
     this->init(paint, skPaint);
 
     SkDrawCacheProc glyphCacheProc = fSkPaint.getDrawCacheProc();
@@ -349,8 +353,9 @@
     this->finish();
     
     if (fallbackTxt.count() > 0) {
-        fFallbackTextContext->drawPosText(paint, skPaint, fallbackTxt.begin(), fallbackTxt.count(),
-                                          fallbackPos.begin(), scalarsPerPosition, offset);
+        fFallbackTextContext->drawPosText(paint, skPaint, viewMatrix, fallbackTxt.begin(),
+                                          fallbackTxt.count(), fallbackPos.begin(),
+                                          scalarsPerPosition, offset);
     }
 }
 
@@ -388,7 +393,7 @@
     GrTextureParams gammaParams(SkShader::kClamp_TileMode, GrTextureParams::kNone_FilterMode);
     
     uint32_t textureUniqueID = fCurrTexture->getUniqueID();
-    const SkMatrix& ctm = fContext->getMatrix();
+    const SkMatrix& ctm = fViewMatrix;
     
     // set up any flags
     uint32_t flags = 0;
@@ -517,7 +522,7 @@
 
     // check if we clipped out
     SkRect dstRect;
-    const SkMatrix& ctm = fContext->getMatrix();
+    const SkMatrix& ctm = fViewMatrix;
     (void) ctm.mapRect(&dstRect, glyphRect);
     if (fClipRect.quickReject(SkScalarTruncToInt(dstRect.left()),
                               SkScalarTruncToInt(dstRect.top()),
@@ -544,14 +549,16 @@
             // flush any accumulated draws before drawing this glyph as a path.
             this->flush();
 
-            GrContext::AutoMatrix am;
             SkMatrix ctm;
             ctm.setScale(fTextRatio, fTextRatio);
             ctm.postTranslate(sx - dx, sy - dy);
             GrPaint tmpPaint(fPaint);
-            am.setPreConcat(fContext, ctm, &tmpPaint);
+            tmpPaint.localCoordChange(ctm);
+
+            SkMatrix viewM = fViewMatrix;
+            viewM.preConcat(ctm);
             GrStrokeInfo strokeInfo(SkStrokeRec::kFill_InitStyle);
-            fContext->drawPath(tmpPaint, *glyph->fPath, strokeInfo);
+            fContext->drawPath(tmpPaint, viewM, *glyph->fPath, strokeInfo);
 
             // remove this glyph from the vertices we need to allocate
             fTotalVertexCount -= kVerticesPerGlyph;
@@ -625,7 +632,7 @@
 
     if (fCurrVertex > 0) {
         GrDrawState drawState;
-        drawState.setFromPaint(fPaint, fContext->getMatrix(), fContext->getRenderTarget());
+        drawState.setFromPaint(fPaint, fViewMatrix, fContext->getRenderTarget());
 
         // setup our sampler state for our text texture/atlas
         SkASSERT(SkIsAlign4(fCurrVertex));