Change SkPicture::draw to playback

tools/bench_playback.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
@@ skipping 26 matching lines @@
 }
 
 static SkPicture* rerecord(const SkPicture& src, bool skr) {
     SkTileGridFactory::TileGridInfo info;
     info.fTileInterval.set(FLAGS_tile, FLAGS_tile);
     info.fMargin.setEmpty();
     info.fOffset.setZero();
     SkTileGridFactory factory(info);
 
     SkPictureRecorder recorder;
-    src.draw(skr ? recorder.EXPERIMENTAL_beginRecording(src.cullRect().width(), 
-                                                        src.cullRect().height(), 
-                                                        &factory)
-                 : recorder.  DEPRECATED_beginRecording(src.cullRect().width(), 
-                                                        src.cullRect().height(), 
-                                                        &factory));
+    src.playback(skr ? recorder.EXPERIMENTAL_beginRecording(src.cullRect().width(), 
+                                                            src.cullRect().height(), 
+                                                            &factory)
+                     : recorder.  DEPRECATED_beginRecording(src.cullRect().width(), 
+                                                            src.cullRect().height(), 
+                                                            &factory));
     return recorder.endRecording();
 }
 
 static void bench(SkPMColor* scratch, const SkPicture& src, const char* name) {
     SkAutoTUnref<const SkPicture> picture(rerecord(src, FLAGS_skr));
 
     SkAutoTDelete<SkCanvas> canvas(
         SkCanvas::NewRasterDirectN32(SkScalarCeilToInt(src.cullRect().width()),
                                      SkScalarCeilToInt(src.cullRect().height()),
                                      scratch,
                                      SkScalarCeilToInt(src.cullRect().width()) * sizeof(SkPMColor)));
     canvas->clipRect(SkRect::MakeWH(SkIntToScalar(FLAGS_tile), SkIntToScalar(FLAGS_tile)));
 
     // Draw once to warm any caches.  The first sample otherwise can be very noisy.
-    picture->draw(canvas.get());
+    picture->playback(canvas.get());
 
     WallTimer timer;
     const double scale = timescale();
     SkAutoTMalloc<double> samples(FLAGS_samples);
     for (int i = 0; i < FLAGS_samples; i++) {
         // We assume timer overhead (typically, ~30ns) is insignificant
         // compared to draw runtime (at least ~100us, usually several ms).
         timer.start();
-        picture->draw(canvas.get());
+        picture->playback(canvas.get());
         timer.end();
         samples[i] = timer.fWall * scale;
     }
 
     Stats stats(samples.get(), FLAGS_samples);
     if (FLAGS_verbose == 0) {
         printf("%g\t%s\n", stats.min, name);
     } else if (FLAGS_verbose == 1) {
         // Get a rough idea of how noisy the measurements were.
         const double noisePercent = 100 * sqrt(stats.var) / stats.mean;
@@ skipping 53 matching lines @@
         bench(scratch.get(), *src, filename.c_str());
     }
     return failed ? 1 : 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif