Revert of Fix SkPaint::measureText for stroked hairline text

include/core/SkPaint.h

 
 
 /*
  * 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.
  */
 
 
@@ skipping 1099 matching lines @@
         /*
          *  Above this size (taking into account CTM and textSize), we never use
          *  the cache for bits or metrics (we might overflow), so we just ask
          *  for a caononical size and post-transform that.
          */
         kMaxSizeForGlyphCache       = 256,
     };
 
     static bool TooBigToUseCache(const SkMatrix& ctm, const SkMatrix& textM);
 
+    bool tooBigToUseCache() const;
+    bool tooBigToUseCache(const SkMatrix& ctm) const;
+
     // Set flags/hinting/textSize up to use for drawing text as paths.
     // Returns scale factor to restore the original textSize, since will will
     // have change it to kCanonicalTextSizeForPaths.
     SkScalar setupForAsPaths();
 
     static SkScalar MaxCacheSize2() {
         static const SkScalar kMaxSize = SkIntToScalar(kMaxSizeForGlyphCache);
         static const SkScalar kMag2Max = kMaxSize * kMaxSize;
         return kMag2Max;
     }
@@ skipping 12 matching lines @@
 #ifdef SK_BUILD_FOR_ANDROID
     SkPaintOptionsAndroid fPaintOptionsAndroid;
 
     // In order for the == operator to work properly this must be the last field
     // in the struct so that we can do a memcmp to this field's offset.
     uint32_t        fGenerationID;
 #endif
 };
 
 #endif