Harmonize FilterEffect::mapRect and mapPaintRect

third_party/WebKit/Source/platform/graphics/filters/FEDisplacementMap.cpp

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

[Stephen White, 2016/09/20 15:36:19]

New repaint test for this node?

[fs, 2016/09/20 19:14:14]

Added a (one) test.

+{
+    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