Harmonize FilterEffect::mapRect and mapPaintRect

third_party/WebKit/Source/platform/graphics/filters/FEConvolveMatrix.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) 2010 Zoltan Herczeg <zherczeg@webkit.org>
  * 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 37 matching lines @@
 }
 
 FEConvolveMatrix* FEConvolveMatrix::create(Filter* filter, const IntSize& kernelSize,
     float divisor, float bias, const IntPoint& targetOffset, EdgeModeType edgeMode,
     bool preserveAlpha, const Vector<float>& kernelMatrix)
 {
     return new FEConvolveMatrix(filter, kernelSize, divisor, bias, targetOffset, edgeMode,
         preserveAlpha, kernelMatrix);
 }
 
-FloatRect FEConvolveMatrix::mapPaintRect(const FloatRect& rect, bool forward) const
+FloatRect FEConvolveMatrix::mapEffect(const FloatRect& rect) const
 {
+    if (!parametersValid())
+        return rect;
     FloatRect result = rect;
-    if (parametersValid()) {
-        result.moveBy(forward ? -m_targetOffset : m_targetOffset - m_kernelSize);
-        result.expand(FloatSize(m_kernelSize));
-    }
+    result.moveBy(-m_targetOffset);
+    result.expand(FloatSize(m_kernelSize));
     return result;
 }
 
 bool FEConvolveMatrix::setDivisor(float divisor)
 {
     if (m_divisor == divisor)
         return false;
     m_divisor = divisor;
     return true;
 }
@@ skipping 112 matching lines @@
        << "divisor=\"" << m_divisor << "\" "
        << "bias=\"" << m_bias << "\" "
        << "target=\"" << m_targetOffset << "\" "
        << "edgeMode=\"" << m_edgeMode << "\" "
        << "preserveAlpha=\"" << m_preserveAlpha << "\"]\n";
     inputEffect(0)->externalRepresentation(ts, indent + 1);
     return ts;
 }
 
 } // namespace blink