Harmonize FilterEffect::mapRect and mapPaintRect

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

 /*
  * Copyright (C) Research In Motion Limited 2011. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 26 matching lines @@
     , m_shadowColor(shadowColor)
     , m_shadowOpacity(shadowOpacity)
 {
 }
 
 FEDropShadow* FEDropShadow::create(Filter* filter, float stdX, float stdY, float dx, float dy, const Color& shadowColor, float shadowOpacity)
 {
     return new FEDropShadow(filter, stdX, stdY, dx, dy, shadowColor, shadowOpacity);
 }
 
-FloatRect FEDropShadow::mapRect(const FloatRect& rect, bool forward) const
+FloatRect FEDropShadow::mapEffect(const FloatRect& rect) const
 {
-    FloatRect result = rect;
     const Filter* filter = this->getFilter();
-    ASSERT(filter);
+    DCHECK(filter);
 
     FloatRect offsetRect = rect;
-    if (forward)
-        offsetRect.move(filter->applyHorizontalScale(m_dx), filter->applyVerticalScale(m_dy));
-    else
-        offsetRect.move(-filter->applyHorizontalScale(m_dx), -filter->applyVerticalScale(m_dy));
-    result.unite(offsetRect);
+    offsetRect.move(filter->applyHorizontalScale(m_dx), filter->applyVerticalScale(m_dy));
 
     IntSize kernelSize = FEGaussianBlur::calculateKernelSize(filter, 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 = unionRect(rect, offsetRect);
     result.inflateX(3.0f * kernelSize.width() * 0.5f);
     result.inflateY(3.0f * kernelSize.height() * 0.5f);
     return result;
 }
 
 sk_sp<SkImageFilter> FEDropShadow::createImageFilter()
 {
     sk_sp<SkImageFilter> input(SkiaImageFilterBuilder::build(inputEffect(0), operatingColorSpace()));
     float dx = getFilter()->applyHorizontalScale(m_dx);
     float dy = getFilter()->applyVerticalScale(m_dy);
     float stdX = getFilter()->applyHorizontalScale(m_stdX);
     float stdY = getFilter()->applyVerticalScale(m_stdY);
     Color color = adaptColorToOperatingColorSpace(m_shadowColor.combineWithAlpha(m_shadowOpacity));
     SkImageFilter::CropRect cropRect = getCropRect();
     return SkDropShadowImageFilter::Make(SkFloatToScalar(dx), SkFloatToScalar(dy), SkFloatToScalar(stdX), SkFloatToScalar(stdY), color.rgb(), SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, std::move(input), &cropRect);
 }
 
-
 TextStream& FEDropShadow::externalRepresentation(TextStream& ts, int indent) const
 {
     writeIndent(ts, indent);
     ts << "[feDropShadow";
     FilterEffect::externalRepresentation(ts);
     ts << " stdDeviation=\"" << m_stdX << ", " << m_stdY << "\" dx=\"" << m_dx << "\" dy=\"" << m_dy << "\" flood-color=\"" << m_shadowColor.nameForLayoutTreeAsText() <<"\" flood-opacity=\"" << m_shadowOpacity << "]\n";
     inputEffect(0)->externalRepresentation(ts, indent + 1);
     return ts;
 }
 
 } // namespace blink