diff options
author | reed <reed@google.com> | 2016-03-18 07:25:55 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-18 07:25:55 -0700 |
commit | ca2622ba051829fed5f30facd74c5b41cd4b931c (patch) | |
tree | 3d8248b7764e500f857b3d6cfb6866e72b632199 /gm/pictureimagefilter.cpp | |
parent | eb75c7db3a7372de68347d0df8d58acebc33a9ad (diff) |
return pictures as sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1811703002
Review URL: https://codereview.chromium.org/1811703002
Diffstat (limited to 'gm/pictureimagefilter.cpp')
-rw-r--r-- | gm/pictureimagefilter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gm/pictureimagefilter.cpp b/gm/pictureimagefilter.cpp index ad479171fd..f25c86823b 100644 --- a/gm/pictureimagefilter.cpp +++ b/gm/pictureimagefilter.cpp @@ -33,7 +33,7 @@ protected: paint.setTextSize(SkIntToScalar(96)); const char* str = "e"; canvas->drawText(str, strlen(str), SkIntToScalar(20), SkIntToScalar(70), paint); - fPicture.reset(recorder.endRecording()); + fPicture = recorder.finishRecordingAsPicture(); } SkISize onISize() override { return SkISize::Make(600, 300); } @@ -58,16 +58,16 @@ protected: SkRect emptyRect = SkRect::MakeXYWH(20, 20, 0, 0); SkRect bounds = SkRect::MakeXYWH(0, 0, 100, 100); SkAutoTUnref<SkImageFilter> pictureSource( - SkPictureImageFilter::Create(fPicture)); + SkPictureImageFilter::Create(fPicture.get())); SkAutoTUnref<SkImageFilter> pictureSourceSrcRect( - SkPictureImageFilter::Create(fPicture, srcRect)); + SkPictureImageFilter::Create(fPicture.get(), srcRect)); SkAutoTUnref<SkImageFilter> pictureSourceEmptyRect( - SkPictureImageFilter::Create(fPicture, emptyRect)); + SkPictureImageFilter::Create(fPicture.get(), emptyRect)); SkAutoTUnref<SkImageFilter> pictureSourceResampled( - SkPictureImageFilter::CreateForLocalSpace(fPicture, fPicture->cullRect(), + SkPictureImageFilter::CreateForLocalSpace(fPicture.get(), fPicture->cullRect(), kLow_SkFilterQuality)); SkAutoTUnref<SkImageFilter> pictureSourcePixelated( - SkPictureImageFilter::CreateForLocalSpace(fPicture, fPicture->cullRect(), + SkPictureImageFilter::CreateForLocalSpace(fPicture.get(), fPicture->cullRect(), kNone_SkFilterQuality)); canvas->save(); @@ -102,7 +102,7 @@ protected: } private: - SkAutoTUnref<SkPicture> fPicture; + sk_sp<SkPicture> fPicture; typedef GM INHERITED; }; |