Changeset 79851 in webkit

Timestamp:

Feb 28, 2011 3:31:11 AM (13 years ago)

Author:

reni@webkit.org

Message:

2011-02-28 Renata Hodovan <​reni@webkit.org>

Reviewed by Andreas Kling.

FETurbulenceElement changes doesn't require relayout
​https://bugs.webkit.org/show_bug.cgi?id=55141

When the FETurbulenceElement receives an update message but the given value remains the same we don't need
to relayout the filter.
Besides fix a typo in FETurbulence and change the paramterer type of FETurbulence::setNumOctaves from bool
to int according to the spec.

No new tests are needed because this modification is covered by the dynamic update tests of FETurbulence.

• platform/graphics/filters/FETurbulence.cpp: (WebCore::FETurbulence::FETurbulence): (WebCore::FETurbulence::create): (WebCore::FETurbulence::type): (WebCore::FETurbulence::setType): (WebCore::FETurbulence::setBaseFrequencyY): (WebCore::FETurbulence::setBaseFrequencyX): (WebCore::FETurbulence::setSeed): (WebCore::FETurbulence::setNumOctaves): (WebCore::FETurbulence::setStitchTiles): (WebCore::operator<<):
• platform/graphics/filters/FETurbulence.h:
• svg/SVGFETurbulenceElement.cpp: (WebCore::SVGFETurbulenceElement::setFilterEffectAttribute): (WebCore::SVGFETurbulenceElement::svgAttributeChanged): (WebCore::SVGFETurbulenceElement::build):
• svg/SVGFETurbulenceElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/filters/FETurbulence.cpp (modified) (8 diffs)
• platform/graphics/filters/FETurbulence.h (modified) (4 diffs)
• svg/SVGFETurbulenceElement.cpp (modified) (3 diffs)
• svg/SVGFETurbulenceElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-28  Renata Hodovan  <reni@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        FETurbulenceElement changes doesn't require relayout
+        https://bugs.webkit.org/show_bug.cgi?id=55141
+
+        When the FETurbulenceElement receives an update message but the given value remains the same we don't need
+        to relayout the filter.
+        Besides fix a typo in FETurbulence and change the paramterer type of FETurbulence::setNumOctaves from bool
+        to int according to the spec.
+
+        No new tests are needed because this modification is covered by the dynamic update tests of FETurbulence.
+
+        * platform/graphics/filters/FETurbulence.cpp:
+        (WebCore::FETurbulence::FETurbulence):
+        (WebCore::FETurbulence::create):
+        (WebCore::FETurbulence::type):
+        (WebCore::FETurbulence::setType):
+        (WebCore::FETurbulence::setBaseFrequencyY):
+        (WebCore::FETurbulence::setBaseFrequencyX):
+        (WebCore::FETurbulence::setSeed):
+        (WebCore::FETurbulence::setNumOctaves):
+        (WebCore::FETurbulence::setStitchTiles):
+        (WebCore::operator<<):
+        * platform/graphics/filters/FETurbulence.h:
+        * svg/SVGFETurbulenceElement.cpp:
+        (WebCore::SVGFETurbulenceElement::setFilterEffectAttribute):
+        (WebCore::SVGFETurbulenceElement::svgAttributeChanged):
+        (WebCore::SVGFETurbulenceElement::build):
+        * svg/SVGFETurbulenceElement.h:
+
 2011-02-28  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp

@@ -50 +50 @@
 static const int s_randR = 2836; // m % a
 
-FETurbulence::FETurbulence(Filter* filter, TurbulanceType type, float baseFrequencyX, float baseFrequencyY, int numOctaves, float seed, bool stitchTiles)
+FETurbulence::FETurbulence(Filter* filter, TurbulenceType type, float baseFrequencyX, float baseFrequencyY, int numOctaves, float seed, bool stitchTiles)
     : FilterEffect(filter)
     , m_type(type)
@@ -61 +61 @@
 }
 
-PassRefPtr<FETurbulence> FETurbulence::create(Filter* filter, TurbulanceType type, float baseFrequencyX, float baseFrequencyY, int numOctaves, float seed, bool stitchTiles)
+PassRefPtr<FETurbulence> FETurbulence::create(Filter* filter, TurbulenceType type, float baseFrequencyX, float baseFrequencyY, int numOctaves, float seed, bool stitchTiles)
 {
     return adoptRef(new FETurbulence(filter, type, baseFrequencyX, baseFrequencyY, numOctaves, seed, stitchTiles));
 }
 
-TurbulanceType FETurbulence::type() const
+TurbulenceType FETurbulence::type() const
 {
     return m_type;
 }
 
-void FETurbulence::setType(TurbulanceType type)
-{
+bool FETurbulence::setType(TurbulenceType type)
+{
+    if (m_type == type)
+        return false;
     m_type = type;
+    return true;
 }
 
@@ -81 +84 @@
 }
 
-void FETurbulence::setBaseFrequencyY(float baseFrequencyY)
-{
+bool FETurbulence::setBaseFrequencyY(float baseFrequencyY)
+{
+    if (m_baseFrequencyY == baseFrequencyY)
+        return false;
     m_baseFrequencyY = baseFrequencyY;
+    return true;
 }
 
@@ -91 +97 @@
 }
 
-void FETurbulence::setBaseFrequencyX(float baseFrequencyX)
-{
-       m_baseFrequencyX = baseFrequencyX;
+bool FETurbulence::setBaseFrequencyX(float baseFrequencyX)
+{
+    if (m_baseFrequencyX == baseFrequencyX)
+        return false;
+    m_baseFrequencyX = baseFrequencyX;
+    return true;
 }
 
@@ -101 +110 @@
 }
 
