Harmonize FilterEffect::mapRect and mapPaintRect

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

 /*
  * Copyright (C) 2008 Alex Mathews <possessedpenguinbob@gmail.com>
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2012 University of Szeged
  * 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 38 matching lines @@
 }
 
 FloatRect FilterEffect::absoluteBounds() const
 {
     FloatRect computedBounds = getFilter()->filterRegion();
     if (!filterPrimitiveSubregion().isEmpty())
         computedBounds.intersect(filterPrimitiveSubregion());
     return getFilter()->mapLocalRectToAbsoluteRect(computedBounds);
 }
 
-FloatRect FilterEffect::determineAbsolutePaintRect(const FloatRect& originalRequestedRect) const
+FloatRect FilterEffect::mapInputs(const FloatRect& rect) const
 {
-    FloatRect requestedRect = originalRequestedRect;
-    // Filters in SVG clip to primitive subregion, while CSS doesn't.
-    if (clipsToBounds())
-        requestedRect.intersect(absoluteBounds());
-
-    FloatRect inputRect = mapPaintRect(requestedRect, false);
+    if (!m_inputEffects.size()) {
+        if (clipsToBounds())
+            return absoluteBounds();
+        return rect;
+    }
     FloatRect inputUnion;
-    unsigned size = m_inputEffects.size();
-
-    for (unsigned i = 0; i < size; ++i)
-        inputUnion.unite(m_inputEffects.at(i)->determineAbsolutePaintRect(inputRect));
-    inputUnion = mapPaintRect(inputUnion, true);
-
-    if (affectsTransparentPixels() || !size) {
-        inputUnion = requestedRect;
-    } else {
-        // Rect may have inflated. Re-intersect with request.
-        inputUnion.intersect(requestedRect);
-    }
+    for (const auto& effect : m_inputEffects)
+        inputUnion.unite(effect->mapRect(rect));
     return inputUnion;
 }
 
-FloatRect FilterEffect::mapRectRecursive(const FloatRect& rect) const
+FloatRect FilterEffect::mapEffect(const FloatRect& rect) const
 {
-    FloatRect result;
-    if (m_inputEffects.size() > 0) {
-        result = m_inputEffects.at(0)->mapRectRecursive(rect);
-        for (unsigned i = 1; i < m_inputEffects.size(); ++i)
-            result.unite(m_inputEffects.at(i)->mapRectRecursive(rect));
-    } else
-        result = rect;
-    return mapRect(result);
+    return rect;
+}
+
+FloatRect FilterEffect::applyBounds(const FloatRect& rect) const
+{
+    // Filters in SVG clip to primitive subregion, while CSS doesn't.
+    if (!clipsToBounds())
+        return rect;
+    FloatRect bounds = absoluteBounds();
+    if (affectsTransparentPixels())
+        return bounds;
+    return intersection(rect, bounds);
+}
+
+FloatRect FilterEffect::mapRect(const FloatRect& rect) const
+{
+    FloatRect result = mapInputs(rect);
+    result = mapEffect(result);
+    return applyBounds(result);
 }
 
 FilterEffect* FilterEffect::inputEffect(unsigned number) const
 {
     ASSERT_WITH_SECURITY_IMPLICATION(number < m_inputEffects.size());
     return m_inputEffects.at(number).get();
 }
 
 void FilterEffect::clearResult()
 {
@@ skipping 66 matching lines @@
     return m_imageFilters[index].get();
 }
 
 void FilterEffect::setImageFilter(ColorSpace colorSpace, bool requiresPMColorValidation, sk_sp<SkImageFilter> imageFilter)
 {
     int index = getImageFilterIndex(colorSpace, requiresPMColorValidation);
     m_imageFilters[index] = std::move(imageFilter);
 }
 
 } // namespace blink