Add EXPERIMENTAL_beginRecording() for SkRecord-based recording.

tools/bench_record.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 "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
-#include "SkRecording.h"
 #include "SkStream.h"
 #include "SkString.h"
 
 #include "BenchTimer.h"
 #include "LazyDecodeBitmap.h"
 #include "Stats.h"
 
 typedef WallTimer Timer;
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
@@ skipping 33 matching lines @@
         return SkNEW_ARGS(SkTileGridFactory, (info));
     }
     if (FLAGS_bbh.contains("quadtree")) {
         return SkNEW(SkQuadTreeFactory);
     }
     SkDebugf("Invalid bbh type %s, must be one of rtree, tilegrid, quadtree.\n", FLAGS_bbh[0]);
     return NULL;
 }
 
 static void rerecord(const SkPicture& src, SkBBHFactory* bbhFactory) {
+    SkPictureRecorder recorder;
     if (FLAGS_skr) {
-        EXPERIMENTAL::SkRecording recording(src.width(), src.height());
-        src.draw(recording.canvas());
-        // Release and delete the SkPlayback so that recording optimizes its SkRecord.
-        SkDELETE(recording.releasePlayback());
+        src.draw(recorder.EXPERIMENTAL_beginRecording(src.width(), src.height(), bbhFactory));
     } else {
-        SkPictureRecorder recorder;
         src.draw(recorder.beginRecording(src.width(), src.height(), bbhFactory));
-        SkAutoTUnref<SkPicture> dst(recorder.endRecording());
     }
+    SkAutoTUnref<SkPicture> pic(recorder.endRecording());
 }
 
 static void bench_record(const SkPicture& src,
                          const double timerOverhead,
                          const char* name,
                          SkBBHFactory* bbhFactory) {
     // Rerecord once to warm up any caches.  Otherwise the first sample can be very noisy.
     rerecord(src, bbhFactory);
 
     // Rerecord once to see how many times we should loop to make timer overhead insignificant.
@@ skipping 83 matching lines @@
         bench_record(*src, overheadEstimate, filename.c_str(), bbhFactory.get());
     }
     return failed ? 1 : 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif