Update gm flags so that it can be run without a pdf rasterizer.

gm/gmmain.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * Code for the "gm" (Golden Master) rendering comparison tool.
  *
@@ skipping 1390 matching lines @@
 }
 
 // Macro magic to convert a numeric preprocessor token into a string.
 // Adapted from http://stackoverflow.com/questions/240353/convert-a-preprocessor-token-to-a-string
 // This should probably be moved into one of our common headers...
 #define TOSTRING_INTERNAL(x) #x
 #define TOSTRING(x) TOSTRING_INTERNAL(x)
 
 // Alphabetized ignoring "no" prefix ("readPath", "noreplay", "resourcePath").
 DEFINE_string(config, "", configUsage().c_str());
-DEFINE_string(pdfRasterizers, "", pdfRasterizerUsage().c_str());
+DEFINE_string(pdfRasterizers, "default", pdfRasterizerUsage().c_str());
 DEFINE_bool(deferred, false, "Exercise the deferred rendering test pass.");
 DEFINE_string(excludeConfig, "", "Space delimited list of configs to skip.");
 DEFINE_bool(forceBWtext, false, "Disable text anti-aliasing.");
 #if SK_SUPPORT_GPU
 DEFINE_string(gpuCacheSize, "", "<bytes> <count>: Limit the gpu cache to byte size or "
               "object count. " TOSTRING(DEFAULT_CACHE_VALUE) " for either value means "
               "use the default. 0 for either disables the cache.");
 #endif
 DEFINE_bool(hierarchy, false, "Whether to use multilevel directory structure "
             "when reading/writing files.");
@@ skipping 573 matching lines @@
     bool configHasPDF = false;
     for (int i = 0; i < configs.count(); i++) {
         if (gRec[configs[i]].fBackend == kPDF_Backend) {
             configHasPDF = true;
             break;
         }
     }
     if (!configHasPDF) {
         return true;
     }
 

[robertphillips, 2013/11/06 16:36:13]

Won't this now not use a rasterizer by default?

[vandebo (ex-Chrome), 2013/11/06 16:46:40]

I changed the default value of the flag to "default", that will get caught by
this case, which adds all the known rasterizers.  If you specify the flag, with
something other than "default" or without anythingthe else starting on line 2013
will run.  There, if the list is empty, no rasterizer is added, if not,
rasterizers are selected as they were before.

-    for (int i = 0; i < FLAGS_pdfRasterizers.count(); i++) {
-        const char* rasterizer = FLAGS_pdfRasterizers[i];
-        const PDFRasterizerData* rasterizerPtr = findPDFRasterizer(rasterizer);
-
-        if (rasterizerPtr == NULL) {
-            gm_fprintf(stderr, "unrecognized rasterizer %s\n", rasterizer);
-            return false;
-        }
-        appendUnique<const PDFRasterizerData*>(outRasterizers,
-                                               rasterizerPtr);
-    }
-
-    if (outRasterizers->count() == 0) {
-        // if no config is specified by user, add the defaults
+    if (FLAGS_pdfRasterizers.count() == 1 &&
+            !strcmp(FLAGS_pdfRasterizers[0], "default")) {
         for (int i = 0; i < (int)SK_ARRAY_COUNT(kPDFRasterizers); ++i) {
             if (kPDFRasterizers[i].fRunByDefault) {
                 *outRasterizers->append() = &kPDFRasterizers[i];
             }
         }
+    } else {
+        for (int i = 0; i < FLAGS_pdfRasterizers.count(); i++) {
+            const char* rasterizer = FLAGS_pdfRasterizers[i];
+            const PDFRasterizerData* rasterizerPtr =
+                    findPDFRasterizer(rasterizer);
+            if (rasterizerPtr == NULL) {
+                gm_fprintf(stderr, "unrecognized rasterizer %s\n", rasterizer);
+                return false;
+            }
+            appendUnique<const PDFRasterizerData*>(outRasterizers,
+                                                   rasterizerPtr);
+        }
     }
 
     // now show the user the set of configs that will be run.
     SkString configStr("These PDF rasterizers will be run:");
     // show the user the config that will run.
     for (int i = 0; i < outRasterizers->count(); ++i) {
         configStr.appendf(" %s", (*outRasterizers)[i]->fName);
     }
     gm_fprintf(stdout, "%s\n", configStr.c_str());
 
@@ skipping 340 matching lines @@
     if (FLAGS_forceBWtext) {
         canvas->setDrawFilter(SkNEW(BWTextDrawFilter))->unref();
     }
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif