Add a mode to force linear-text in SkCanonicalizePaint

src/core/SkPaint.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 "SkPaint.h"
 #include "SkAutoKern.h"
 #include "SkChecksum.h"
@@ skipping 693 matching lines @@
     this->setFlags(flags);
     this->setHinting(SkPaint::kNo_Hinting);
 
     SkScalar textSize = fTextSize;
     this->setTextSize(kCanonicalTextSizeForPaths);
     return textSize / kCanonicalTextSizeForPaths;
 }
 
 class SkCanonicalizePaint {
 public:
-    SkCanonicalizePaint(const SkPaint& paint) : fPaint(&paint), fScale(0) {
-        if (paint.isLinearText() || SkDraw::ShouldDrawTextAsPaths(paint, SkMatrix::I())) {
+    SkCanonicalizePaint(const SkPaint& paint, bool forceLinearText = false) : fPaint(&paint), fScale(0) {
+        if (forceLinearText || paint.isLinearText() || SkDraw::ShouldDrawTextAsPaths(paint, SkMatrix::I())) {
             SkPaint* p = fLazy.set(paint);
+            if (forceLinearText)
+                p->setLinearText(true);
             fScale = p->setupForAsPaths();
             fPaint = p;
         }
     }
 
     const SkPaint& getPaint() const { return *fPaint; }
 
     /**
      *  Returns 0 if the paint was unmodified, or the scale factor need to
      *  the original textSize
@@ skipping 265 matching lines @@
     if (0 == byteLength) {
         return 0;
     }
 
     SkASSERT(textData);
 
     if (nullptr == widths && nullptr == bounds) {
         return this->countText(textData, byteLength);
     }
 
-    SkCanonicalizePaint canon(*this);
+    SkCanonicalizePaint canon(*this, true);
     const SkPaint& paint = canon.getPaint();
     SkScalar scale = canon.getScale();
 
     SkAutoGlyphCache    autoCache(paint, nullptr, nullptr);
     SkGlyphCache*       cache = autoCache.getCache();
     GlyphCacheProc      glyphCacheProc = paint.getGlyphCacheProc(nullptr != bounds);
 
     const char* text = (const char*)textData;
     const char* stop = text + byteLength;
     int         count = 0;
@@ skipping 1309 matching lines @@
 }
 
 uint32_t SkPaint::getHash() const {
     // We're going to hash 10 pointers and 7 32-bit values, finishing up with fBitfields,
     // so fBitfields should be 10 pointers and 6 32-bit values from the start.
     static_assert(offsetof(SkPaint, fBitfields) == 9 * sizeof(void*) + 6 * sizeof(uint32_t),
                   "SkPaint_notPackedTightly");
     return SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(this),
                                offsetof(SkPaint, fBitfields) + sizeof(fBitfields));
 }