Reland r8235 "Switch gm to use SkFlags."
This time, using #if guards for gpuCacheSize consistently.
Also fix some warnings.
BUG=https://code.google.com/p/skia/issues/detail?id=1094
Review URL: https://codereview.chromium.org/12440052
git-svn-id: http://skia.googlecode.com/svn/trunk@8254 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/SkFlags.cpp b/tools/SkFlags.cpp
index b4337d1..e386b42 100644
--- a/tools/SkFlags.cpp
+++ b/tools/SkFlags.cpp
@@ -38,8 +38,12 @@
SkDebugf("Flags:\n");
SkFlagInfo* flag = SkFlags::gHead;
while (flag != NULL) {
- SkDebugf("\t--%s:\ttype: %s\tdefault: %s\n", flag->name().c_str(),
- flag->typeAsString().c_str(), flag->defaultValue().c_str());
+ SkDebugf("\t--%s:\ttype: %s", flag->name().c_str(),
+ flag->typeAsString().c_str());
+ if (flag->defaultValue().size() > 0) {
+ SkDebugf("\tdefault: %s", flag->defaultValue().c_str());
+ }
+ SkDebugf("\n");
const SkString& help = flag->help();
size_t length = help.size();
const char* currLine = help.c_str();