SkFlags now follows proper dashing convention.

tools/bench_pictures_main.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "BenchTimer.h"
 #include "CopyTilesRenderer.h"
 #include "PictureBenchmark.h"
@@ skipping 22 matching lines @@
         "type:flag : Enable canvas filtering to disable a paint flag, "
         "use no blur or low quality blur, or use no hinting or "
         "slight hinting. For all flags except AAClip, specify the "
         "type of primitive to effect, or choose all. for AAClip "
         "alone, the filter affects all clips independent of type. "
         "Specific flags are listed above.");
 DEFINE_string(logFile, "", "Destination for writing log output, in addition to stdout.");
 DEFINE_bool(logPerIter, false, "Log each repeat timer instead of mean.");
 DEFINE_bool(min, false, "Print the minimum times (instead of average).");
 DECLARE_int32(multi);
-DECLARE_string(r);
+DECLARE_string(readPath);
 DEFINE_int32(repeat, 1, "Set the number of times to repeat each test.");
 DEFINE_bool(timeIndividualTiles, false, "Report times for drawing individual tiles, rather than "
             "times for drawing the whole page. Requires tiled rendering.");
 DEFINE_string(timers, "", "[wcgWC]*: Display wall, cpu, gpu, truncated wall or truncated cpu time"
               " for each picture.");
 DEFINE_bool(trackDeferredCaching, false, "Only meaningful with --deferImageDecoding and "
             "LAZY_CACHE_STATS set to true. Report percentage of cache hits when using deferred "
             "image decoding.");
 
 static char const * const gFilterTypes[] = {
@@ skipping 284 matching lines @@
             gLogger.logError("--timeIndividualTiles requires tiled rendering.\n");
             exit(-1);
         }
         if (!tiledRenderer->supportsTimingIndividualTiles()) {
             gLogger.logError("This renderer does not support --timeIndividualTiles.\n");
             exit(-1);
         }
         benchmark->setTimeIndividualTiles(true);
     }
 
-    if (FLAGS_r.count() < 1) {
+    if (FLAGS_readPath.count() < 1) {
         gLogger.logError(".skp files or directories are required.\n");
         exit(-1);
     }
 
     renderer->setDrawFilters(drawFilters, filtersName(drawFilters));
     benchmark->setPrintMin(FLAGS_min);
     benchmark->setLogPerIter(FLAGS_logPerIter);
     benchmark->setRenderer(renderer);
     benchmark->setRepeats(FLAGS_repeat);
     benchmark->setLogger(&gLogger);
@@ skipping 57 matching lines @@
 #if SK_ENABLE_INST_COUNT
     gPrintInstCount = true;
 #endif
     SkAutoGraphics ag;
 
     sk_tools::PictureBenchmark benchmark;
 
     setup_benchmark(&benchmark);
 
     int failures = 0;
-    for (int i = 0; i < FLAGS_r.count(); ++i) {
-        failures += process_input(FLAGS_r[i], benchmark);
+    for (int i = 0; i < FLAGS_readPath.count(); ++i) {
+        failures += process_input(FLAGS_readPath[i], benchmark);
     }
 
     if (failures != 0) {
         SkString err;
         err.printf("Failed to run %i benchmarks.\n", failures);
         gLogger.logError(err);
         return 1;
     }
 #if LAZY_CACHE_STATS
     if (FLAGS_trackDeferredCaching) {
         SkDebugf("Total cache hit rate: %f\n",
                  (double) gTotalCacheHits / (gTotalCacheHits + gTotalCacheMisses));
     }
 #endif
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif