diff options
| author |  reed <reed@google.com> | 2016-03-17 10:51:11 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-17 10:51:11 -0700 |
| commit | 9ce9d6772df650ceb0511f275e1a83dffa78ff72 (patch) | |
| tree | 1c0d54a75945863947490ec45cccf7c30eaa2ca4 /gm/imagefiltersgraph.cpp | |
| parent | 42d95a0afb26560586232961445ba36de387ca37 (diff) | |
update callsites for Make image factories
not forced yet, as we still have the build-guard. waiting on chrome CL
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810813003
TBR=
Review URL: https://codereview.chromium.org/1810813003
Diffstat (limited to 'gm/imagefiltersgraph.cpp')
| -rw-r--r-- | gm/imagefiltersgraph.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index 26ebc4df7d..fa9c512591 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -111,14 +111,14 @@ protected: SkISize onISize() override { return SkISize::Make(600, 150); } void onOnceBeforeDraw() override { - fImage.reset(SkImage::NewFromBitmap( - sk_tool_utils::create_string_bitmap(100, 100, SK_ColorWHITE, 20, 70, 96, "e"))); + fImage = SkImage::MakeFromBitmap( + sk_tool_utils::create_string_bitmap(100, 100, SK_ColorWHITE, 20, 70, 96, "e")); } void onDraw(SkCanvas* canvas) override { canvas->clear(SK_ColorBLACK); { - SkAutoTUnref<SkImageFilter> bitmapSource(SkImageSource::Create(fImage)); + SkAutoTUnref<SkImageFilter> bitmapSource(SkImageSource::Create(fImage.get())); SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(SK_ColorRED, SkXfermode::kSrcIn_Mode)); SkAutoTUnref<SkImageFilter> blur(SkBlurImageFilter::Create(4.0f, 4.0f, bitmapSource)); @@ -146,7 +146,7 @@ protected: SkPaint paint; paint.setImageFilter(blendColor); - DrawClippedImage(canvas, fImage, paint); + DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); } { @@ -165,7 +165,7 @@ protected: SkPaint paint; paint.setImageFilter(arithFilter); - DrawClippedImage(canvas, fImage, paint); + DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); } { @@ -179,7 +179,7 @@ protected: SkPaint paint; paint.setImageFilter(blend); - DrawClippedImage(canvas, fImage, paint); + DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); } { @@ -213,7 +213,7 @@ protected: SkPaint paint; paint.setImageFilter(convolve); - DrawClippedImage(canvas, fImage, paint); + DrawClippedImage(canvas, fImage.get(), paint); canvas->translate(SkIntToScalar(100), 0); } { @@ -245,7 +245,7 @@ private: canvas->restore(); } - SkAutoTUnref<SkImage> fImage; + sk_sp<SkImage> fImage; typedef GM INHERITED; }; |