-void FETurbulence::setSeed(float seed)
-{
+bool FETurbulence::setSeed(float seed)
+{
+    if (m_seed == seed)
+        return false;
     m_seed = seed;
+    return true;
 }
 
@@ -111 +123 @@
 }
 
-void FETurbulence::setNumOctaves(bool numOctaves)
-{
+bool FETurbulence::setNumOctaves(int numOctaves)
+{
+    if (m_numOctaves == numOctaves)
+        return false;
     m_numOctaves = numOctaves;
+    return true;
 }
 
@@ -121 +136 @@
 }
 
-void FETurbulence::setStitchTiles(bool stitch)
-{
+bool FETurbulence::setStitchTiles(bool stitch)
+{
+    if (m_stitchTiles == stitch)
+        return false;
     m_stitchTiles = stitch;
+    return true;
 }
 
@@ -354 +372 @@
 }
 
-static TextStream& operator<<(TextStream& ts, const TurbulanceType& type)
+static TextStream& operator<<(TextStream& ts, const TurbulenceType& type)
 {
     switch (type) {

trunk/Source/WebCore/platform/graphics/filters/FETurbulence.h

@@ -31 +31 @@
 namespace WebCore {
 
-enum TurbulanceType {
+enum TurbulenceType {
     FETURBULENCE_TYPE_UNKNOWN = 0,
     FETURBULENCE_TYPE_FRACTALNOISE = 1,
@@ -39 +39 @@
 class FETurbulence : public FilterEffect {
 public:
-    static PassRefPtr<FETurbulence> create(Filter*, TurbulanceType, float, float, int, float, bool);
+    static PassRefPtr<FETurbulence> create(Filter*, TurbulenceType, float, float, int, float, bool);
 
-    TurbulanceType type() const;
-    void setType(TurbulanceType);
+    TurbulenceType type() const;
+    bool setType(TurbulenceType);
 
     float baseFrequencyY() const;
-    void setBaseFrequencyY(float);
+    bool setBaseFrequencyY(float);
 
     float baseFrequencyX() const;
-    void setBaseFrequencyX(float);
+    bool setBaseFrequencyX(float);
 
     float seed() const;
-    void setSeed(float);
+    bool setSeed(float);
 
     int numOctaves() const;
-    void setNumOctaves(bool);
+    bool setNumOctaves(int);
 
     bool stitchTiles() const;
-    void setStitchTiles(bool);
+    bool setStitchTiles(bool);
 
     virtual void apply();
@@ -85 +85 @@
     };
 
-    FETurbulence(Filter*, TurbulanceType, float, float, int, float, bool);
+    FETurbulence(Filter*, TurbulenceType, float, float, int, float, bool);
 
     inline void initPaint(PaintingData&);
@@ -91 +91 @@
     unsigned char calculateTurbulenceValueForPoint(PaintingData&, const FloatPoint&);
 
-    TurbulanceType m_type;
+    TurbulenceType m_type;
     float m_baseFrequencyX;
     float m_baseFrequencyY;

trunk/Source/WebCore/svg/SVGFETurbulenceElement.cpp

@@ -90 +90 @@
 }
 
+bool SVGFETurbulenceElement::setFilterEffectAttribute(FilterEffect* effect, const QualifiedName& attrName)
+{
+    FETurbulence* turbulence = static_cast<FETurbulence*>(effect);
+    if (attrName == SVGNames::typeAttr)
+        return turbulence->setType(static_cast<TurbulenceType>(type()));
+    if (attrName == SVGNames::stitchTilesAttr)
+        return turbulence->setStitchTiles(stitchTiles());
+    if (attrName == SVGNames::baseFrequencyAttr)
+        return (turbulence->setBaseFrequencyX(baseFrequencyX()) || turbulence->setBaseFrequencyY(baseFrequencyY()));
+    if (attrName == SVGNames::seedAttr)
+        return turbulence->setSeed(seed());
+    if (attrName == SVGNames::numOctavesAttr)
+       return turbulence->setNumOctaves(numOctaves());
+
+    ASSERT_NOT_REACHED();
+    return false;
+}
+
 void SVGFETurbulenceElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName);
-    
+
     if (attrName == SVGNames::baseFrequencyAttr
         || attrName == SVGNames::numOctavesAttr
@@ -99 +117 @@
         || attrName == SVGNames::stitchTilesAttr
         || attrName == SVGNames::typeAttr)
-        invalidate();
+        primitiveAttributeChanged(attrName);
 }
 
@@ -152 +170 @@
         return 0;
 
-    return FETurbulence::create(filter, static_cast<TurbulanceType>(type()), baseFrequencyX(), 
+    return FETurbulence::create(filter, static_cast<TurbulenceType>(type()), baseFrequencyX(), 
                 baseFrequencyY(), numOctaves(), seed(), stitchTiles() == SVG_STITCHTYPE_STITCH);
 }

trunk/Source/WebCore/svg/SVGFETurbulenceElement.h

@@ -45 +45 @@
 
     virtual void parseMappedAttribute(Attribute*);
+    virtual bool setFilterEffectAttribute(FilterEffect*, const QualifiedName& attrName);
     virtual void svgAttributeChanged(const QualifiedName&);
     virtual void synchronizeProperty(const QualifiedName&);