DM: track a direct/indirect bit for each Sink too.

dm/DM.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
@@ skipping 154 matching lines @@
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 struct TaggedSrc : public SkAutoTDelete<Src> {
     const char* tag;
     const char* options;
 };
 
 struct TaggedSink : public SkAutoTDelete<Sink> {
     const char* tag;
-    const char* options;
-    SinkType type;
 };
 
 static const bool kMemcpyOK = true;
 
 static SkTArray<TaggedSrc,  kMemcpyOK>  gSrcs;
 static SkTArray<TaggedSink, kMemcpyOK> gSinks;
 
 static bool in_shard() {
     static int N = 0;
     return N++ % FLAGS_shards == FLAGS_shard;
@@ skipping 164 matching lines @@
 
     SkBitmap bitmap;
     SkDynamicMemoryWStream stream;
     SkString log;
     Error err = sink->draw(justOneRect, &bitmap, &stream, &log);
     if (err.isFatal()) {
         SkDebugf("Could not run %s: %s\n", tag, err.c_str());
         exit(1);
     }
 
-    SinkType type = kRaster_SinkType;
-    if (sink->enclave() == kGPU_Enclave) { type = kGPU_SinkType; }
-    if (stream.bytesWritten() > 0) { type = kVector_SinkType; }
-
     TaggedSink& ts = gSinks.push_back();
     ts.reset(sink.detach());
     ts.tag = tag;
-    ts.type = type;
 }
 
 static bool gpu_supported() {
 #if SK_SUPPORT_GPU
     return FLAGS_gpu;
 #else
     return false;
 #endif
 }
 
@@ skipping 115 matching lines @@
     const TaggedSrc&  src;
     const TaggedSink& sink;
 
     static void Run(Task* task) {
         SkString name = task->src->name();
 
         // We'll skip drawing this Src/Sink pair if:
         //   - the Src vetoes the Sink;
         //   - this Src / Sink combination is on the blacklist;
         //   - it's a dry run.
-        SkString note(task->src->veto(task->sink.type) ? " (veto)" : "");
+        SkString note(task->src->veto(task->sink->flags()) ? " (veto)" : "");
         SkString whyBlacklisted = is_blacklisted(task->sink.tag, task->src.tag,
                                                  task->src.options, name.c_str());
         if (!whyBlacklisted.isEmpty()) {
             note.appendf(" (--blacklist %s)", whyBlacklisted.c_str());
         }
 
         SkString log;
         WallTimer timer;
         timer.start();
         if (!FLAGS_dryRun && note.isEmpty()) {
@@ skipping 335 matching lines @@
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif