split SkPictureRecorder out of SkPicture

https://codereview.chromium.org/214953003/



git-svn-id: http://skia.googlecode.com/svn/trunk@14171 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 7 insertions, 6 deletions

diff --git a/gm/pictureimagefilter.cpp b/gm/pictureimagefilter.cpp
index 2b3cd14ea2..12806618b3 100644
--- a/gm/pictureimagefilter.cpp
+++ b/gm/pictureimagefilter.cpp
@@ -22,7 +22,8 @@ protected:
     }
 
     void makePicture() {
-        SkCanvas* canvas = fPicture.beginRecording(100, 100);
+        SkPictureRecorder recorder;
+        SkCanvas* canvas = recorder.beginRecording(100, 100);
         canvas->clear(0x00000000);
         SkPaint paint;
         paint.setAntiAlias(true);
@@ -30,7 +31,7 @@ protected:
         paint.setTextSize(SkIntToScalar(96));
         const char* str = "e";
         canvas->drawText(str, strlen(str), SkIntToScalar(20), SkIntToScalar(70), paint);
-        fPicture.endRecording();
+        fPicture.reset(recorder.endRecording());
     }
 
     virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(500, 150); }
@@ -54,9 +55,9 @@ protected:
             SkRect srcRect = SkRect::MakeXYWH(20, 20, 30, 30);
             SkRect emptyRect = SkRect::MakeXYWH(20, 20, 0, 0);
             SkRect bounds = SkRect::MakeXYWH(0, 0, 100, 100);
-            SkAutoTUnref<SkImageFilter> pictureSource(SkPictureImageFilter::Create(&fPicture));
-            SkAutoTUnref<SkImageFilter> pictureSourceSrcRect(SkPictureImageFilter::Create(&fPicture, srcRect));
-            SkAutoTUnref<SkImageFilter> pictureSourceEmptyRect(SkPictureImageFilter::Create(&fPicture, emptyRect));
+            SkAutoTUnref<SkImageFilter> pictureSource(SkPictureImageFilter::Create(fPicture));
+            SkAutoTUnref<SkImageFilter> pictureSourceSrcRect(SkPictureImageFilter::Create(fPicture, srcRect));
+            SkAutoTUnref<SkImageFilter> pictureSourceEmptyRect(SkPictureImageFilter::Create(fPicture, emptyRect));
 
             // Draw the picture unscaled.
             fillRectFiltered(canvas, bounds, pictureSource);
@@ -82,7 +83,7 @@ protected:
     }
 
 private:
-    SkPicture fPicture;
+    SkAutoTUnref<SkPicture> fPicture;
     typedef GM INHERITED;
 };