DM: Add support for reading a directory of images with --expectations (-r).

dm/DMGpuTask.cpp

Index: dm/DMGpuTask.cpp
diff --git a/dm/DMGpuTask.cpp b/dm/DMGpuTask.cpp
index d4c4254c62fbabfdb820f4314784cc156a44d390..c0502eeed5e4282c99bb9a1ba22298d278b9f500 100644
--- a/dm/DMGpuTask.cpp
+++ b/dm/DMGpuTask.cpp
@@ -1,6 +1,6 @@
 #include "DMGpuTask.h"
 
-#include "DMChecksumTask.h"
+#include "DMExpectationsTask.h"
 #include "DMUtil.h"
 #include "DMWriteTask.h"
 #include "SkCommandLineFlags.h"
@@ -12,7 +12,7 @@ namespace DM {
 GpuTask::GpuTask(const char* name,
                  Reporter* reporter,
                  TaskRunner* taskRunner,
-                 const skiagm::ExpectationsSource& expectations,
+                 const Expectations& expectations,
                  skiagm::GMRegistry::Factory gmFactory,
                  SkBitmap::Config config,
                  GrContextFactory::GLContextType contextType,
@@ -20,7 +20,7 @@ GpuTask::GpuTask(const char* name,
     : Task(reporter, taskRunner)
     , fGM(gmFactory(NULL))
     , fName(UnderJoin(fGM->shortName(), name))
-    , fExpectations(expectations.get(Png(fName).c_str()))
+    , fExpectations(expectations)
     , fConfig(config)
     , fContextType(contextType)
     , fSampleCount(sampleCount)
@@ -60,7 +60,7 @@ void GpuTask::draw() {
     gr->printCacheStats();
 #endif
 
-    this->spawnChild(SkNEW_ARGS(ChecksumTask, (*this, fExpectations, bitmap)));
+    this->spawnChild(SkNEW_ARGS(ExpectationsTask, (*this, fExpectations, bitmap)));
     this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));
 }