Revert of Fix SkPaint::measureText for stroked hairline text

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 "SkAnnotation.h"
 #include "SkAutoKern.h"
 #include "SkColorFilter.h"
 #include "SkData.h"
 #include "SkDeviceProperties.h"
-#include "SkDraw.h"
 #include "SkFontDescriptor.h"
 #include "SkFontHost.h"
 #include "SkGlyphCache.h"
 #include "SkImageFilter.h"
 #include "SkMaskFilter.h"
 #include "SkMaskGamma.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkPaintDefaults.h"
 #include "SkPaintOptionsAndroid.h"
@@ skipping 475 matching lines @@
 
 bool SkPaint::TooBigToUseCache(const SkMatrix& ctm, const SkMatrix& textM) {
     SkASSERT(!ctm.hasPerspective());
     SkASSERT(!textM.hasPerspective());
 
     SkMatrix matrix;
     matrix.setConcat(ctm, textM);
     return tooBig(matrix, MaxCacheSize2());
 }
 
+bool SkPaint::tooBigToUseCache(const SkMatrix& ctm) const {
+    SkMatrix textM;
+    return TooBigToUseCache(ctm, *this->setTextMatrix(&textM));
+}
+
+bool SkPaint::tooBigToUseCache() const {
+    SkMatrix textM;
+    return tooBig(*this->setTextMatrix(&textM), MaxCacheSize2());
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkGlyphCache.h"
 #include "SkUtils.h"
 
 static void DetachDescProc(SkTypeface* typeface, const SkDescriptor* desc,
                            void* context) {
     *((SkGlyphCache**)context) = SkGlyphCache::DetachCache(typeface, desc);
 }
@@ skipping 462 matching lines @@
     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())) {
+        if (paint.isLinearText() || paint.tooBigToUseCache()) {
             SkPaint* p = fLazy.set(paint);
             fScale = p->setupForAsPaths();
             fPaint = p;
         }
     }
 
     const SkPaint& getPaint() const { return *fPaint; }
 
     /**
      *  Returns 0 if the paint was unmodified, or the scale factor need to
@@ skipping 1745 matching lines @@
     }
 #ifdef SK_BUILD_FOR_ANDROID
     if (dirty & kPaintOptionsAndroid_DirtyBit) {
         SkPaintOptionsAndroid options;
         options.unflatten(buffer);
         paint->setPaintOptionsAndroid(options);
     }
 #endif
     SkASSERT(dirty == paint->fDirtyBits);
 }