diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-05 09:09:36 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-05 09:09:37 -0700 |
| commit | fc11b0afe0ca922a42767d4a656ed640008da1bb (patch) | |
| tree | eb84a2ba05f37c8e7b9c721f38bc93bac27b5bcb /samplecode | |
| parent | b8797bb7b74adcab1d198de3ef4f0871b0bb6718 (diff) | |
Update SkMorphology ImageFilters to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1860573002
Review URL: https://codereview.chromium.org/1860573002
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 17 | ||||
| -rw-r--r-- | samplecode/SampleLayers.cpp | 6 |
2 files changed, 10 insertions, 13 deletions
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 1b7d30be1d..5d433b5748 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -705,20 +705,17 @@ static sk_sp<SkImageFilter> make_image_filter(bool canBeNull) { nullptr)); break; } - case MORPHOLOGY: { - sk_sp<SkImageFilter> subFilter(make_image_filter()); - + case MORPHOLOGY: if (R(2) == 1) { - filter = sk_sp<SkImageFilter>(SkDilateImageFilter::Create(R(static_cast<float>(kBitmapSize)), - R(static_cast<float>(kBitmapSize)), - subFilter.get())); + filter = SkDilateImageFilter::Make(R(static_cast<float>(kBitmapSize)), + R(static_cast<float>(kBitmapSize)), + make_image_filter()); } else { - filter = sk_sp<SkImageFilter>(SkErodeImageFilter::Create(R(static_cast<float>(kBitmapSize)), - R(static_cast<float>(kBitmapSize)), - subFilter.get())); + filter = SkErodeImageFilter::Make(R(static_cast<float>(kBitmapSize)), + R(static_cast<float>(kBitmapSize)), + make_image_filter()); } break; - } case BITMAP: { sk_sp<SkImage> image(SkImage::MakeFromBitmap(make_bitmap())); if (R(2) == 1) { diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp index 8c2724ce95..194f0a70a9 100644 --- a/samplecode/SampleLayers.cpp +++ b/samplecode/SampleLayers.cpp @@ -245,13 +245,13 @@ class BackdropView : public SampleView { SkPoint fCenter; SkScalar fAngle; sk_sp<SkImage> fImage; - SkAutoTUnref<SkImageFilter> fFilter; + sk_sp<SkImageFilter> fFilter; public: BackdropView() { fCenter.set(200, 150); fAngle = 0; fImage = GetResourceAsImage("mandrill_512.png"); - fFilter.reset(SkDilateImageFilter::Create(8, 8)); + fFilter = SkDilateImageFilter::Make(8, 8, nullptr); } protected: @@ -281,7 +281,7 @@ protected: SkPaint paint; paint.setAlpha(0xCC); - canvas->saveLayer({ &bounds, &paint, fFilter, 0 }); + canvas->saveLayer({ &bounds, &paint, fFilter.get(), 0 }); canvas->restore(); } |