From 84b18c7e3e042bf206e1ace3d1b6ea5bb929fe51 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Sun, 13 Apr 2014 19:09:42 +0000 Subject: 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 --- gm/pictureimagefilter.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gm/pictureimagefilter.cpp') 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 pictureSource(SkPictureImageFilter::Create(&fPicture)); - SkAutoTUnref pictureSourceSrcRect(SkPictureImageFilter::Create(&fPicture, srcRect)); - SkAutoTUnref pictureSourceEmptyRect(SkPictureImageFilter::Create(&fPicture, emptyRect)); + SkAutoTUnref pictureSource(SkPictureImageFilter::Create(fPicture)); + SkAutoTUnref pictureSourceSrcRect(SkPictureImageFilter::Create(fPicture, srcRect)); + SkAutoTUnref pictureSourceEmptyRect(SkPictureImageFilter::Create(fPicture, emptyRect)); // Draw the picture unscaled. fillRectFiltered(canvas, bounds, pictureSource); @@ -82,7 +83,7 @@ protected: } private: - SkPicture fPicture; + SkAutoTUnref fPicture; typedef GM INHERITED; }; -- cgit v1.2.3