Revert of Revamp filter primitive region calculations for Filter Effects

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 32 matching lines @@
 
 typedef HeapVector<Member<FilterEffect>> FilterEffectVector;
 
 enum FilterEffectType {
     FilterEffectTypeUnknown,
     FilterEffectTypeImage,
     FilterEffectTypeTile,
     FilterEffectTypeSourceInput
 };
 
-enum DetermineMaxEffectRectFlag {
-    DetermineMaxEffectRectNone = 0,
+enum DetermineSubregionFlag {
+    DetermineSubregionNone = 0,
     MapRectForward = 1,
     ClipToFilterRegion = 1 << 1
 };
 
-typedef int DetermineMaxEffectRectFlags;
+typedef int DetermineSubregionFlags;
 
 class PLATFORM_EXPORT FilterEffect : public GarbageCollectedFinalized<FilterEffect> {
     WTF_MAKE_NONCOPYABLE(FilterEffect);
 public:
     virtual ~FilterEffect();
     DECLARE_VIRTUAL_TRACE();
 
     void clearResult();
 
     FilterEffectVector& inputEffects() { return m_inputEffects; }
     FilterEffect* inputEffect(unsigned) const;
     unsigned numberOfEffectInputs() const { return m_inputEffects.size(); }
 
     inline bool hasImageFilter() const
     {
         return m_imageFilters[0] || m_imageFilters[1] || m_imageFilters[2] || m_imageFilters[3];
     }
 
     IntRect absolutePaintRect() const { return m_absolutePaintRect; }
 
     FloatRect maxEffectRect() const { return m_maxEffectRect; }
+    void setMaxEffectRect(const FloatRect& maxEffectRect) { m_maxEffectRect = maxEffectRect; }
 
     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;
 
+    // The following functions are SVG specific and will move to LayoutSVGResourceFilterPrimitive.
+    // See bug https://bugs.webkit.org/show_bug.cgi?id=45614.
+    bool hasX() const { return m_hasX; }
+    void setHasX(bool value) { m_hasX = value; }
+
+    bool hasY() const { return m_hasY; }
+    void setHasY(bool value) { m_hasY = value; }
+
+    bool hasWidth() const { return m_hasWidth; }
+    void setHasWidth(bool value) { m_hasWidth = value; }
+
+    bool hasHeight() const { return m_hasHeight; }
+    void setHasHeight(bool value) { m_hasHeight = value; }
+
     FloatRect filterPrimitiveSubregion() const { return m_filterPrimitiveSubregion; }
     void setFilterPrimitiveSubregion(const FloatRect& filterPrimitiveSubregion) { m_filterPrimitiveSubregion = filterPrimitiveSubregion; }
 
+    const FloatRect& effectBoundaries() const { return m_effectBoundaries; }
+    void setEffectBoundaries(const FloatRect& effectBoundaries) { m_effectBoundaries = effectBoundaries; }
+    FloatRect applyEffectBoundaries(const FloatRect&) const;
+
     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; }
 
-    FloatRect determineMaximumEffectRect(DetermineMaxEffectRectFlags);
+    FloatRect determineFilterPrimitiveSubregion(DetermineSubregionFlags = DetermineSubregionNone);
 
     virtual FloatRect determineAbsolutePaintRect(const FloatRect& requestedAbsoluteRect);
     virtual bool affectsTransparentPixels() { 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>);
@@ skipping 24 matching lines @@
     FloatRect m_maxEffectRect;
     Member<Filter> m_filter;
 
     // The following member variables are SVG specific and will move to LayoutSVGResourceFilterPrimitive.
     // See bug https://bugs.webkit.org/show_bug.cgi?id=45614.
 
     // The subregion of a filter primitive according to the SVG Filter specification in local coordinates.
     // This is SVG specific and needs to move to LayoutSVGResourceFilterPrimitive.
     FloatRect m_filterPrimitiveSubregion;
 
+    // x, y, width and height of the actual SVGFE*Element. Is needed to determine the subregion of the
+    // filter primitive on a later step.
+    FloatRect m_effectBoundaries;
+    bool m_hasX;
+    bool m_hasY;
+    bool m_hasWidth;
+    bool m_hasHeight;
+
     // Should the effect clip to its primitive region, or expand to use the combined region of its inputs.
     bool m_clipsToBounds;
 
     bool m_originTainted;
 
     ColorSpace m_operatingColorSpace;
 
     sk_sp<SkImageFilter> m_imageFilters[4];
 };
 
 } // namespace blink
 
 #endif // FilterEffect_h