DM: make GPU tasks multithreaded again. Big refactor.

dm/DMBenchTask.cpp

 #include "DMBenchTask.h"
 #include "DMUtil.h"
 #include "SkSurface.h"
 
 namespace DM {
 
 static SkString bench_name(const char* name, const char* config) {
     SkString result("bench ");
     result.appendf("%s_%s", name, config);
     return result;
 }
 
 NonRenderingBenchTask::NonRenderingBenchTask(const char* config,
                                              Reporter* reporter,
                                              TaskRunner* tasks,
                                              BenchRegistry::Factory factory)
-    : Task(reporter, tasks)
+    : CpuTask(reporter, tasks)
     , fBench(factory(NULL))
     , fName(bench_name(fBench->getName(), config)) {}
 
 CpuBenchTask::CpuBenchTask(const char* config,
                            Reporter* reporter,
                            TaskRunner* tasks,
                            BenchRegistry::Factory factory,
                            SkColorType colorType)
-    : Task(reporter, tasks)
+    : CpuTask(reporter, tasks)
     , fBench(factory(NULL))
     , fName(bench_name(fBench->getName(), config))
     , fColorType(colorType) {}
 
 GpuBenchTask::GpuBenchTask(const char* config,
                            Reporter* reporter,
                            TaskRunner* tasks,
                            BenchRegistry::Factory factory,
                            GrContextFactory::GLContextType contextType,
                            int sampleCount)
-    : Task(reporter, tasks)
+    : GpuTask(reporter, tasks)
     , fBench(factory(NULL))
     , fName(bench_name(fBench->getName(), config))
     , fContextType(contextType)
     , fSampleCount(sampleCount) {}
 
 bool NonRenderingBenchTask::shouldSkip() const {
     return !fBench->isSuitableFor(SkBenchmark::kNonRendering_Backend);
 }
 
 bool CpuBenchTask::shouldSkip() const {
@@ skipping 15 matching lines @@
 }
 
 void NonRenderingBenchTask::draw() {
     draw_raster(fBench.get(), kPMColor_SkColorType);
 }
 
 void CpuBenchTask::draw() {
     draw_raster(fBench.get(), fColorType);
 }
 
-void GpuBenchTask::draw() {
+void GpuBenchTask::draw(GrContextFactory* grFactory) {
     SkImageInfo info = SkImageInfo::Make(fBench->getSize().x(),
                                          fBench->getSize().y(),
                                          kPMColor_SkColorType,
                                          kPremul_SkAlphaType);
     SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(
-            this->getGrContextFactory()->get(fContextType), info, fSampleCount));
+            grFactory->get(fContextType), info, fSampleCount));
 
     fBench->preDraw();
     fBench->draw(1, surface->getCanvas());
     fBench->postDraw();
 }
 
 }  // namespace DM