Staged removal of SkPicture-derived classes

tools/PictureRenderingFlags.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "PictureRenderingFlags.h"
 
 #include "CopyTilesRenderer.h"
@@ skipping 117 matching lines @@
             renderer.reset(SkNEW(sk_tools::PlaybackCreationRenderer));
             gridSupported = true;
         // undocumented
         } else if (0 == strcmp(mode, "gatherPixelRefs") && kBench_PictureTool == tool) {
             renderer.reset(sk_tools::CreateGatherPixelRefsRenderer());
         } else if (0 == strcmp(mode, "rerecord") && kRender_PictureTool == tool) {
             renderer.reset(SkNEW(sk_tools::RecordPictureRenderer));
         // Allow 'mode' to be set to 'simple', but do not create a renderer, so we can
         // ensure that pipe does not override a mode besides simple. The renderer will
         // be created below.
-        } else if (0 != strcmp(mode, "simple")) {
+        } else if (0 == strcmp(mode, "simple")) {
+            gridSupported = true;
+        } else {
             error.printf("%s is not a valid mode for --mode\n", mode);
             return NULL;
         }
     }
 
     if (useTiles) {
         SkASSERT(NULL == renderer);
         SkAutoTUnref<sk_tools::TiledPictureRenderer> tiledRenderer;
         if (isCopyMode) {
             int xTiles = -1;
@@ skipping 217 matching lines @@
         if (FLAGS_pipe && sk_tools::PictureRenderer::kNone_BBoxHierarchyType != bbhType) {
             error.printf("--pipe and --bbh cannot be used together\n");
             return NULL;
         }
     }
     renderer->setBBoxHierarchyType(bbhType);
     renderer->setScaleFactor(SkDoubleToScalar(FLAGS_scale));
 
     return renderer.detach();
 }