share dm and command flags

dm/DMWriteTask.cpp

 #include "DMWriteTask.h"
 
 #include "DMUtil.h"
 #include "SkColorPriv.h"
-#include "SkCommandLineFlags.h"
+#include "SkCommonFlags.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 {
@@ skipping 106 matching lines @@
         SkDebugf("Can't write %s.\n", path);
         return false;
     }
     return true;
 }
 
 }  // namespace
 
 void WriteTask::draw() {
     SkString dir(FLAGS_writePath[0]);
+#if SK_BUILD_FOR_IOS
+    if (dir.equals("@")) {
+        dir.set(FLAGS_resourcePath[0]);
+    }
+#endif
     this->makeDirOrFail(dir);
     for (int i = 0; i < fSuffixes.count(); i++) {
         dir = SkOSPath::SkPathJoin(dir.c_str(), fSuffixes[i].c_str());
         this->makeDirOrFail(dir);
     }
 
     SkString path = SkOSPath::SkPathJoin(dir.c_str(), fGmName.c_str());
     path.append(fExtension);
 
     const bool ok = fData.get() ? save_data_to_file(fData,   path.c_str())
@@ skipping 44 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