DM: Add --skps.

dm/DMRecordTask.cpp

 #include "DMRecordTask.h"
 #include "DMUtil.h"
 #include "DMWriteTask.h"
 #include "SkCommandLineFlags.h"
 #include "SkRecord.h"
 #include "SkRecordDraw.h"
 #include "SkRecordOpts.h"
 #include "SkRecorder.h"
 
 DEFINE_bool(skr, true, "If true, run SKR tests.");
 
 namespace DM {
 
 RecordTask::RecordTask(const Task& parent, skiagm::GM* gm, SkBitmap reference, bool optimize)
     : CpuTask(parent)
     , fName(UnderJoin(parent.name().c_str(), optimize ? "skr" : "skr-noopt"))
     , fGM(gm)
     , fReference(reference)
     , fOptimize(optimize)
     {}
 
+RecordTask::RecordTask(const Task& parent, SkPicture* pic, SkBitmap reference, bool optimize)

[reed1, 2014/05/14 12:40:11]

nit: the call-sites are slightly harder to understand with that bool parameter.
e.g. an enum { kOptimize, kRaw } might be clearer.

[mtklein, 2014/05/14 17:47:18]

Done, for all the existing tasks too.

+    : CpuTask(parent)
+    , fName(UnderJoin(parent.name().c_str(), optimize ? "skr" : "skr-noopt"))
+    , fPicture(SkRef(pic))
+    , fReference(reference)
+    , fOptimize(optimize)
+    {}
+
 void RecordTask::draw() {
-    // Record the GM into an SkRecord.
+    // Record into an SkRecord.
     SkRecord record;
     SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record,
                         fReference.width(), fReference.height());
-    recorder.concat(fGM->getInitialTransform());
-    fGM->draw(&recorder);
+
+    if (fGM.get()) {
+        recorder.concat(fGM->getInitialTransform());
+        fGM->draw(&recorder);
+    } else {
+        fPicture->draw(&recorder);
+    }
+
 
     if (fOptimize) {
         SkRecordOptimize(&record);
     }
 
     // Draw the SkRecord back into a bitmap.
     SkBitmap bitmap;
-    SetupBitmap(fReference.colorType(), fGM.get(), &bitmap);
+    if (fGM.get()) {
+        SetupBitmap(fReference.colorType(), fGM.get(), &bitmap);
+    } else {
+        SetupBitmap(fReference.colorType(), *fPicture, &bitmap);
+    }
     SkCanvas target(bitmap);
     SkRecordDraw(record, &target);
 
     if (!BitmapsEqual(bitmap, fReference)) {
         this->fail();
         this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));
     }
 }
 
 bool RecordTask::shouldSkip() const {
     return !FLAGS_skr;
 }
 
 }  // namespace DM