Harmonize FilterEffect::mapRect and mapPaintRect

third_party/WebKit/Source/platform/graphics/filters/FEGaussianBlur.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 Igalia, S.L.
  * 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
@@ skipping 58 matching lines @@
 
     return kernelSize;
 }
 
 IntSize FEGaussianBlur::calculateKernelSize(const Filter* filter, const FloatPoint& std)
 {
     FloatPoint stdError(filter->applyHorizontalScale(std.x()), filter->applyVerticalScale(std.y()));
     return calculateUnscaledKernelSize(stdError);
 }
 
-FloatRect FEGaussianBlur::mapRect(const FloatRect& rect, bool) const
+FloatRect FEGaussianBlur::mapEffect(const FloatRect& rect) const
 {
-    FloatRect result = rect;
     IntSize kernelSize = calculateKernelSize(getFilter(), FloatPoint(m_stdX, m_stdY));
 
     // We take the half kernel size and multiply it with three, because we run box blur three times.
+    FloatRect result = rect;
     result.inflateX(3.0f * kernelSize.width() * 0.5f);
     result.inflateY(3.0f * kernelSize.height() * 0.5f);
     return result;
 }
 
-FloatRect FEGaussianBlur::determineAbsolutePaintRect(const FloatRect& originalRequestedRect) const
-{
-    FloatRect requestedRect = originalRequestedRect;
-    if (clipsToBounds())
-        requestedRect.intersect(absoluteBounds());
-
-    FilterEffect* input = inputEffect(0);
-    FloatRect inputRect = input->determineAbsolutePaintRect(mapRect(requestedRect, false));
-    FloatRect outputRect = mapRect(inputRect, true);
-    outputRect.intersect(requestedRect);
-
-    // Blur needs space for both input and output pixels in the paint area.
-    // Input is also clipped to subregion.
-    if (clipsToBounds())
-        inputRect.intersect(absoluteBounds());
-    return outputRect;
-}
-
 sk_sp<SkImageFilter> FEGaussianBlur::createImageFilter()
 {
     sk_sp<SkImageFilter> input(SkiaImageFilterBuilder::build(inputEffect(0), operatingColorSpace()));
     float stdX = getFilter()->applyHorizontalScale(m_stdX);
     float stdY = getFilter()->applyVerticalScale(m_stdY);
     SkImageFilter::CropRect rect = getCropRect();
     return SkBlurImageFilter::Make(SkFloatToScalar(stdX), SkFloatToScalar(stdY), std::move(input), &rect);
 }
 
 TextStream& FEGaussianBlur::externalRepresentation(TextStream& ts, int indent) const
 {
     writeIndent(ts, indent);
     ts << "[feGaussianBlur";
     FilterEffect::externalRepresentation(ts);
     ts << " stdDeviation=\"" << m_stdX << ", " << m_stdY << "\"]\n";
     inputEffect(0)->externalRepresentation(ts, indent + 1);
     return ts;
 }
 
 } // namespace blink