Let DM work without a GPU.

dm/DMGpuGMTask.cpp

 #include "DMGpuGMTask.h"
 
 #include "DMExpectationsTask.h"
 #include "DMUtil.h"
 #include "DMWriteTask.h"
 #include "SkCommandLineFlags.h"
 #include "SkSurface.h"
 #include "SkTLS.h"
 
 namespace DM {
@@ skipping 11 matching lines @@
     , fExpectations(expectations)
     , fContextType(contextType)
     , fSampleCount(sampleCount)
     {}
 
 void GpuGMTask::draw(GrContextFactory* grFactory) {
     SkImageInfo info = SkImageInfo::Make(SkScalarCeilToInt(fGM->width()),
                                          SkScalarCeilToInt(fGM->height()),
                                          kPMColor_SkColorType,
                                          kPremul_SkAlphaType);
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(
-            grFactory->get(fContextType), info, fSampleCount));
+    SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount));
     SkCanvas* canvas = surface->getCanvas();
 
     canvas->concat(fGM->getInitialTransform());
     fGM->draw(canvas);
     canvas->flush();
 
     SkBitmap bitmap;
     bitmap.setConfig(info);
     canvas->readPixels(&bitmap, 0, 0);
 
-#if GR_CACHE_STATS
-    gr->printCacheStats();
-#endif
-
     this->spawnChild(SkNEW_ARGS(ExpectationsTask, (*this, fExpectations, bitmap)));
     this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));
 }
 
 bool GpuGMTask::shouldSkip() const {
-    return SkToBool(fGM->getFlags() & skiagm::GM::kSkipGPU_Flag);
+    return kGPUDisabled || SkToBool(fGM->getFlags() & skiagm::GM::kSkipGPU_Flag);
 }
 
 }  // namespace DM