| Index: third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp b/third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp
|
| index 3c4448004c871e75ab4517c96f11987c6f3e9f5c..9672cc42f7395bdf56f4ef4ac55d3cc5cddb0164 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp
|
| @@ -210,30 +210,21 @@ bool FilterEffect::inputsTaintOrigin() const
|
|
|
| PassRefPtr<SkImageFilter> FilterEffect::createTransparentBlack(SkiaImageFilterBuilder& builder) const
|
| {
|
| - SkImageFilter::CropRect rect = getCropRect();
|
| + SkImageFilter::CropRect rect;
|
| sk_sp<SkColorFilter> colorFilter = SkColorFilter::MakeModeFilter(0, SkXfermode::kClear_Mode);
|
| - return adoptRef(SkColorFilterImageFilter::Create(colorFilter.get(), nullptr, &rect));
|
| + return adoptRef(SkColorFilterImageFilter::Create(colorFilter.get(), nullptr, getCropRect(&rect)));
|
| }
|
|
|
| -SkImageFilter::CropRect FilterEffect::getCropRect() const
|
| +SkImageFilter::CropRect* FilterEffect::getCropRect(SkImageFilter::CropRect* cropRect) const
|
| {
|
| if (!filterPrimitiveSubregion().isEmpty()) {
|
| FloatRect rect = filterPrimitiveSubregion();
|
| rect.scale(getFilter()->scale());
|
| - return SkImageFilter::CropRect(rect);
|
| + *cropRect = SkImageFilter::CropRect(rect);
|
| + return cropRect;
|
| + } else {
|
| + return nullptr;
|
| }
|
| -
|
| - uint32_t flags = 0;
|
| - FloatRect rect = applyEffectBoundaries(rect);
|
| -
|
| - rect.scale(getFilter()->scale());
|
| -
|
| - flags |= hasX() ? SkImageFilter::CropRect::kHasLeft_CropEdge : 0;
|
| - flags |= hasY() ? SkImageFilter::CropRect::kHasTop_CropEdge : 0;
|
| - flags |= hasWidth() ? SkImageFilter::CropRect::kHasWidth_CropEdge : 0;
|
| - flags |= hasHeight() ? SkImageFilter::CropRect::kHasHeight_CropEdge : 0;
|
| -
|
| - return SkImageFilter::CropRect(rect, flags);
|
| }
|
|
|
| static int getImageFilterIndex(ColorSpace colorSpace, bool requiresPMColorValidation)
|
|
|