DM: Add --skps.

dm/DMRecordTask.cpp

Index: dm/DMRecordTask.cpp
diff --git a/dm/DMRecordTask.cpp b/dm/DMRecordTask.cpp
index 531fe57f9476f489b1bd6157456b6eda28acd156..b660e00c2dd9fa352aae20e9570bbd15441b19cb 100644
--- a/dm/DMRecordTask.cpp
+++ b/dm/DMRecordTask.cpp
@@ -19,13 +19,27 @@ RecordTask::RecordTask(const Task& parent, skiagm::GM* gm, SkBitmap reference, b
     , 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);
@@ -33,7 +47,11 @@ void RecordTask::draw() {
 
     // 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);