Harmonize FilterEffect::mapRect and mapPaintRect

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

 /*
  * 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) 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.
@@ skipping 50 matching lines @@
     unsigned numberOfEffectInputs() const { return m_inputEffects.size(); }
 
     inline bool hasImageFilter() const
     {
         return m_imageFilters[0] || m_imageFilters[1] || m_imageFilters[2] || m_imageFilters[3];
     }
 
     // Clipped primitive subregion in the coordinate space of the target.
     FloatRect absoluteBounds() const;
 
+    // Mapping a rect forwards to determine which which destination pixels a
+    // given source rect would affect.
+    FloatRect mapRect(const FloatRect&) const;
+
     virtual sk_sp<SkImageFilter> createImageFilter();
     virtual sk_sp<SkImageFilter> createImageFilterWithoutValidation();
 
-    // Mapping a rect forwards determines which which destination pixels a
-    // given source rect would affect. Mapping a rect backwards determines
-    // which pixels from the source rect would be required to fill a given
-    // destination rect. Note that these are not necessarily the inverse of
-    // each other. For example, for FEGaussianBlur, they are the same
-    // transformation.
-    virtual FloatRect mapRect(const FloatRect& rect, bool forward = true) const { return rect; }
-    // A version of the above that is used for calculating paint rects. We can't
-    // use mapRect above for that, because that is also used for calculating effect
-    // regions for CSS filters and has undesirable effects for tile and
-    // displacement map.
-    virtual FloatRect mapPaintRect(const FloatRect& rect, bool forward) const
-    {
-        return mapRect(rect, forward);
-    }
-    FloatRect mapRectRecursive(const FloatRect&) const;
-
     virtual FilterEffectType getFilterEffectType() const { return FilterEffectTypeUnknown; }
 
     virtual TextStream& externalRepresentation(TextStream&, int indention = 0) const;
 
     FloatRect filterPrimitiveSubregion() const { return m_filterPrimitiveSubregion; }
     void setFilterPrimitiveSubregion(const FloatRect& filterPrimitiveSubregion) { m_filterPrimitiveSubregion = filterPrimitiveSubregion; }
 
     Filter* getFilter() { return m_filter; }
     const Filter* getFilter() const { return m_filter; }
 
     bool clipsToBounds() const { return m_clipsToBounds; }
     void setClipsToBounds(bool value) { m_clipsToBounds = value; }
 
     ColorSpace operatingColorSpace() const { return m_operatingColorSpace; }
     virtual void setOperatingColorSpace(ColorSpace colorSpace) { m_operatingColorSpace = colorSpace; }
 
-    // Compute the "paint rect" (which destination pixels will be affected) for
-    // the given rect. In the coordinate space of the target.
-    virtual FloatRect determineAbsolutePaintRect(const FloatRect& requestedAbsoluteRect) const;
     virtual bool affectsTransparentPixels() const { return false; }
 
     // Return false if the filter will only operate correctly on valid RGBA values, with
     // alpha in [0,255] and each color component in [0, alpha].
     virtual bool mayProduceInvalidPreMultipliedPixels() { return false; }
 
     SkImageFilter* getImageFilter(ColorSpace, bool requiresPMColorValidation) const;
     void setImageFilter(ColorSpace, bool requiresPMColorValidation, sk_sp<SkImageFilter>);
 
     bool originTainted() const { return m_originTainted; }
     void setOriginTainted() { m_originTainted = true; }
 
     bool inputsTaintOrigin() const;
 
 protected:
     FilterEffect(Filter*);
 
+    virtual FloatRect mapInputs(const FloatRect&) const;

[pdr., 2016/09/16 18:29:18]

Can you add comments above these like you did for mapRect above?

[fs, 2016/09/16 20:16:21]

Added.

+    virtual FloatRect mapEffect(const FloatRect&) const;
+    FloatRect applyBounds(const FloatRect&) const;
+
     sk_sp<SkImageFilter> createTransparentBlack() const;
 
     Color adaptColorToOperatingColorSpace(const Color& deviceColor);
 
     SkImageFilter::CropRect getCropRect() const;
 
 private:
     FilterEffectVector m_inputEffects;
 
     Member<Filter> m_filter;
@@ skipping 11 matching lines @@
     bool m_originTainted;
 
     ColorSpace m_operatingColorSpace;
 
     sk_sp<SkImageFilter> m_imageFilters[4];
 };
 
 } // namespace blink
 
 #endif // FilterEffect_h