commit db197a54b562d92a9da2f849e780aa327e1991ca
author msarett <msarett@google.com> Tue Jun 21 09:44:29 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jun 21 09:44:29 2016 -0700
tree 1a967771f861f85a60a5fa0889e2df5169482ea7
parent 497e9e2b3668fd8bc7fab16326e93c5cc6f0c287

Fix Mac clang linker

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2077353006

Review-Url: https://codereview.chromium.org/2077353006

bench/nanobench.cpp

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 14214e8..8633fa5 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -119,7 +119,6 @@
 DEFINE_bool(keepAlive, false, "Print a message every so often so that we don't time out");
 DEFINE_string(useThermalManager, "0,1,10,1000", "enabled,threshold,sleepTimeMs,TimeoutMs for "
                                                 "thermalManager\n");
-DEFINE_bool(simpleCodec, false, "Only decode images to N32 opaque or premul");
 
 DEFINE_string(sourceType, "",
         "Apply usual --match rules to source type: bench, gm, skp, image, etc.");

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 210badc..eb61fd7 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -71,7 +71,6 @@
 
 DEFINE_int32(shards, 1, "We're splitting source data into this many shards.");
 DEFINE_int32(shard,  0, "Which shard do I run?");
-DEFINE_bool(simpleCodec, false, "Only decode images to native scale");
 
 DEFINE_string(mskps, "", "Directory to read mskps from, or a single mskp file.");
 

tools/flags/SkCommonFlags.cpp

diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp
index 1caffd5..57078fa 100644
--- a/tools/flags/SkCommonFlags.cpp
+++ b/tools/flags/SkCommonFlags.cpp
@@ -21,6 +21,11 @@
 DEFINE_string(colorImages, "", "List of images and/or directories to decode with color correction. "
                                "A directory with no images is treated as a fatal error.");
 
+DEFINE_bool(simpleCodec, false, "Runs of a subset of the codec tests.  "
+                                "For DM, this means no scaling or subsetting, always using the "
+                                "canvas color type.  "
+                                "For nanobench, this means always N32, Premul or Opaque.");
+
 DEFINE_string2(match, m, nullptr,
                "[~][^]substring[$] [...] of GM name to run.\n"
                "Multiple matches may be separated by spaces.\n"

tools/flags/SkCommonFlags.h

diff --git a/tools/flags/SkCommonFlags.h b/tools/flags/SkCommonFlags.h
index ddd0fc8..9b69488 100644
--- a/tools/flags/SkCommonFlags.h
+++ b/tools/flags/SkCommonFlags.h
@@ -17,6 +17,7 @@
 DECLARE_bool(gpu);
 DECLARE_string(images);
 DECLARE_string(colorImages);
+DECLARE_bool(simpleCodec);
 DECLARE_string(match);
 DECLARE_bool(quiet);
 DECLARE_bool(resetGpuContext);