diff options
author | 2016-04-06 08:40:59 -0700 | |
---|---|---|
committer | 2016-04-06 08:40:59 -0700 | |
commit | c416912da4840af0c49bd8cdcf00044ed39500f6 (patch) | |
tree | 2da9d5261c5a85c660a0fea0beae63f5dd7e83b4 /tests | |
parent | 885b677b10b88ba1eebecd1c2795702b88f63d39 (diff) |
Update DropShadowImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1861843002
Review URL: https://codereview.chromium.org/1861843002
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ImageFilterTest.cpp | 8 | ||||
-rw-r--r-- | tests/RecordDrawTest.cpp | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index b0b7349aea..197dd32277 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -181,10 +181,10 @@ public: SK_Scalar1, input, cropRect).release()); - this->addFilter("drop shadow", SkDropShadowImageFilter::Create( + this->addFilter("drop shadow", SkDropShadowImageFilter::Make( SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_ColorGREEN, SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, - input.get(), cropRect)); + input, cropRect).release()); this->addFilter("diffuse lighting", SkLightingImageFilter::CreatePointLitDiffuse( location, SK_ColorGREEN, 0, 0, input.get(), cropRect)); this->addFilter("specular lighting", @@ -851,11 +851,11 @@ static sk_sp<SkImageFilter> make_blur(sk_sp<SkImageFilter> input) { } static sk_sp<SkImageFilter> make_drop_shadow(sk_sp<SkImageFilter> input) { - return sk_sp<SkImageFilter>(SkDropShadowImageFilter::Create( + return SkDropShadowImageFilter::Make( SkIntToScalar(100), SkIntToScalar(100), SkIntToScalar(10), SkIntToScalar(10), SK_ColorBLUE, SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, - input.get(), nullptr)); + std::move(input)); } DEF_TEST(ImageFilterBlurThenShadowBounds, reporter) { diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp index 17d971126c..cf8141a789 100644 --- a/tests/RecordDrawTest.cpp +++ b/tests/RecordDrawTest.cpp @@ -209,8 +209,10 @@ DEF_TEST(RecordDraw_SaveLayerAffectsClipBounds, r) { // We draw a rectangle with a long drop shadow. We used to not update the clip // bounds based on SaveLayer paints, so the drop shadow could be cut off. SkPaint paint; - paint.setImageFilter(SkDropShadowImageFilter::Create(20, 0, 0, 0, SK_ColorBLACK, - SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode))->unref(); + paint.setImageFilter(SkDropShadowImageFilter::Make( + 20, 0, 0, 0, SK_ColorBLACK, + SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, + nullptr)); recorder.saveLayer(nullptr, &paint); recorder.clipRect(SkRect::MakeWH(20, 40)); |