Rearrange SkRecord public API to fit better with cc/resources/picture

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"
@@ skipping 44 matching lines @@
     return NULL;
 }
 
 static void bench_record(SkPicture* src, const char* name, SkBBHFactory* bbhFactory) {
     const SkMSec start = SkTime::GetMSecs();
     const int width  = src ? src->width()  : FLAGS_nullSize;
     const int height = src ? src->height() : FLAGS_nullSize;
 
     for (int i = 0; i < FLAGS_loops; i++) {
         if (FLAGS_skr) {
-            using EXPERIMENTAL::SkRecording;
-            SkRecording* recording = SkRecording::Create(width, height);
+            EXPERIMENTAL::SkRecording recording(width, height);
             if (NULL != src) {
-                src->draw(recording->canvas());
+                src->draw(recording.canvas());
             }
-            SkDELETE(SkRecording::Delete(recording));  // delete the SkPlayback*.
+            // Release and delete the SkPlayback so that recording optimizes its SkRecord.
+            SkDELETE(recording.releasePlayback());
         } else {
             SkPictureRecorder recorder;
             SkCanvas* canvas = recorder.beginRecording(width, height, bbhFactory, FLAGS_flags);
             if (NULL != src) {
                 src->draw(canvas);
             }
             if (FLAGS_endRecording) {
                 SkAutoTUnref<SkPicture> dst(recorder.endRecording());
             }
         }
@@ skipping 46 matching lines @@
         bench_record(src, 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