[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

zimmermann at webkit.org zimmermann at webkit.org
Wed Dec 22 16:12:00 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ad6ff5b52eadb553b5ad04ba3cdf5e6fcaaa97b2
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 16:27:54 2010 +0000

    2010-11-19  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            Don't call invalidateSVGAttributes() from the setFooBaseValue() methods
            https://bugs.webkit.org/show_bug.cgi?id=49807
    
            Covered by existing tests.
    
            * svg/SVGComponentTransferFunctionElement.cpp:
            (WebCore::SVGComponentTransferFunctionElement::parseMappedAttribute): Use setFooBaseValue(newList) instead of fooBaseValue() = newList;
            * svg/SVGFEColorMatrixElement.cpp:
            (WebCore::SVGFEColorMatrixElement::parseMappedAttribute): Ditto.
            * svg/SVGFEConvolveMatrixElement.cpp:
            (WebCore::SVGFEConvolveMatrixElement::parseMappedAttribute): Ditto.
            * svg/SVGGradientElement.cpp:
            (WebCore::SVGGradientElement::parseMappedAttribute): Ditto.
            * svg/SVGPatternElement.cpp:
            (WebCore::SVGPatternElement::parseMappedAttribute): Ditto.
            * svg/SVGStyledTransformableElement.cpp:
            (WebCore::SVGStyledTransformableElement::parseMappedAttribute): Ditto.
            * svg/SVGTextElement.cpp:
            (WebCore::SVGTextElement::parseMappedAttribute): Ditto.
            * svg/SVGTextPositioningElement.cpp:
            (WebCore::SVGTextPositioningElement::parseMappedAttribute): Ditto.
            * svg/properties/SVGAnimatedPropertyMacros.h: Don't call invalidateSVGAttributes() in setFooBaseValue().
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72405 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ef6e4d9..53141ec 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2010-11-19  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Don't call invalidateSVGAttributes() from the setFooBaseValue() methods
+        https://bugs.webkit.org/show_bug.cgi?id=49807
+
+        Covered by existing tests.
+
+        * svg/SVGComponentTransferFunctionElement.cpp:
+        (WebCore::SVGComponentTransferFunctionElement::parseMappedAttribute): Use setFooBaseValue(newList) instead of fooBaseValue() = newList;
+        * svg/SVGFEColorMatrixElement.cpp:
+        (WebCore::SVGFEColorMatrixElement::parseMappedAttribute): Ditto.
+        * svg/SVGFEConvolveMatrixElement.cpp:
+        (WebCore::SVGFEConvolveMatrixElement::parseMappedAttribute): Ditto.
+        * svg/SVGGradientElement.cpp:
+        (WebCore::SVGGradientElement::parseMappedAttribute): Ditto.
+        * svg/SVGPatternElement.cpp:
+        (WebCore::SVGPatternElement::parseMappedAttribute): Ditto.
+        * svg/SVGStyledTransformableElement.cpp:
+        (WebCore::SVGStyledTransformableElement::parseMappedAttribute): Ditto.
+        * svg/SVGTextElement.cpp:
+        (WebCore::SVGTextElement::parseMappedAttribute): Ditto.
+        * svg/SVGTextPositioningElement.cpp:
+        (WebCore::SVGTextPositioningElement::parseMappedAttribute): Ditto.
+        * svg/properties/SVGAnimatedPropertyMacros.h: Don't call invalidateSVGAttributes() in setFooBaseValue().
+
 2010-11-19  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r72399.
diff --git a/WebCore/svg/SVGComponentTransferFunctionElement.cpp b/WebCore/svg/SVGComponentTransferFunctionElement.cpp
index 078b30d..dd7c9e4 100644
--- a/WebCore/svg/SVGComponentTransferFunctionElement.cpp
+++ b/WebCore/svg/SVGComponentTransferFunctionElement.cpp
@@ -57,7 +57,7 @@ void SVGComponentTransferFunctionElement::parseMappedAttribute(Attribute* attr)
         SVGNumberList newList;
         newList.parse(value);
         detachAnimatedTableValuesListWrappers(newList.size());
-        tableValuesBaseValue() = newList;
+        setTableValuesBaseValue(newList);
     } else if (attr->name() == SVGNames::slopeAttr)
         setSlopeBaseValue(value.toFloat());
     else if (attr->name() == SVGNames::interceptAttr)
