Changeset 79856 in webkit

Timestamp:

Feb 28, 2011 6:03:06 AM (13 years ago)

Author:

reni@webkit.org

Message:

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

Reviewed by Andreas Kling.

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

When the FECompositeElement receives an update message but the given value remains the same we don't need
to relayout the filter.

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

• platform/graphics/filters/FEComposite.cpp: (WebCore::FEComposite::setOperation): (WebCore::FEComposite::setK1): (WebCore::FEComposite::setK2): (WebCore::FEComposite::setK3): (WebCore::FEComposite::setK4):
• platform/graphics/filters/FEComposite.h:
• svg/SVGFECompositeElement.cpp: (WebCore::SVGFECompositeElement::setFilterEffectAttribute): (WebCore::SVGFECompositeElement::svgAttributeChanged):
• svg/SVGFECompositeElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/filters/FEComposite.cpp (modified) (5 diffs)
• platform/graphics/filters/FEComposite.h (modified) (1 diff)
• svg/SVGFECompositeElement.cpp (modified) (1 diff)
• svg/SVGFECompositeElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-28  Renata Hodovan  <reni@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        FECompositeElement changes doesn't require relayout.
+        https://bugs.webkit.org/show_bug.cgi?id=55367
+
+        When the FECompositeElement receives an update message but the given value remains the same we don't need
+        to relayout the filter.
+
+        No new tests are needed because this modification is covered by the dynamic update tests of FEComposite.
+
+        * platform/graphics/filters/FEComposite.cpp:
+        (WebCore::FEComposite::setOperation):
+        (WebCore::FEComposite::setK1):
+        (WebCore::FEComposite::setK2):
+        (WebCore::FEComposite::setK3):
+        (WebCore::FEComposite::setK4):
+        * platform/graphics/filters/FEComposite.h:
+        * svg/SVGFECompositeElement.cpp:
+        (WebCore::SVGFECompositeElement::setFilterEffectAttribute):
+        (WebCore::SVGFECompositeElement::svgAttributeChanged):
+        * svg/SVGFECompositeElement.h:
+
 2011-02-28  Andreas Kling  <kling@webkit.org>
 

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

@@ -56 +56 @@
 }
 
-void FEComposite::setOperation(CompositeOperationType type)
-{
+bool FEComposite::setOperation(CompositeOperationType type)
+{
+    if (m_type == type)
+        return false;
     m_type = type;
+    return true;
 }
 
@@ -66 +69 @@
 }
 
-void FEComposite::setK1(float k1)
-{
+bool FEComposite::setK1(float k1)
+{
+    if (m_k1 == k1)
+        return false;
     m_k1 = k1;
+    return true;
 }
 
@@ -76 +82 @@
 }
 
-void FEComposite::setK2(float k2)
-{
+bool FEComposite::setK2(float k2)
+{
+    if (m_k2 == k2)
+        return false;
     m_k2 = k2;
+    return true;
 }
 
@@ -86 +95 @@
 }
 
-void FEComposite::setK3(float k3)
-{
+bool FEComposite::setK3(float k3)
+{
+    if (m_k3 == k3)
+        return false;
     m_k3 = k3;
+    return true;
 }
 
@@ -96 +108 @@
 }
 
-void FEComposite::setK4(float k4)
-{
+bool FEComposite::setK4(float k4)
+{
+    if (m_k4 == k4)
+        return false;
     m_k4 = k4;
+    return true;
 }
 

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

@@ -46 +46 @@
 
     CompositeOperationType operation() const;
-    void setOperation(CompositeOperationType);
+    bool setOperation(CompositeOperationType);
 
     float k1() const;
-    void setK1(float);
+    bool setK1(float);
 
     float k2() const;
-    void setK2(float);
+    bool setK2(float);
 
     float k3() const;
-    void setK3(float);
+    bool setK3(float);
 
     float k4() const;
-    void setK4(float);
+    bool setK4(float);
 
     virtual void apply();

trunk/Source/WebCore/svg/SVGFECompositeElement.cpp

@@ -83 +83 @@
 }
 
+bool SVGFECompositeElement::setFilterEffectAttribute(FilterEffect* effect, const QualifiedName& attrName)
+{
+    FEComposite* composite = static_cast<FEComposite*>(effect);
+    if (attrName == SVGNames::operatorAttr)
+        return composite->setOperation(static_cast<CompositeOperationType>(_operator()));
+    if (attrName == SVGNames::k1Attr)
+        return composite->setK1(k1());
+    if (attrName == SVGNames::k2Attr)
+        return composite->setK2(k2());
+    if (attrName == SVGNames::k3Attr)
+        return composite->setK3(k3());
+    if (attrName == SVGNames::k4Attr)
+        return composite->setK4(k4());
+
+    ASSERT_NOT_REACHED();
+    return false;
+}
+
+
 void SVGFECompositeElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName);
 
-    if (attrName == SVGNames::inAttr
-        || attrName == SVGNames::in2Attr
-        || attrName == SVGNames::operatorAttr
+    if (attrName == SVGNames::operatorAttr
         || attrName == SVGNames::k1Attr
         || attrName == SVGNames::k2Attr
         || attrName == SVGNames::k3Attr
         || attrName == SVGNames::k4Attr)
+        primitiveAttributeChanged(attrName);
+
+    if (attrName == SVGNames::inAttr
+        || attrName == SVGNames::in2Attr)
         invalidate();
 }

trunk/Source/WebCore/svg/SVGFECompositeElement.h

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