Remove DEPRECATED_beginRecording().

bench/PictureRecordBench.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 "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkPaint.h"
@@ skipping 35 matching lines @@
  *  and regions.  This bench populates those dictionaries to test the speed of
  *  reading and writing to those particular dictionary data structures.
  */
 class DictionaryRecordBench : public PictureRecordBench {
 public:
     DictionaryRecordBench() : INHERITED("dictionaries") {}
 
 protected:
     virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         SkPictureRecorder recorder;
-        SkCanvas* canvas = NULL;
+        SkCanvas* canvas = recorder.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
 
         const SkPoint translateDelta = getTranslateDelta(loops);
 
         for (int i = 0; i < loops; i++) {
             if (0 == i % kMaxLoopsPerCanvas) {
                 SkAutoTUnref<SkPicture> picture(recorder.endRecording());
-                canvas = recorder.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT, NULL, 0);
+                canvas = recorder.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
             }
 
             SkColor color = SK_ColorYELLOW + (i % 255);
             SkIRect rect = SkIRect::MakeWH(i % PICTURE_WIDTH, i % PICTURE_HEIGHT);
 
             canvas->save();
 
             // set the clip to the given region
             SkRegion region;
             region.setRect(rect);
@@ skipping 17 matching lines @@
             // draw a single color into the bitmap
             SkCanvas bitmapCanvas(bitmap);
             bitmapCanvas.drawColor(SkColorSetA(color, i % 255));
 
             // draw the bitmap onto the canvas
             canvas->drawBitmapMatrix(bitmap, matrix);
 
             canvas->restore();
             canvas->translate(translateDelta.fX, translateDelta.fY);
         }
+        SkAutoTUnref<SkPicture> cleanup(recorder.endRecording());
     }
 
     SkPoint getTranslateDelta(int M) {
         SkIPoint canvasSize = onGetSize();
         return SkPoint::Make(SkIntToScalar((PICTURE_WIDTH - canvasSize.fX)/M),
                              SkIntToScalar((PICTURE_HEIGHT- canvasSize.fY)/M));
     }
 private:
     typedef PictureRecordBench INHERITED;
 };
 
 /*
  *  Populates the SkPaint dictionary with a large number of unique paint
  *  objects that differ only by color
  */
 class UniquePaintDictionaryRecordBench : public PictureRecordBench {
 public:
     UniquePaintDictionaryRecordBench() : INHERITED("unique_paint_dictionary") { }
 
 protected:
     virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         SkRandom rand;
         SkPaint paint;
         SkPictureRecorder recorder;
-        SkCanvas* canvas = NULL;
+        SkCanvas* canvas = recorder.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
         for (int i = 0; i < loops; i++) {
             if (0 == i % kMaxLoopsPerCanvas) {
                 SkAutoTUnref<SkPicture> picture(recorder.endRecording());
-                canvas = recorder.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT, NULL, 0);
+                canvas = recorder.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
             }
             paint.setColor(rand.nextU());
             canvas->drawPaint(paint);
         }
+        SkAutoTUnref<SkPicture> cleanup(recorder.endRecording());
     }
 
 private:
     typedef PictureRecordBench INHERITED;
 };
 
 /*
  *  Populates the SkPaint dictionary with a number of unique paint
  *  objects that get reused repeatedly.
  *
@@ skipping 25 matching lines @@
 private:
     SkPaint fPaint [ObjCount];
     typedef PictureRecordBench INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new DictionaryRecordBench(); )
 DEF_BENCH( return new UniquePaintDictionaryRecordBench(); )
 DEF_BENCH( return new RecurringPaintDictionaryRecordBench(); )