Remove distance field flag from SkPaint

Review URL: https://codereview.chromium.org/1192413005

5 files changed, 3 insertions, 26 deletions

diff --git a/gm/dftext.cpp b/gm/dftext.cpp
index 63e7cdfa5e..0ee01e3309 100755
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -72,9 +72,7 @@ protected:
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setSubpixelText(true);
-#if !SK_SUPPORT_GPU
-        paint.setDistanceFieldTextTEMP(true);
-#endif
+
         sk_tool_utils::set_portable_typeface(&paint, "Times New Roman", SkTypeface::kNormal);
 
         const char* text = "Hamburgefons";
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index b52b7c1b2d..6236546042 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -116,8 +116,6 @@ public:
         kAutoHinting_Flag     = 0x800,  //!< mask to force Freetype's autohinter
         kVerticalText_Flag    = 0x1000,
         kGenA8FromLCD_Flag    = 0x2000, // hack for GDI -- do not use if you can help it
-        kDistanceFieldTextTEMP_Flag = 0x4000, //!< TEMPORARY mask to enable distance fields
-                                              // currently overrides LCD and subpixel rendering
         // when adding extra flags, note that the fFlags member is specified
         // with a bit-width and you'll have to expand it.
 
@@ -284,19 +282,6 @@ public:
     */
     void setDevKernText(bool devKernText);
 
-    /** Helper for getFlags(), returns true if kDistanceFieldTextTEMP_Flag bit is set
-     @return true if the distanceFieldText bit is set in the paint's flags.
-     */
-    bool isDistanceFieldTextTEMP() const {
-        return SkToBool(this->getFlags() & kDistanceFieldTextTEMP_Flag);
-    }
-
-    /** Helper for setFlags(), setting or clearing the kDistanceFieldTextTEMP_Flag bit
-     @param distanceFieldText true to set the kDistanceFieldTextTEMP_Flag bit in the paint's
-     flags, false to clear it.
-     */
-    void setDistanceFieldTextTEMP(bool distanceFieldText);
-
 #ifdef SK_SUPPORT_LEGACY_FILTERLEVEL_ENUM
     enum FilterLevel {
         kNone_FilterLevel   = kNone_SkFilterQuality,
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 83647d4aea..b18ffa65a7 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -229,10 +229,6 @@ void SkPaint::setDevKernText(bool doDevKern) {
     this->setFlags(SkSetClearMask(fBitfields.fFlags, doDevKern, kDevKernText_Flag));
 }
 
-void SkPaint::setDistanceFieldTextTEMP(bool doDistanceFieldText) {
-    this->setFlags(SkSetClearMask(fBitfields.fFlags, doDistanceFieldText, kDistanceFieldTextTEMP_Flag));
-}
-
 void SkPaint::setStyle(Style style) {
     if ((unsigned)style < kStyleCount) {
         fBitfields.fStyle = style;
diff --git a/src/core/SkTextBlob.cpp b/src/core/SkTextBlob.cpp
index 6ea081d764..d1a77e74f7 100644
--- a/src/core/SkTextBlob.cpp
+++ b/src/core/SkTextBlob.cpp
@@ -63,8 +63,7 @@ private:
         SkPaint::kEmbeddedBitmapText_Flag |
         SkPaint::kAutoHinting_Flag        |
         SkPaint::kVerticalText_Flag       |
-        SkPaint::kGenA8FromLCD_Flag       |
-        SkPaint::kDistanceFieldTextTEMP_Flag;
+        SkPaint::kGenA8FromLCD_Flag;
 
     SkScalar                 fSize;
     SkScalar                 fScaleX;
diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
index 9a727bb0a7..aa51cd2c30 100644
--- a/src/gpu/GrAtlasTextContext.cpp
+++ b/src/gpu/GrAtlasTextContext.cpp
@@ -451,7 +451,7 @@ inline bool GrAtlasTextContext::canDrawAsDistanceFields(const SkPaint& skPaint,
     useDFT = true;
 #endif
 
-    if (!useDFT && !skPaint.isDistanceFieldTextTEMP() && scaledTextSize < kLargeDFFontSize) {
+    if (!useDFT && scaledTextSize < kLargeDFFontSize) {
         return false;
     }
 
@@ -2244,7 +2244,6 @@ BATCH_TEST_DEFINE(TextBlobBatch) {
     GrColor color = GrRandomColor(random);
     SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
     SkPaint skPaint;
-    skPaint.setDistanceFieldTextTEMP(random->nextBool());
     skPaint.setColor(color);
     skPaint.setLCDRenderText(random->nextBool());
     skPaint.setAntiAlias(skPaint.isLCDRenderText() ? true : random->nextBool());