Let DM work without a GPU.

dm/DMGpuGMTask.cpp

Index: dm/DMGpuGMTask.cpp
diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp
index cffa2291c53f7a6303e7f282a220e6cc4e3b7f71..c4867b6e9ea06948e1b66138926313f45a7131e8 100644
--- a/dm/DMGpuGMTask.cpp
+++ b/dm/DMGpuGMTask.cpp
@@ -29,8 +29,7 @@ void GpuGMTask::draw(GrContextFactory* grFactory) {
                                          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());
@@ -41,16 +40,12 @@ void GpuGMTask::draw(GrContextFactory* grFactory) {
     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