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

dm/DMGpuSupport.h

 #ifndef DMGpuSupport_DEFINED
 #define DMGpuSupport_DEFINED
 
 // Provides Ganesh to DM,
 // or if it's not available, fakes it enough so most code doesn't have to know that.
 
 #include "SkSurface.h"
 
 #if SK_SUPPORT_GPU
 
 // Ganesh is available.  Yippee!
 
 #  include "GrContext.h"
 #  include "GrContextFactory.h"
 
 namespace DM {
 
 static const bool kGPUDisabled = false;
 
 static inline SkSurface* NewGpuSurface(GrContextFactory* grFactory,
                                        GrContextFactory::GLContextType type,
                                        GrGLStandard gpuAPI,
                                        SkImageInfo info,
-                                       int samples) {
-    return SkSurface::NewRenderTarget(grFactory->get(type, gpuAPI), info, samples, NULL);
+                                       int samples,
+                                       bool useDFText) {
+    uint32_t flags = useDFText ? SkSurfaceProps::kUseDistanceFieldFonts_Flag : 0;
+    SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType);
+    return SkSurface::NewRenderTarget(grFactory->get(type, gpuAPI), info, samples, &props);
 }
 
 }  // namespace DM
 
 #else// !SK_SUPPORT_GPU
 
 // Ganesh is not available.  Fake it.
 
 enum GrGLStandard {
     kNone_GrGLStandard,
@@ skipping 17 matching lines @@
 };
 
 namespace DM {
 
 static const bool kGPUDisabled = true;
 
 static inline SkSurface* NewGpuSurface(GrContextFactory*,
                                        GrContextFactory::GLContextType,
                                        GrGLStandard,
                                        SkImageInfo,
-                                       int) {
+                                       int,
+                                       bool) {
     return NULL;
 }
 
 }  // namespace DM
 
 #endif//SK_SUPPORT_GPU
 
 #endif//DMGpuSupport_DEFINED