Deprecate SkPicture::clone().

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 "BenchLogger.h"
 #include "Timer.h"
 #include "CopyTilesRenderer.h"
@@ skipping 24 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_string(jsonLog, "", "Destination for writing JSON data.");
 DEFINE_bool(min, false, "Print the minimum times (instead of average).");
-DECLARE_int32(multi);
 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_bool(purgeDecodedTex, false, "Purge decoded and GPU-uploaded textures "
             "after each iteration.");
 DEFINE_string(timers, "c", "[wcgWC]*: Display wall, cpu, gpu, truncated wall or truncated cpu time"
               " for each picture.");
 DEFINE_bool(trackDeferredCaching, false, "Only meaningful with --deferImageDecoding and "
             "SK_LAZY_CACHE_STATS set to true. Report percentage of cache hits when using "
@@ skipping 273 matching lines @@
 
     if (errorString.size() > 0) {
         gLogger.logError(errorString);
     }
 
     if (NULL == renderer.get()) {
         exit(-1);
     }
 
     if (FLAGS_timeIndividualTiles) {
-        if (FLAGS_multi > 1) {
-            gLogger.logError("Cannot time individual tiles with more than one thread.\n");
-            exit(-1);
-        }
         sk_tools::TiledPictureRenderer* tiledRenderer = renderer->getTiledRenderer();
         if (NULL == tiledRenderer) {
             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);
@@ skipping 118 matching lines @@
 #endif
     gWriter.end();
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif