Harmonize FilterEffect::mapRect and mapPaintRect

third_party/WebKit/Source/core/svg/graphics/filters/SVGFEImage.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) 2010 Dirk Schulze <krit@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
  * License as published by the Free Software Foundation; either
@@ skipping 72 matching lines @@
 }
 
 AffineTransform makeMapBetweenRects(const FloatRect& source, const FloatRect& dest)
 {
     AffineTransform transform;
     transform.translate(dest.x() - source.x(), dest.y() - source.y());
     transform.scale(dest.width() / source.width(), dest.height() / source.height());
     return transform;
 }
 
-FloatRect FEImage::determineAbsolutePaintRect(const FloatRect& originalRequestedRect) const
+FloatRect FEImage::mapInputs(const FloatRect&) const
 {
     LayoutObject* layoutObject = referencedLayoutObject();
     if (!m_image && !layoutObject)
         return FloatRect();
 
-    FloatRect requestedRect = originalRequestedRect;
-    if (clipsToBounds())
-        requestedRect.intersect(absoluteBounds());
-
     FloatRect destRect = getFilter()->mapLocalRectToAbsoluteRect(filterPrimitiveSubregion());
     FloatRect srcRect;
     if (layoutObject) {
         srcRect = getLayoutObjectRepaintRect(layoutObject);
         SVGElement* contextNode = toSVGElement(layoutObject->node());
 
         if (contextNode->hasRelativeLengths()) {
             // FIXME: This fixes relative lengths but breaks non-relative ones (see crbug/260709).
             SVGLengthContext lengthContext(contextNode);
             FloatSize viewportSize;
             if (lengthContext.determineViewport(viewportSize)) {
                 srcRect = makeMapBetweenRects(FloatRect(FloatPoint(), viewportSize), destRect).mapRect(srcRect);
             }
         } else {
             srcRect = getFilter()->mapLocalRectToAbsoluteRect(srcRect);
             srcRect.move(destRect.x(), destRect.y());
         }
         destRect.intersect(srcRect);
     } else {
         srcRect = FloatRect(FloatPoint(), FloatSize(m_image->size()));
         m_preserveAspectRatio->transformRect(destRect, srcRect);
     }
-
-    destRect.intersect(requestedRect);
     return destRect;
 }
 
 LayoutObject* FEImage::referencedLayoutObject() const
 {
     if (!m_treeScope)
         return nullptr;
     Element* hrefElement = SVGURIReference::targetElementFromIRIString(m_href, *m_treeScope);
     if (!hrefElement || !hrefElement->isSVGElement())
         return nullptr;
@@ skipping 59 matching lines @@
 
     FloatRect srcRect = FloatRect(FloatPoint(), FloatSize(m_image->size()));
     FloatRect dstRect = filterPrimitiveSubregion();
 
     m_preserveAspectRatio->transformRect(dstRect, srcRect);
 
     return SkImageSource::Make(std::move(image), srcRect, dstRect, kHigh_SkFilterQuality);
 }
 
 } // namespace blink