diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-29 13:54:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-29 13:54:26 -0700 |
| commit | a33cf07a2273315363c0b6fb5d3ce811742f5a85 (patch) | |
| tree | c3eab040c77ea20073c82c3eaa3711f203468d6d /gm | |
| parent | 9b2ef62d4708081979ff954e1ac0623d1d4ffada (diff) | |
Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842793002
Review URL: https://codereview.chromium.org/1842793002
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/imagefiltersclipped.cpp | 4 | ||||
| -rw-r--r-- | gm/imagefiltersscaled.cpp | 2 | ||||
| -rw-r--r-- | gm/localmatriximagefilter.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp index 7c75bf3951..5401ef537f 100644 --- a/gm/imagefiltersclipped.cpp +++ b/gm/imagefiltersclipped.cpp @@ -138,11 +138,11 @@ protected: SkPaint noisePaint; noisePaint.setShader(noise); - SkAutoTUnref<SkImageFilter> rectFilter(SkPaintImageFilter::Create(noisePaint)); + sk_sp<SkImageFilter> rectFilter(SkPaintImageFilter::Make(noisePaint)); canvas->translate(SK_ARRAY_COUNT(filters)*(r.width() + margin), 0); for (int xOffset = 0; xOffset < 80; xOffset += 16) { bounds.fLeft = SkIntToScalar(xOffset); - draw_clipped_filter(canvas, rectFilter, 0, r, bounds); + draw_clipped_filter(canvas, rectFilter.get(), 0, r, bounds); canvas->translate(0, r.height() + margin); } } diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp index b0c55dca73..9bfac68c12 100644 --- a/gm/imagefiltersscaled.cpp +++ b/gm/imagefiltersscaled.cpp @@ -86,7 +86,7 @@ protected: SkErodeImageFilter::Create(1, 1, checkerboard.get()), SkOffsetImageFilter::Create(SkIntToScalar(32), 0), SkImageFilter::CreateMatrixFilter(resizeMatrix, kNone_SkFilterQuality), - SkPaintImageFilter::Create(noisePaint), + SkPaintImageFilter::Make(noisePaint).release(), SkLightingImageFilter::CreatePointLitDiffuse(pointLocation, white, surfaceScale, kd), SkLightingImageFilter::CreateSpotLitDiffuse(spotLocation, spotTarget, spotExponent, cutoffAngle, white, surfaceScale, kd), diff --git a/gm/localmatriximagefilter.cpp b/gm/localmatriximagefilter.cpp index d53380b858..5414fe341c 100644 --- a/gm/localmatriximagefilter.cpp +++ b/gm/localmatriximagefilter.cpp @@ -49,7 +49,7 @@ protected: return SkISize::Make(640, 640); } - static void show_image(SkCanvas* canvas, SkImage* image, SkImageFilter* filter) { + static void show_image(SkCanvas* canvas, SkImage* image, sk_sp<SkImageFilter> filter) { SkPaint paint; paint.setStyle(SkPaint::kStroke_Style); SkRect r = SkRect::MakeIWH(image->width(), image->height()).makeOutset(SK_ScalarHalf, @@ -81,14 +81,14 @@ protected: canvas->translate(40, 40); for (auto&& factory : factories) { - SkAutoTUnref<SkImageFilter> filter(factory()); + sk_sp<SkImageFilter> filter(factory()); canvas->save(); show_image(canvas, image0.get(), filter); for (const auto& matrix : matrices) { - SkAutoTUnref<SkImageFilter> localFilter(filter->newWithLocalMatrix(matrix)); + sk_sp<SkImageFilter> localFilter(filter->makeWithLocalMatrix(matrix)); canvas->translate(spacer, 0); - show_image(canvas, image0.get(), localFilter); + show_image(canvas, image0.get(), std::move(localFilter)); } canvas->restore(); canvas->translate(0, spacer); |