diff --git a/WebCore/svg/SVGFEColorMatrixElement.cpp b/WebCore/svg/SVGFEColorMatrixElement.cpp
index eed728d..680cce7 100644
--- a/WebCore/svg/SVGFEColorMatrixElement.cpp
+++ b/WebCore/svg/SVGFEColorMatrixElement.cpp
@@ -59,7 +59,7 @@ void SVGFEColorMatrixElement::parseMappedAttribute(Attribute* attr)
         SVGNumberList newList;
         newList.parse(value);
         detachAnimatedValuesListWrappers(newList.size());
-        valuesBaseValue() = newList;
+        setValuesBaseValue(newList);
     } else
         SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(attr);
 }
diff --git a/WebCore/svg/SVGFEConvolveMatrixElement.cpp b/WebCore/svg/SVGFEConvolveMatrixElement.cpp
index 1137543..302e5d4 100644
--- a/WebCore/svg/SVGFEConvolveMatrixElement.cpp
+++ b/WebCore/svg/SVGFEConvolveMatrixElement.cpp
@@ -92,7 +92,7 @@ void SVGFEConvolveMatrixElement::parseMappedAttribute(Attribute* attr)
         SVGNumberList newList;
         newList.parse(value);
         detachAnimatedKernelMatrixListWrappers(newList.size());
-        kernelMatrixBaseValue() = newList;
+        setKernelMatrixBaseValue(newList);
     } else if (attr->name() == SVGNames::divisorAttr)
         setDivisorBaseValue(value.toFloat());
     else if (attr->name() == SVGNames::biasAttr)
diff --git a/WebCore/svg/SVGGradientElement.cpp b/WebCore/svg/SVGGradientElement.cpp
index 337944b..7ec66ce 100644
--- a/WebCore/svg/SVGGradientElement.cpp
+++ b/WebCore/svg/SVGGradientElement.cpp
@@ -57,7 +57,7 @@ void SVGGradientElement::parseMappedAttribute(Attribute* attr)
             newList.clear();
 
         detachAnimatedGradientTransformListWrappers(newList.size());
-        gradientTransformBaseValue() = newList;
+        setGradientTransformBaseValue(newList);
     } else if (attr->name() == SVGNames::spreadMethodAttr) {
         if (attr->value() == "reflect")
             setSpreadMethodBaseValue(SpreadMethodReflect);
diff --git a/WebCore/svg/SVGPatternElement.cpp b/WebCore/svg/SVGPatternElement.cpp
index 229e1db..268bd71 100644
--- a/WebCore/svg/SVGPatternElement.cpp
+++ b/WebCore/svg/SVGPatternElement.cpp
@@ -83,7 +83,7 @@ void SVGPatternElement::parseMappedAttribute(Attribute* attr)
             newList.clear();
 
         detachAnimatedPatternTransformListWrappers(newList.size());
-        patternTransformBaseValue() = newList;
+        setPatternTransformBaseValue(newList);
     } else if (attr->name() == SVGNames::xAttr)
         setXBaseValue(SVGLength(LengthModeWidth, attr->value()));
     else if (attr->name() == SVGNames::yAttr)
