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

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

Issue 2341923002: Harmonize FilterEffect::mapRect and mapPaintRect (Closed)
Patch Set: Rebase Created 4 years, 3 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
Index: third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp b/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp
index 9420df0f97d80f48544df061a8c522b53dc5f82e..451ef102c1ef1d08828139d20148ca580a492924 100644
--- a/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp
+++ b/third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp
@@ -45,7 +45,7 @@ FEDisplacementMap* FEDisplacementMap::create(Filter* filter, ChannelSelectorType
return new FEDisplacementMap(filter, xChannelSelector, yChannelSelector, scale);
}
-FloatRect FEDisplacementMap::mapPaintRect(const FloatRect& rect, bool) const
+FloatRect FEDisplacementMap::mapEffect(const FloatRect& rect) const
{
FloatRect result = rect;
result.inflateX(getFilter()->applyHorizontalScale(m_scale / 2));
@@ -53,6 +53,11 @@ FloatRect FEDisplacementMap::mapPaintRect(const FloatRect& rect, bool) const
return result;
}
+FloatRect FEDisplacementMap::mapInputs(const FloatRect& rect) const
+{
+ return inputEffect(0)->mapRect(rect);
+}
+
ChannelSelectorType FEDisplacementMap::xChannelSelector() const
{
return m_xChannelSelector;
@@ -156,17 +161,4 @@ TextStream& FEDisplacementMap::externalRepresentation(TextStream& ts, int indent
return ts;
}
-FloatRect FEDisplacementMap::determineAbsolutePaintRect(const FloatRect& requestedRect) const
-{
- FloatRect rect = requestedRect;
- if (clipsToBounds())
- rect.intersect(absoluteBounds());
-
- rect = mapPaintRect(rect, false);
- rect = inputEffect(0)->determineAbsolutePaintRect(rect);
- rect = mapPaintRect(rect, true);
- rect.intersect(requestedRect);
- return rect;
-}
-
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698