Let .skps have Expectations (i.e. work with -r) too.

dm/DM.cpp

 // Main binary for DM.
 // For a high-level overview, please see dm/README.
 
 #include "CrashHandler.h"
 #include "LazyDecodeBitmap.h"
 #include "SkCommonFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
@@ skipping 118 matching lines @@
     SkOSFile::Iter it(FLAGS_skps[0], ".skp");
     SkString filename;
     while (it.next(&filename)) {
         if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, filename.c_str())) {
             skps->push_back(SkOSPath::Join(FLAGS_skps[0], filename.c_str()));
         }
     }
 }
 
 static void kick_off_skps(const SkTArray<SkString>& skps,
-                          DM::Reporter* reporter, DM::TaskRunner* tasks) {
+                          const DM::Expectations& expectations,
+                          DM::Reporter* reporter,
+                          DM::TaskRunner* tasks) {
     for (int i = 0; i < skps.count(); ++i) {
         SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(skps[i].c_str()));
         if (stream.get() == NULL) {
             SkDebugf("Could not read %s.\n", skps[i].c_str());
             exit(1);
         }
         SkAutoTUnref<SkPicture> pic(
                 SkPicture::CreateFromStream(stream.get(), &sk_tools::LazyDecodeBitmap));
         if (pic.get() == NULL) {
             SkDebugf("Could not read %s as an SkPicture.\n", skps[i].c_str());
             exit(1);
         }
 
         SkString filename = SkOSPath::Basename(skps[i].c_str());
-        tasks->add(SkNEW_ARGS(DM::SKPTask, (reporter, tasks, pic, filename)));
+        tasks->add(SkNEW_ARGS(DM::SKPTask, (reporter, tasks, expectations, pic, filename)));
         tasks->add(SkNEW_ARGS(DM::PDFTask, (reporter, tasks, pic, filename,
                                             RASTERIZE_PDF_PROC)));
     }
 }
 
 static void report_failures(const SkTArray<SkString>& failures) {
     if (failures.count() == 0) {
         return;
     }
 
@@ skipping 65 matching lines @@
     SkTArray<SkString> skps;
     find_skps(&skps);
 
     SkDebugf("%d GMs x %d configs, %d tests, %d pictures\n",
              gms.count(), configs.count(), tests.count(), skps.count());
     DM::Reporter reporter;
 
     DM::TaskRunner tasks;
     kick_off_tests(tests, &reporter, &tasks);
     kick_off_gms(gms, configs, gpuAPI, *expectations, &reporter, &tasks);
-    kick_off_skps(skps, &reporter, &tasks);
+    kick_off_skps(skps, *expectations, &reporter, &tasks);
     tasks.wait();
 
     DM::WriteTask::DumpJson();
 
     SkDebugf("\n");
 #ifdef SK_DEBUG
     if (FLAGS_portableFonts && FLAGS_reportUsedChars) {
         sk_tool_utils::report_used_chars();
     }
 #endif
 
     SkTArray<SkString> failures;
     reporter.getFailures(&failures);
     report_failures(failures);
     return failures.count() > 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif