Replace FilterEffect::maxEffectRect() with absoluteBounds()

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 30 matching lines @@
 FilterEffect::~FilterEffect()
 {
 }
 
 DEFINE_TRACE(FilterEffect)
 {
     visitor->trace(m_inputEffects);
     visitor->trace(m_filter);
 }
 
+FloatRect FilterEffect::absoluteBounds() const
+{
+    FloatRect computedBounds = getFilter()->filterRegion();

[pdr., 2016/09/08 20:46:12]

Should we clip/intersect with the filter region here or in
determineAbsolutePaintRect?

[fs, 2016/09/08 21:08:11]

For the same reason stated in SVGFEImage, it doesn't really matter at this point
in time. Eventually this method (and its users) will need to morph though.

+    if (!filterPrimitiveSubregion().isEmpty())
+        computedBounds.intersect(filterPrimitiveSubregion());
+    return getFilter()->mapLocalRectToAbsoluteRect(computedBounds);
+}
+
 FloatRect FilterEffect::determineAbsolutePaintRect(const FloatRect& originalRequestedRect)
 {
     FloatRect requestedRect = originalRequestedRect;
     // Filters in SVG clip to primitive subregion, while CSS doesn't.
-    if (m_clipsToBounds)
-        requestedRect.intersect(maxEffectRect());
+    if (clipsToBounds())

[pdr., 2016/09/08 20:46:12]

The comment above m_clipsToBounds makes me think this should be after the union
of all input paint rects, below.

[fs, 2016/09/08 21:08:12]

Yes, that probably makes more sense. The way things are now we essentially limit
both input rect and output rect though (see the if-else at the end.)

+        requestedRect.intersect(absoluteBounds());
 
     // We may be called multiple times if result is used more than once. Return
     // quickly if if nothing new is required.
     if (absolutePaintRect().contains(enclosingIntRect(requestedRect)))
         return requestedRect;
 
     FloatRect inputRect = mapPaintRect(requestedRect, false);
     FloatRect inputUnion;
     unsigned size = m_inputEffects.size();
 
@@ skipping 53 matching lines @@
     return ColorSpaceUtilities::convertColor(deviceColor, operatingColorSpace());
 }
 
 TextStream& FilterEffect::externalRepresentation(TextStream& ts, int) const
 {
     // FIXME: We should dump the subRegions of the filter primitives here later. This isn't
     // possible at the moment, because we need more detailed informations from the target object.
     return ts;
 }
 
-FloatRect FilterEffect::determineMaximumEffectRect()
-{
-    DCHECK(getFilter());
-    Filter* filter = getFilter();
-
-    // Compute the union of the inputs. Always do this because it has
-    // side-effects. (It computes the maximum effect rect of the input.)
-    FloatRect absoluteInputUnion;
-    for (auto& effect : m_inputEffects)
-        absoluteInputUnion.unite(effect->determineMaximumEffectRect());
-
-    FloatRect absoluteSubregion;
-    switch (getFilterEffectType()) {
-    default:
-        if (m_inputEffects.size()) {
-            absoluteSubregion = absoluteInputUnion;
-            if (clipsToBounds())
-                absoluteSubregion.intersect(filter->mapLocalRectToAbsoluteRect(filterPrimitiveSubregion()));
-            break;
-        }
-        // Else fall-through and use the primitive region. (FETurbulence/FEFlood/FEImage)
-    case FilterEffectTypeTile:
-        absoluteSubregion = filter->mapLocalRectToAbsoluteRect(filterPrimitiveSubregion());
-        break;
-    case FilterEffectTypeSourceInput:
-        absoluteSubregion = filter->absoluteFilterRegion();
-        break;
-    }
-
-    // Clip every filter effect to the filter region.
-    absoluteSubregion.intersect(filter->absoluteFilterRegion());
-
-    m_maxEffectRect = absoluteSubregion;
-    return absoluteSubregion;
-}
-
 sk_sp<SkImageFilter> FilterEffect::createImageFilter()
 {
     return nullptr;
 }
 
 sk_sp<SkImageFilter> FilterEffect::createImageFilterWithoutValidation()
 {
     return createImageFilter();
 }
 
@@ skipping 39 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