diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-01 09:28:51 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-01 09:28:51 -0700 |
| commit | 549c8991959333e5c0f53faebcbbd5d6bc8f6a56 (patch) | |
| tree | db498c61ef16f570f8c43b5c7bf462529134704a /gm/xfermodeimagefilter.cpp | |
| parent | f27002947d40ab884e13d39ee2ef0ac4ccadcd6a (diff) | |
Update SkImageSource to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842243002
Review URL: https://codereview.chromium.org/1842243002
Diffstat (limited to 'gm/xfermodeimagefilter.cpp')
| -rw-r--r-- | gm/xfermodeimagefilter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp index dc8cbede21..3293c81ba4 100644 --- a/gm/xfermodeimagefilter.cpp +++ b/gm/xfermodeimagefilter.cpp @@ -85,7 +85,7 @@ protected: }; int x = 0, y = 0; - sk_sp<SkImageFilter> background(SkImageSource::Create(fCheckerboard.get())); + sk_sp<SkImageFilter> background(SkImageSource::Make(fCheckerboard)); for (size_t i = 0; i < SK_ARRAY_COUNT(gModes); i++) { paint.setImageFilter(SkXfermodeImageFilter::Make(SkXfermode::Make(gModes[i].fMode), background.get())); @@ -98,8 +98,7 @@ protected: } // Test arithmetic mode as image filter paint.setImageFilter(SkXfermodeImageFilter::Make( - SkArithmeticMode::Make(0, SK_Scalar1, SK_Scalar1, 0), - background.get())); + SkArithmeticMode::Make(0, SK_Scalar1, SK_Scalar1, 0), background.get())); DrawClippedBitmap(canvas, fBitmap, paint, x, y); x += fBitmap.width() + MARGIN; if (x + fBitmap.width() > WIDTH) { @@ -118,7 +117,7 @@ protected: SkIntToScalar(fBitmap.height() + 4)); // Test offsets on SrcMode (uses fixed-function blend) sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(fBitmap)); - sk_sp<SkImageFilter> foreground(SkImageSource::Create(bitmapImage.get())); + sk_sp<SkImageFilter> foreground(SkImageSource::Make(std::move(bitmapImage))); sk_sp<SkImageFilter> offsetForeground(SkOffsetImageFilter::Make(SkIntToScalar(4), SkIntToScalar(-4), foreground)); |