turn back on gpu tests

dm/DMSrcSink.cpp

 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCommonFlags.h"
 #include "SkDocument.h"
 #include "SkMultiPictureDraw.h"
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
 #include "SkRandom.h"
-#include "SkTLS.h"
 
 namespace DM {
 
 void SafeUnref(SkPicture* p) { SkSafeUnref(p); }
 void SafeUnref(SkData*    d) { SkSafeUnref(d); }
 
 // FIXME: the GM objects themselves are not threadsafe, so we create and destroy them as needed.
 
 GMSrc::GMSrc(skiagm::GMRegistry::Factory factory) : fFactory(factory) {}
 
@@ skipping 126 matching lines @@
     SkIRect bounds;
     cull.roundOut(&bounds);
     SkISize size = { bounds.width(), bounds.height() };
     return size;
 }
 
 Name SKPSrc::name() const { return SkOSPath::Basename(fPath.c_str()); }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-DEFINE_string(gpu_threading, "none",
-        "none:  single thread,\n"
-        "tls:   any thread, GrContextFactory in TLS   (crashy),\n"
-        "stack: any thread, GrContextFactory on stack (less crashy, differently so)");
-
-GPUSink::GPUSink(GrContextFactory::GLContextType ct, GrGLStandard api, int samples, bool dfText)
+GPUSink::GPUSink(GrContextFactory::GLContextType ct,
+                 GrGLStandard api,
+                 int samples,
+                 bool dfText,
+                 bool threaded)
     : fContextType(ct)
     , fGpuAPI(api)
     , fSampleCount(samples)
-    , fUseDFText(dfText) {}
+    , fUseDFText(dfText)
+    , fThreaded(threaded) {}
 
 int GPUSink::enclave() const {
-    return FLAGS_gpu_threading.contains("none") ? kGPUSink_Enclave : kAnyThread_Enclave;
+    return fThreaded ? kAnyThread_Enclave : kGPUSink_Enclave;
 }
 
-static void* CreateGrFactory()        { return new GrContextFactory; }
-static void  DeleteGrFactory(void* p) { delete (GrContextFactory*)p; }
-
 Error GPUSink::draw(const Src& src, SkBitmap* dst, SkWStream*) const {
-    GrContextFactory local, *factory = &local;
-    if (!FLAGS_gpu_threading.contains("stack")) {
-        factory = (GrContextFactory*)SkTLS::Get(CreateGrFactory, DeleteGrFactory);
-    }
-    // Does abandoning / resetting contexts make any sense if we have stack-scoped factories?
+    GrContextFactory* factory = GetThreadLocalGrContextFactory();
     if (FLAGS_abandonGpuContext) {
         factory->abandonContexts();
     }
     if (FLAGS_resetGpuContext || FLAGS_abandonGpuContext) {
         factory->destroyContexts();
     }
     const SkISize size = src.size();
     const SkImageInfo info =
         SkImageInfo::Make(size.width(), size.height(), kN32_SkColorType, kPremul_SkAlphaType);
     SkAutoTUnref<SkSurface> surface(
@@ skipping 190 matching lines @@
             surfaces.unrefAll();
             return "";
         }
         SkISize size() const SK_OVERRIDE { return fSize; }
         Name name() const SK_OVERRIDE { sk_throw(); return ""; }  // No one should be calling this.
     } proxy(fW, fH, pic, src.size());
     return fSink->draw(proxy, bitmap, stream);
 }
 
 }  // namespace DM