Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1065)

Unified Diff: third_party/WebKit/Source/platform/graphics/filters/FilterEffect.cpp

Issue 1840303006: Use Blink's computed filterPrimitiveSubregion() as CropRect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mark more tests for rebaseline Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/filters/FilterEffect.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/filters/FilterEffect.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698