de-common the rest of the flags
Turns out lots of tools had two copies of many of these flags.
Some GN and .cpp file refactoring to make sure when flags are
present in a binary, they do something in that binary.
I think this finally finishes the flag refrag.
Change-Id: I01488e37ab73a5c4361786863ddb137a7f1095b1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203420
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index f222a37..86782db 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -76,18 +76,38 @@
static DEFINE_string(bisect, "", "Path to a .skp or .svg file to bisect.");
-DECLARE_int(threads)
-
static DEFINE_string2(file, f, "", "Open a single file for viewing.");
+static DEFINE_string2(match, m, nullptr,
+ "[~][^]substring[$] [...] of name to run.\n"
+ "Multiple matches may be separated by spaces.\n"
+ "~ causes a matching name to always be skipped\n"
+ "^ requires the start of the name to match\n"
+ "$ requires the end of the name to match\n"
+ "^ and $ requires an exact match\n"
+ "If a name does not match any list entry,\n"
+ "it is skipped unless some list entry starts with ~");
+
#if defined(SK_BUILD_FOR_ANDROID)
static DEFINE_string(jpgs, "/data/local/tmp/resources", "Directory to read jpgs from.");
static DEFINE_string(nimas, "/data/local/tmp/nimas", "Directory to read NIMA animations from.");
+ static DEFINE_string(skps, "/data/local/tmp/skps", "Directory to read skps from.");
+ static DEFINE_string(lotties, "/data/local/tmp/lotties",
+ "Directory to read (Bodymovin) jsons from.");
#else
static DEFINE_string(jpgs, "jpgs", "Directory to read jpgs from.");
static DEFINE_string(nimas, "nimas", "Directory to read NIMA animations from.");
+ static DEFINE_string(skps, "skps", "Directory to read skps from.");
+ static DEFINE_string(lotties, "lotties", "Directory to read (Bodymovin) jsons from.");
#endif
+static DEFINE_string(svgs, "", "Directory to read SVGs from, or a single SVG file.");
+
+static DEFINE_int_2(threads, j, -1,
+ "Run threadsafe tests on a threadpool with this many extra threads, "
+ "defaulting to one extra thread per core.");
+
+
const char* kBackendTypeStrings[sk_app::Window::kBackendTypeCount] = {
"OpenGL",
#if SK_ANGLE && defined(SK_BUILD_FOR_WIN)