diff --git a/WebCore/svg/SVGStyledTransformableElement.cpp b/WebCore/svg/SVGStyledTransformableElement.cpp
index e5cd42b..dec0af9 100644
--- a/WebCore/svg/SVGStyledTransformableElement.cpp
+++ b/WebCore/svg/SVGStyledTransformableElement.cpp
@@ -72,7 +72,7 @@ void SVGStyledTransformableElement::parseMappedAttribute(Attribute* attr)
         if (!SVGTransformable::parseTransformAttribute(newList, attr->value()))
             newList.clear();
         detachAnimatedTransformListWrappers(newList.size());
-        transformBaseValue() = newList;
+        setTransformBaseValue(newList);
     } else 
         SVGStyledLocatableElement::parseMappedAttribute(attr);
 }
diff --git a/WebCore/svg/SVGTextElement.cpp b/WebCore/svg/SVGTextElement.cpp
index bfa36c8..2e80cdd 100644
--- a/WebCore/svg/SVGTextElement.cpp
+++ b/WebCore/svg/SVGTextElement.cpp
@@ -54,7 +54,7 @@ void SVGTextElement::parseMappedAttribute(Attribute* attr)
             newList.clear();
 
         detachAnimatedTransformListWrappers(newList.size());
-        transformBaseValue() = newList;
+        setTransformBaseValue(newList);
     } else
         SVGTextPositioningElement::parseMappedAttribute(attr);
 }
diff --git a/WebCore/svg/SVGTextPositioningElement.cpp b/WebCore/svg/SVGTextPositioningElement.cpp
index dc1f915..bb65262 100644
--- a/WebCore/svg/SVGTextPositioningElement.cpp
+++ b/WebCore/svg/SVGTextPositioningElement.cpp
@@ -43,27 +43,27 @@ void SVGTextPositioningElement::parseMappedAttribute(Attribute* attr)
         SVGLengthList newList;
         newList.parse(attr->value(), LengthModeWidth);
         detachAnimatedXListWrappers(newList.size());
-        xBaseValue() = newList;
+        setXBaseValue(newList);
     } else if (attr->name() == SVGNames::yAttr) {
         SVGLengthList newList;
         newList.parse(attr->value(), LengthModeHeight);
         detachAnimatedYListWrappers(newList.size());
-        yBaseValue() = newList;
+        setYBaseValue(newList);
     } else if (attr->name() == SVGNames::dxAttr) {
         SVGLengthList newList;
         newList.parse(attr->value(), LengthModeWidth);
         detachAnimatedDxListWrappers(newList.size());
-        dxBaseValue() = newList;
+        setDxBaseValue(newList);
     } else if (attr->name() == SVGNames::dyAttr) {
         SVGLengthList newList;
         newList.parse(attr->value(), LengthModeHeight);
         detachAnimatedDyListWrappers(newList.size());
-        dyBaseValue() = newList;
+        setDyBaseValue(newList);
     } else if (attr->name() == SVGNames::rotateAttr) {
         SVGNumberList newList;
         newList.parse(attr->value());
         detachAnimatedRotateListWrappers(newList.size());
-        rotateBaseValue() = newList;
+        setRotateBaseValue(newList);
     } else
         SVGTextContentElement::parseMappedAttribute(attr);
 }
diff --git a/WebCore/svg/properties/SVGAnimatedPropertyMacros.h b/WebCore/svg/properties/SVGAnimatedPropertyMacros.h
index 870d26e..53dbd40 100644
--- a/WebCore/svg/properties/SVGAnimatedPropertyMacros.h
+++ b/WebCore/svg/properties/SVGAnimatedPropertyMacros.h
@@ -111,8 +111,6 @@ PropertyType& LowerProperty##BaseValue() const \
 void set##UpperProperty##BaseValue(const PropertyType& type) \
 { \
     m_##LowerProperty.value = type; \
-    SVGElement* contextElement = GetOwnerElementForType<OwnerType, IsDerivedFromSVGElement<OwnerType>::value>::ownerElement(this); \
-    contextElement->invalidateSVGAttributes(); \
 } \
 \
 void synchronize##UpperProperty() \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list