Add image decoding mode to DM.

dm/DMWriteTask.cpp

 #include "DMWriteTask.h"
 
 #include "DMJsonWriter.h"
 #include "DMUtil.h"
 #include "SkColorPriv.h"
 #include "SkCommonFlags.h"
 #include "SkData.h"
 #include "SkImageEncoder.h"
 #include "SkMD5.h"
 #include "SkMallocPixelRef.h"
@@ skipping 42 matching lines @@
     : CpuTask(parent)
     , fBaseName(find_base_name(parent, &fSuffixes))
     , fSourceType(sourceType)
     , fData(data)
     , fExtension(ext) {
     SkASSERT(fData.get());
     SkASSERT(fData->unique());
 }
 
 void WriteTask::makeDirOrFail(SkString dir) {
-    if (!sk_mkdir(dir.c_str())) {
-        this->fail();
+    // This can be a little racy, so if it fails check to see if someone else succeeded.
+    if (!sk_mkdir(dir.c_str()) && !sk_isdir(dir.c_str())) {
+        this->fail("Can't make directory.");
     }
 }
 
 static SkString get_md5_string(SkMD5* hasher) {
     SkMD5::Digest digest;
     hasher->finish(digest);
 
     SkString md5;
     for (int i = 0; i < 16; i++) {
         md5.appendf("%02x", digest.data[i]);
@@ skipping 10 matching lines @@
 static bool write_asset(SkStreamAsset* input, SkWStream* output) {
     return input->rewind() && output->writeStream(input, input->getLength());
 }
 
 static SkString get_md5(SkStreamAsset* stream) {
     SkMD5 hasher;
     write_asset(stream, &hasher);
     return get_md5_string(&hasher);
 }
 
+static bool encode_png(const SkBitmap& src, SkFILEWStream* file) {
+    SkBitmap bm;
+    // We can't encode A8 bitmaps as PNGs.  Convert them to 8888 first.
+    if (src.info().colorType() == kAlpha_8_SkColorType) {
+        if (!src.copyTo(&bm, kN32_SkColorType)) {
+            return false;
+        }
+    } else {
+        bm = src;
+    }
+    return SkImageEncoder::EncodeStream(file, bm, SkImageEncoder::kPNG_Type, 100);
+}
+
 void WriteTask::draw() {
     SkString md5;
     {
         SkAutoLockPixels lock(fBitmap);
         md5 = fData ? get_md5(fData)
                     : get_md5(fBitmap.getPixels(), fBitmap.getSize());
     }
 
     SkASSERT(fSuffixes.count() > 0);
     SkString config = fSuffixes.back();
@@ skipping 41 matching lines @@
         // The path is unique, so two threads can't both write to the same file.
         // If already present we overwrite here, since the content may have changed.
     }
 
     SkFILEWStream file(path.c_str());
     if (!file.isValid()) {
         return this->fail("Can't open file.");
     }
 
     bool ok = fData ? write_asset(fData, &file)
-                    : SkImageEncoder::EncodeStream(&file, fBitmap, SkImageEncoder::kPNG_Type, 100);
+                    : encode_png(fBitmap, &file);
     if (!ok) {
         return this->fail("Can't write to file.");
     }
 }
 
 SkString WriteTask::name() const {
     SkString name("writing ");
     for (int i = 0; i < fSuffixes.count(); i++) {
         name.appendf("%s/", fSuffixes[i].c_str());
     }
     name.append(fBaseName.c_str());
     return name;
 }
 
 bool WriteTask::shouldSkip() const {
     return FLAGS_writePath.isEmpty();
 }
 
 }  // namespace DM