DM: tweaks

dm/DMWriteTask.cpp

 #include "DMWriteTask.h"
 
 #include "DMUtil.h"
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkImageEncoder.h"
 #include "SkMallocPixelRef.h"
 #include "SkStream.h"
 #include "SkString.h"
 
 DEFINE_string2(writePath, w, "", "If set, write GMs here as .pngs.");
+DEFINE_bool(writePngOnly, false, "If true, don't encode raw bitmap after .png data.  "
+                                 "This means -r won't work, but skdiff will still work fine.");
 
 namespace DM {
 
 // Splits off the last N suffixes of name (splitting on _) and appends them to out.
 // Returns the total number of characters consumed.
 static int split_suffixes(int N, const char* name, SkTArray<SkString>* out) {
     SkTArray<SkString> split;
     SkStrSplit(name, "_", &split);
     int consumed = 0;
     for (int i = 0; i < N; i++) {
         // We're splitting off suffixes from the back to front.
         out->push_back(split[split.count()-i-1]);
         consumed += out->back().size() + 1;  // Add one for the _.
     }
     return consumed;
 }
 
-WriteTask::WriteTask(const Task& parent, SkBitmap bitmap, Mode mode)
+WriteTask::WriteTask(const Task& parent, SkBitmap bitmap)
     : CpuTask(parent), fBitmap(bitmap) {
-    if (mode == kVerbatim_Mode) {
-        fGmName.set(parent.name());
-    } else {
-        const int suffixes = parent.depth() + 1;
-        const SkString& name = parent.name();
-        const int totalSuffixLength = split_suffixes(suffixes, name.c_str(), &fSuffixes);
-        fGmName.set(name.c_str(), name.size()-totalSuffixLength);
-    }
+    const int suffixes = parent.depth() + 1;
+    const SkString& name = parent.name();
+    const int totalSuffixLength = split_suffixes(suffixes, name.c_str(), &fSuffixes);
+    fGmName.set(name.c_str(), name.size()-totalSuffixLength);
 }
 
 void WriteTask::makeDirOrFail(SkString dir) {
     if (!sk_mkdir(dir.c_str())) {
         this->fail();
     }
 }
 
 namespace {
 
 // One file that first contains a .png of an SkBitmap, then its raw pixels.
 // We use this custom format to avoid premultiplied/unpremultiplied pixel conversions.
 struct PngAndRaw {
     static bool Encode(SkBitmap bitmap, const char* path) {
         SkFILEWStream stream(path);
         if (!stream.isValid()) {
             SkDebugf("Can't write %s.\n", path);
             return false;
         }
 
         // Write a PNG first for humans and other tools to look at.
         if (!SkImageEncoder::EncodeStream(&stream, bitmap, SkImageEncoder::kPNG_Type, 100)) {
             SkDebugf("Can't encode a PNG.\n");
             return false;
         }
+        if (FLAGS_writePngOnly) {
+            return true;
+        }
 
         // Pad out so the raw pixels start 4-byte aligned.
         const uint32_t maxPadding = 0;
         const size_t pos = stream.bytesWritten();
         stream.write(&maxPadding, SkAlign4(pos) - pos);
 
         // Then write our secret raw pixels that only DM reads.
         SkAutoLockPixels lock(bitmap);
         return stream.write(bitmap.getPixels(), bitmap.getSize());
     }
@@ skipping 85 matching lines @@
     const SkString path = path_to_expected_image(fRoot, task);
     SkBitmap expected;
     if (!PngAndRaw::Decode(path.c_str(), bitmap.info(), &expected)) {
         return false;
     }
 
     return BitmapsEqual(expected, bitmap);
 }
 
 }  // namespace DM