diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-02-20 17:06:07 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-21 03:31:14 +0000 |
| commit | 483c772cfdd646fad3ae8aa187136191ae3babdc (patch) | |
| tree | 6bfe0818629abcf41fab36a48daeb0327e2ec6a4 /tools/flags/SkCommonFlags.cpp | |
| parent | 14b7375aa648ef88135396ec14296aa676f40004 (diff) | |
Add nativeFonts flag to Viewer.
This moves DMFontMgr and several related files which are tightly related
to fonts into tools/fonts, moves some flags around to prevent
duplication, and adds the nativeFonts handling to Viewer.
Change-Id: Id1bdad708a6b74319ac5ac9adfe21025db4ca0b2
Reviewed-on: https://skia-review.googlesource.com/108904
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tools/flags/SkCommonFlags.cpp')
| -rw-r--r-- | tools/flags/SkCommonFlags.cpp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index 27b8c2dceb..ed7f9daa50 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -31,13 +31,13 @@ DEFINE_bool(simpleCodec, false, "Runs of a subset of the codec tests. " "For nanobench, this means always N32, Premul or Opaque."); DEFINE_string2(match, m, nullptr, - "[~][^]substring[$] [...] of GM name to run.\n" + "[~][^]substring[$] [...] of name to run.\n" "Multiple matches may be separated by spaces.\n" - "~ causes a matching GM to always be skipped\n" - "^ requires the start of the GM to match\n" - "$ requires the end of the GM to match\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 GM does not match any list entry,\n" + "If a name does not match any list entry,\n" "it is skipped unless some list entry starts with ~"); DEFINE_bool2(quiet, q, false, "if true, don't print status updates."); @@ -53,9 +53,18 @@ DEFINE_bool(releaseAndAbandonGpuContext, false, DEFINE_bool(disableDriverCorrectnessWorkarounds, false, "Disables all GPU driver correctness " "workarounds"); +#ifdef SK_BUILD_FOR_ANDROID +DEFINE_string(skps, "/data/local/tmp/skps", "Directory to read skps from."); +DEFINE_string(jpgs, "/data/local/tmp/resources", "Directory to read jpgs from."); +DEFINE_string(jsons, "/data/local/tmp/jsons", "Directory to read (Bodymovin) jsons from."); +#else DEFINE_string(skps, "skps", "Directory to read skps from."); +DEFINE_string(jpgs, "jpgs", "Directory to read jpgs from."); +DEFINE_string(jsons, "jsons", "Directory to read (Bodymovin) jsons from."); +#endif -DEFINE_string(jsons, "", "Directory to read Bodymovin JSONs from, or a single JSON file."); +DEFINE_bool(nativeFonts, true, "If true, use native font manager and rendering. " + "If false, fonts will draw as portably as possible."); DEFINE_string(svgs, "", "Directory to read SVGs from, or a single SVG file."); |