share dm and command flags

tools/iOSShell.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "iOSShell.h"
 
 #include "Resources.h"
 #include "SkCanvas.h"
-#include "SkCommandLineFlags.h"
+#include "SkCommonFlags.h"
 #include "SkGraphics.h"
+#include "SkThreadPool.h"
 #include "SkWindow.h"
 #include "sk_tool_utils.h"
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* curr_view(SkWindow* wind) {
     SkView::F2BIter iter(wind);
     return iter.next();
 }
 
@@ skipping 21 matching lines @@
 }
 
 void ShellWindow::onSizeChange() {
     this->INHERITED::onSizeChange();
 
     SkView::F2BIter iter(this);
     SkView* view = iter.next();
     view->setSize(this->width(), this->height());
 }
 
-void tool_main(int argc, char *argv[]);
+DEFINE_bool(dm, false, "run dm");
+DEFINE_bool(unittests, false, "run unit tests");
+
+void dm_main(int argc, char *argv[]);
+void test_main(int argc, char *argv[]);
 
 bool set_cmd_line_args(int argc, char *argv[], const char* resourceDir) {
-    for (int index = 0; index < argc; ++index) {
-        if (!strcmp("--test", argv[index])) {
-            SetResourcePath(resourceDir);
-            tool_main(argc - 1, argv);
-            return true;
-        }
+    SkCommandLineFlags::SetUsage("");
+    SkCommandLineFlags::Parse(argc, argv);
+    SetResourcePath(resourceDir);
+    if (FLAGS_dm) {
+        dm_main(argc, argv);
+        return true;
+    }
+    if (FLAGS_unittests) {
+        test_main(argc, argv);
+        return true;
     }
     return false;
 }
 
 // FIXME: this should be in a header
 SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv);
 SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv) {
     return new ShellWindow(hwnd, argc, argv);
 }
 
@@ skipping 12 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }