| 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 200266d397bd814f86c3e9d28ace19a7c7470701..3c4448004c871e75ab4517c96f11987c6f3e9f5c 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp
|
| @@ -215,26 +215,16 @@ PassRefPtr<SkImageFilter> FilterEffect::createTransparentBlack(SkiaImageFilterBu
|
| return adoptRef(SkColorFilterImageFilter::Create(colorFilter.get(), nullptr, &rect));
|
| }
|
|
|
| -bool FilterEffect::hasConnectedInput() const
|
| -{
|
| - for (unsigned i = 0; i < m_inputEffects.size(); i++) {
|
| - if (m_inputEffects[i] && m_inputEffects[i]->getFilterEffectType() != FilterEffectTypeSourceInput) {
|
| - return true;
|
| - }
|
| - }
|
| - return false;
|
| -}
|
| -
|
| SkImageFilter::CropRect FilterEffect::getCropRect() const
|
| {
|
| - FloatRect rect;
|
| - uint32_t flags = 0;
|
| - if (!hasConnectedInput() && !getFilter()->filterRegion().isEmpty()) {
|
| - rect = getFilter()->filterRegion();
|
| - flags = SkImageFilter::CropRect::kHasAll_CropEdge;
|
| + if (!filterPrimitiveSubregion().isEmpty()) {
|
| + FloatRect rect = filterPrimitiveSubregion();
|
| + rect.scale(getFilter()->scale());
|
| + return SkImageFilter::CropRect(rect);
|
| }
|
|
|
| - rect = applyEffectBoundaries(rect);
|
| + uint32_t flags = 0;
|
| + FloatRect rect = applyEffectBoundaries(rect);
|
|
|
| rect.scale(getFilter()->scale());
|
|
|
|
|