split SkPictureRecorder out of SkPicture

bench/PicturePlaybackBench.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkPaint.h"
@@ skipping 19 matching lines @@
         PICTURE_HEIGHT = 4000,
         TEXT_SIZE = 10
     };
 protected:
     virtual const char* onGetName() {
         return fName.c_str();
     }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) {
 
-        SkPicture picture;
-
-        SkCanvas* pCanvas = picture.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
-        recordCanvas(pCanvas);
-        picture.endRecording();
+        SkPictureRecorder recorder;
+        SkCanvas* pCanvas = recorder.beginRecording(PICTURE_WIDTH, PICTURE_HEIGHT);
+        this->recordCanvas(pCanvas);
+        SkAutoTUnref<SkPicture> picture(recorder.endRecording());
 
         const SkPoint translateDelta = getTranslateDelta(loops);
 
         for (int i = 0; i < loops; i++) {
-            picture.draw(canvas);
+            picture->draw(canvas);
             canvas->translate(translateDelta.fX, translateDelta.fY);
         }
     }
 
     virtual void recordCanvas(SkCanvas* canvas) = 0;
     virtual SkPoint getTranslateDelta(int N) {
         SkIPoint canvasSize = onGetSize();
         return SkPoint::Make(SkIntToScalar((PICTURE_WIDTH - canvasSize.fX)/N),
                              SkIntToScalar((PICTURE_HEIGHT- canvasSize.fY)/N));
     }
 
     SkString fName;
     SkScalar fPictureWidth;
     SkScalar fPictureHeight;
     SkScalar fTextSize;
 private:
     typedef SkBenchmark INHERITED;
 };
 
 
 class TextPlaybackBench : public PicturePlaybackBench {
 public:
     TextPlaybackBench() : INHERITED("drawText") { }
 protected:
-    virtual void recordCanvas(SkCanvas* canvas) {
+    virtual void recordCanvas(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         paint.setTextSize(fTextSize);
         paint.setColor(SK_ColorBLACK);
 
         const char* text = "Hamburgefons";
         size_t len = strlen(text);
         const SkScalar textWidth = paint.measureText(text, len);
 
         for (SkScalar x = 0; x < fPictureWidth; x += textWidth) {
             for (SkScalar y = 0; y < fPictureHeight; y += fTextSize) {
                 canvas->drawText(text, len, x, y, paint);
             }
         }
     }
 private:
     typedef PicturePlaybackBench INHERITED;
 };
 
 class PosTextPlaybackBench : public PicturePlaybackBench {
 public:
     PosTextPlaybackBench(bool drawPosH)
         : INHERITED(drawPosH ? "drawPosTextH" : "drawPosText")
         , fDrawPosH(drawPosH) { }
 protected:
-    virtual void recordCanvas(SkCanvas* canvas) {
+    virtual void recordCanvas(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         paint.setTextSize(fTextSize);
         paint.setColor(SK_ColorBLACK);
 
         const char* text = "Hamburgefons";
         size_t len = strlen(text);
         const SkScalar textWidth = paint.measureText(text, len);
 
         SkScalar* adv = new SkScalar[len];
         paint.getTextWidths(text, len, adv);
@@ skipping 22 matching lines @@
     bool fDrawPosH;
     typedef PicturePlaybackBench INHERITED;
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new TextPlaybackBench(); )
 DEF_BENCH( return new PosTextPlaybackBench(true); )
 DEF_BENCH( return new PosTextPlaybackBench(false); )