From 95573e4865c913a01571b17fb88c0450b1aa3ca7 Mon Sep 17 00:00:00 2001 From: fmalita Date: Wed, 14 Sep 2016 09:05:43 -0700 Subject: [PATCH] Fix SVG flag iOS linking TBR=mtklein@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2344533002 Review-Url: https://codereview.chromium.org/2344533002 --- bench/nanobench.cpp | 2 -- dm/DM.cpp | 2 -- tools/flags/SkCommonFlags.cpp | 2 ++ tools/flags/SkCommonFlags.h | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 26ba05f..ef22dee 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -127,8 +127,6 @@ DEFINE_string(sourceType, "", DEFINE_string(benchType, "", "Apply usual --match rules to bench type: micro, recording, playback, skcodec, etc."); -DEFINE_string(svgs, "", "Directory to read SVGs from, or a single SVG file."); - static double now_ms() { return SkTime::GetNSecs() * 1e-6; } static SkString humanize(double ms) { diff --git a/dm/DM.cpp b/dm/DM.cpp index fc332a2..53709ba 100644 --- a/dm/DM.cpp +++ b/dm/DM.cpp @@ -73,8 +73,6 @@ DEFINE_int32(shard, 0, "Which shard do I run?"); DEFINE_string(mskps, "", "Directory to read mskps from, or a single mskp file."); -DEFINE_string(svgs, "", "Directory to read SVGs from, or a single SVG file."); - using namespace DM; using sk_gpu_test::GrContextFactory; using sk_gpu_test::GLTestContext; diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index 57078fa..bf2bde0 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -48,6 +48,8 @@ DEFINE_bool(releaseAndAbandonGpuContext, false, DEFINE_string(skps, "skps", "Directory to read skps from."); +DEFINE_string(svgs, "", "Directory to read SVGs from, or a single SVG file."); + DEFINE_int32(threads, -1, "Run threadsafe tests on a threadpool with this many extra threads, " "defaulting to one extra thread per core."); diff --git a/tools/flags/SkCommonFlags.h b/tools/flags/SkCommonFlags.h index 9b69488..050303b 100644 --- a/tools/flags/SkCommonFlags.h +++ b/tools/flags/SkCommonFlags.h @@ -25,6 +25,7 @@ DECLARE_bool(preAbandonGpuContext); DECLARE_bool(abandonGpuContext); DECLARE_bool(releaseAndAbandonGpuContext); DECLARE_string(skps); +DECLARE_string(svgs); DECLARE_int32(threads); DECLARE_string(resourcePath); DECLARE_bool(verbose); -- 2.7.4