DM: SKP source / PDF backend

dm/DM.cpp

 // Main binary for DM.
 // For a high-level overview, please see dm/README.
 
 #include "SkBenchmark.h"
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkPicture.h"
 #include "SkString.h"
 #include "Test.h"
@@ skipping 85 matching lines @@
 GrContextFactory::kMESA_GLContextType;
 #else
 native;
 #endif
 
 static void kick_off_gms(const SkTDArray<GMRegistry::Factory>& gms,
                          const SkTArray<SkString>& configs,
                          const DM::Expectations& expectations,
                          DM::Reporter* reporter,
                          DM::TaskRunner* tasks) {
-#define START(name, type, ...)                                                        \
-    if (lowercase(configs[j]).equals(name)) {                                         \
-        tasks->add(SkNEW_ARGS(DM::type,                                               \
-                    (name, reporter, tasks, expectations, gms[i], ## __VA_ARGS__)));  \
+#define START(name, type, ...)                                                              \
+    if (lowercase(configs[j]).equals(name)) {                                               \
+        tasks->add(SkNEW_ARGS(DM::type, (name, reporter, tasks, gms[i], ## __VA_ARGS__)));  \
     }
     for (int i = 0; i < gms.count(); i++) {
         for (int j = 0; j < configs.count(); j++) {
-            START("565",        CpuGMTask, kRGB_565_SkColorType);
-            START("8888",       CpuGMTask, kN32_SkColorType);
-            START("gpu",        GpuGMTask, native, 0);
-            START("msaa4",      GpuGMTask, native, 4);
-            START("msaa16",     GpuGMTask, native, 16);
-            START("nvprmsaa4",  GpuGMTask, nvpr,  4);
-            START("nvprmsaa16", GpuGMTask, nvpr, 16);
-            START("gpunull",    GpuGMTask, null,   0);
-            START("gpudebug",   GpuGMTask, debug,  0);
-            START("angle",      GpuGMTask, angle,  0);
-            START("mesa",       GpuGMTask, mesa,   0);
+            START("565",        CpuGMTask, expectations, kRGB_565_SkColorType);
+            START("8888",       CpuGMTask, expectations, kN32_SkColorType);
+            START("gpu",        GpuGMTask, expectations, native, 0);
+            START("msaa4",      GpuGMTask, expectations, native, 4);
+            START("msaa16",     GpuGMTask, expectations, native, 16);
+            START("nvprmsaa4",  GpuGMTask, expectations, nvpr,   4);
+            START("nvprmsaa16", GpuGMTask, expectations, nvpr,   16);
+            START("gpunull",    GpuGMTask, expectations, null,   0);
+            START("gpudebug",   GpuGMTask, expectations, debug,  0);
+            START("angle",      GpuGMTask, expectations, angle,  0);
+            START("mesa",       GpuGMTask, expectations, mesa,   0);
             START("pdf",        PDFTask,   RASTERIZE_PDF_PROC);
         }
     }
 #undef START
 }
 
 static void kick_off_benches(const SkTDArray<BenchRegistry::Factory>& benches,
                              const SkTArray<SkString>& configs,
                              DM::Reporter* reporter,
                              DM::TaskRunner* tasks) {
@@ skipping 51 matching lines @@
         if (stream.get() == NULL) {
             SkDebugf("Could not read %s.\n", path.c_str());
             exit(1);
         }
         SkAutoTUnref<SkPicture> pic(SkPicture::CreateFromStream(stream.get()));
         if (pic.get() == NULL) {
             SkDebugf("Could not read %s as an SkPicture.\n", path.c_str());
             exit(1);
         }
 
-        tasks->add(SkNEW_ARGS(DM::SKPTask, (reporter, tasks, pic.detach(), filename)));
+        tasks->add(SkNEW_ARGS(DM::SKPTask, (reporter, tasks, pic->clone(), filename)));
+        tasks->add(SkNEW_ARGS(DM::PDFTask, (reporter, tasks, pic->clone(), filename,
+                                            RASTERIZE_PDF_PROC)));
     }
 }
 
 static void report_failures(const SkTArray<SkString>& failures) {
     if (failures.count() == 0) {
         return;
     }
 
     SkDebugf("Failures:\n");
     for (int i = 0; i < failures.count(); i++) {
@@ skipping 75 matching lines @@
     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) {
     return tool_main(argc, argv);
 }
 #endif