Harmonize FilterEffect::mapRect and mapPaintRect

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
  * Copyright (C) 2005 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 27 matching lines @@
     , m_scale(scale)
 {
 }
 
 FEDisplacementMap* FEDisplacementMap::create(Filter* filter, ChannelSelectorType xChannelSelector,
     ChannelSelectorType yChannelSelector, float scale)
 {
     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));
     result.inflateY(getFilter()->applyVerticalScale(m_scale / 2));
     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;
 }
 
 bool FEDisplacementMap::setXChannelSelector(const ChannelSelectorType xChannelSelector)
 {
     if (m_xChannelSelector == xChannelSelector)
         return false;
     m_xChannelSelector = xChannelSelector;
@@ skipping 83 matching lines @@
     ts << "[feDisplacementMap";
     FilterEffect::externalRepresentation(ts);
     ts << " scale=\"" << m_scale << "\" "
        << "xChannelSelector=\"" << m_xChannelSelector << "\" "
        << "yChannelSelector=\"" << m_yChannelSelector << "\"]\n";
     inputEffect(0)->externalRepresentation(ts, indent + 1);
     inputEffect(1)->externalRepresentation(ts, indent + 1);
     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