Revert of Get gpudft support working in dm, gm, nanobench and bench_pictures

gm/gmmain.cpp

Index: gm/gmmain.cpp
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 4e49adbc23c3a2c452997b0eeb99c67e08843a24..da0f38f4e398da182be3b34eb40f9f88d7c8e37b 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -151,9 +151,6 @@
     /* Read reference GM images if a read path is provided. */
     kRead_ConfigFlag  = 0x2,
     kRW_ConfigFlag    = (kWrite_ConfigFlag | kRead_ConfigFlag),
-    /* Use distance fields for rendering text */
-    kDFText_ConfigFlag = 0x4,
-    kRWDFT_ConfigFlag = (kRW_ConfigFlag | kDFText_ConfigFlag),
 };
 
 struct ConfigData {
@@ -587,10 +584,7 @@
         }
 #if SK_SUPPORT_GPU
         else {  // GPU
-            uint32_t flags = (gRec.fFlags & kDFText_ConfigFlag) ?
-                             SkSurfaceProps::kUseDistanceFieldFonts_Flag : 0;
-            SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType);
-            surface.reset(SkSurface::NewRenderTargetDirect(gpuTarget->asRenderTarget(), &props));
+            surface.reset(SkSurface::NewRenderTargetDirect(gpuTarget->asRenderTarget()));
             if (deferred) {
                 canvas.reset(SkDeferredCanvas::Create(surface));
             } else {
@@ -1297,7 +1291,6 @@
     { kN32_SkColorType, kGPU_Backend,    GrContextFactory::kNative_GLContextType,  4, kRW_ConfigFlag,    "msaa4",        false},
     { kN32_SkColorType, kGPU_Backend,    GrContextFactory::kNVPR_GLContextType,    4, kRW_ConfigFlag,    "nvprmsaa4",   true },
     { kN32_SkColorType, kGPU_Backend,    GrContextFactory::kNVPR_GLContextType,   16, kRW_ConfigFlag,    "nvprmsaa16",  false},
-    { kN32_SkColorType, kGPU_Backend,    GrContextFactory::kNative_GLContextType,  0, kRWDFT_ConfigFlag, "gpudft",       true },
     /* The gpudebug context does not generate meaningful images, so don't record
      * the images it generates!  We only run it to look for asserts. */
     { kN32_SkColorType, kGPU_Backend,    GrContextFactory::kDebug_GLContextType,   0, kNone_ConfigFlag,  "gpudebug",     kDebugOnly},