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/xfermodeimagefilter.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/xfermodeimagefilter.cpp')
| -rw-r--r-- | gm/xfermodeimagefilter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp index 85bbf44765..805e2201ea 100644 --- a/gm/xfermodeimagefilter.cpp +++ b/gm/xfermodeimagefilter.cpp @@ -37,11 +37,11 @@ protected: void onOnceBeforeDraw() override { fBitmap = sk_tool_utils::create_string_bitmap(80, 80, 0xD000D000, 15, 65, 96, "e"); - fCheckerboard.reset(SkImage::NewFromBitmap( + fCheckerboard = SkImage::MakeFromBitmap( sk_tool_utils::create_checkerboard_bitmap(80, 80, sk_tool_utils::color_to_565(0xFFA0A0A0), sk_tool_utils::color_to_565(0xFF404040), - 8))); + 8)); } void onDraw(SkCanvas* canvas) override { @@ -85,7 +85,7 @@ protected: }; int x = 0, y = 0; - SkAutoTUnref<SkImageFilter> background(SkImageSource::Create(fCheckerboard)); + SkAutoTUnref<SkImageFilter> background(SkImageSource::Create(fCheckerboard.get())); for (size_t i = 0; i < SK_ARRAY_COUNT(gModes); i++) { SkAutoTUnref<SkXfermode> mode(SkXfermode::Create(gModes[i].fMode)); SkAutoTUnref<SkImageFilter> filter(SkXfermodeImageFilter::Create(mode, background)); @@ -119,8 +119,8 @@ protected: SkRect clipRect = SkRect::MakeWH(SkIntToScalar(fBitmap.width() + 4), SkIntToScalar(fBitmap.height() + 4)); // Test offsets on SrcMode (uses fixed-function blend) - SkAutoTUnref<SkImage> bitmapImage(SkImage::NewFromBitmap(fBitmap)); - SkAutoTUnref<SkImageFilter> foreground(SkImageSource::Create(bitmapImage)); + sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(fBitmap)); + SkAutoTUnref<SkImageFilter> foreground(SkImageSource::Create(bitmapImage.get())); SkAutoTUnref<SkImageFilter> offsetForeground(SkOffsetImageFilter::Create( SkIntToScalar(4), SkIntToScalar(-4), foreground)); SkAutoTUnref<SkImageFilter> offsetBackground(SkOffsetImageFilter::Create( @@ -213,8 +213,8 @@ private: canvas->restore(); } - SkBitmap fBitmap; - SkAutoTUnref<SkImage> fCheckerboard; + SkBitmap fBitmap; + sk_sp<SkImage> fCheckerboard; typedef GM INHERITED; }; |