Minor fixes for distance field fonts:

src/core/SkDraw.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDraw.h"
 #include "SkBlitter.h"
 #include "SkBounder.h"
@@ skipping 1984 matching lines @@
     }
 
     if (ShouldDrawTextAsPaths(paint, *fMatrix)) {
         this->drawPosText_asPaths(text, byteLength, pos, constY,
                                   scalarsPerPosition, paint);
         return;
     }
 
     SkDrawCacheProc     glyphCacheProc = paint.getDrawCacheProc();
 #if SK_DISTANCEFIELD_FONTS
     const SkMatrix* ctm = fMatrix;

[bsalomon, 2013/11/20 22:18:06]

Would it be simpler to turn this into:

const SkMatrix* ctm = fMatrix;
#if SK_DISTANCEFIELD_FONTS

and remove the #if below?

TextMapState       tms(*ctm, constY);

[jvanverth1, 2013/11/21 14:25:40]

My plan is to rip out all of the distance field code from SkDraw, so I'd rather
leave it so I can restore it to the original version.

+    SkMatrix identity;
+    identity.setIdentity();

[bsalomon, 2013/11/20 22:18:06]

setIdentity() should probably be marked deprecated. Most of the code uses the
equivalent reset(). setIdentity() was added to make some Gr code compile when
GrMatrix merged with SkMatrix. Also, there is a global identity matrix,
SkMatrix::I()

[jvanverth1, 2013/11/21 14:25:40]

Done.

     const SkPaint* paintRef = &paint;
     SkPaint paintCopy;
     uint32_t procFlags = fProcs ? fProcs->fFlags : 0;
     if (procFlags & SkDrawProcs::kUseScaledGlyphs_Flag) {
         paintCopy = paint;
         paintCopy.setTextSize(SkDrawProcs::kBaseDFFontSize);
         paintRef = &paintCopy;
     }
     if (procFlags & SkDrawProcs::kSkipBakedGlyphTransform_Flag) {
-        ctm = NULL;
+        ctm = &identity;
     }
     SkAutoGlyphCache    autoCache(*paintRef, &fDevice->fLeakyProperties, ctm);
 #else
     SkAutoGlyphCache    autoCache(paint, &fDevice->fLeakyProperties, fMatrix);
 #endif
     SkGlyphCache*       cache = autoCache.getCache();
 
     SkAAClipBlitterWrapper wrapper;
     SkAutoBlitterChoose blitterChooser;
     SkBlitter* blitter = NULL;
     if (needsRasterTextBlit(*this)) {
         blitterChooser.choose(*fBitmap, *fMatrix, paint);
         blitter = blitterChooser.get();
         if (fRC->isAA()) {
             wrapper.init(*fRC, blitter);
             blitter = wrapper.getBlitter();
         }
     }
 
     const char*        stop = text + byteLength;
     AlignProc          alignProc = pick_align_proc(paint.getTextAlign());
     SkDraw1Glyph       d1g;
     SkDraw1Glyph::Proc proc = d1g.init(this, blitter, cache, paint);
+#if SK_DISTANCEFIELD_FONTS
+    TextMapState       tms(*ctm, constY);
+#else
     TextMapState       tms(*fMatrix, constY);
+#endif
     TextMapState::Proc tmsProc = tms.pickProc(scalarsPerPosition);
 
     if (cache->isSubpixel()) {
         // maybe we should skip the rounding if linearText is set
         SkAxisAlignment baseline = SkComputeAxisAlignmentForHText(*fMatrix);
 
         SkFixed fxMask = ~0;
         SkFixed fyMask = ~0;
         if (kX_SkAxisAlignment == baseline) {
             fyMask = 0;
@@ skipping 829 matching lines @@
         mask->fImage = SkMask::AllocImage(size);
         memset(mask->fImage, 0, mask->computeImageSize());
     }
 
     if (SkMask::kJustComputeBounds_CreateMode != mode) {
         draw_into_mask(*mask, devPath, style);
     }
 
     return true;
 }