fix for valgrind

src/gpu/GrBitmapTextContext.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBitmapTextContext.h"
 #include "GrAtlas.h"
 #include "GrDefaultGeoProcFactory.h"
@@ skipping 136 matching lines @@
             fxMask = 0;
             halfSampleX = SK_FixedHalf;
         }
     } else {
         halfSampleX = halfSampleY = SK_FixedHalf;
     }
 
     SkFixed fx = SkScalarToFixed(x) + halfSampleX;
     SkFixed fy = SkScalarToFixed(y) + halfSampleY;
 
-    // if we have RGB, then we won't have any SkShaders so no need to use a localmatrix
-    if (kARGB_GrMaskFormat != fCurrMaskFormat && !viewMatrix.invert(&fLocalMatrix)) {
-        SkDebugf("Cannot invert viewmatrix\n");
+    // if we have RGB, then we won't have any SkShaders so no need to use a localmatrix, but for
+    // performance reasons we just invert here instead
+    if (!viewMatrix.invert(&fLocalMatrix)) {
+            SkDebugf("Cannot invert viewmatrix\n");
     }
 
     while (text < stop) {
         const SkGlyph& glyph = glyphCacheProc(cache, &text, fx & fxMask, fy & fyMask);
 
         fx += autokern.adjust(glyph);
 
         if (glyph.fWidth) {
             this->appendGlyph(GrGlyph::Pack(glyph.getGlyphID(),
                                             glyph.getSubXFixed(),
@@ skipping 24 matching lines @@
     }
 
     this->init(paint, skPaint);
 
     SkDrawCacheProc glyphCacheProc = fSkPaint.getDrawCacheProc();
 
     SkAutoGlyphCache    autoCache(fSkPaint, &fDeviceProperties, &viewMatrix);
     SkGlyphCache*       cache = autoCache.getCache();
     GrFontScaler*       fontScaler = GetGrFontScaler(cache);
 
-    // store original matrix before we reset, so we can use it to transform positions
-    SkMatrix ctm = viewMatrix;
-
-    // if we have RGB, then we won't have any SkShaders so no need to use a localmatrix
-    if (kARGB_GrMaskFormat != fCurrMaskFormat && !viewMatrix.invert(&fLocalMatrix)) {
+    // if we have RGB, then we won't have any SkShaders so no need to use a localmatrix, but for
+    // performance reasons we just invert here instead
+    if (!viewMatrix.invert(&fLocalMatrix)) {
             SkDebugf("Cannot invert viewmatrix\n");
     }
 
     int numGlyphs = fSkPaint.textToGlyphs(text, byteLength, NULL);
     fTotalVertexCount = kVerticesPerGlyph*numGlyphs;
 
     const char*        stop = text + byteLength;
     SkTextAlignProc    alignProc(fSkPaint.getTextAlign());
-    SkTextMapStateProc tmsProc(ctm, offset, scalarsPerPosition);
+    SkTextMapStateProc tmsProc(viewMatrix, offset, scalarsPerPosition);
     SkFixed halfSampleX = 0, halfSampleY = 0;
 
     if (cache->isSubpixel()) {
         // maybe we should skip the rounding if linearText is set
-        SkAxisAlignment baseline = SkComputeAxisAlignmentForHText(ctm);
+        SkAxisAlignment baseline = SkComputeAxisAlignmentForHText(viewMatrix);
 
         SkFixed fxMask = ~0;
         SkFixed fyMask = ~0;
         if (kX_SkAxisAlignment == baseline) {
             fyMask = 0;
             halfSampleY = SK_FixedHalf;
         } else if (kY_SkAxisAlignment == baseline) {
             fxMask = 0;
             halfSampleX = SK_FixedHalf;
         }
@@ skipping 379 matching lines @@
     }
 }
 
 inline void GrBitmapTextContext::finish() {
     this->flush();
     fTotalVertexCount = 0;
 
     GrTextContext::finish();
 }