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

[zimmermann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f3125c7126002222af6cb3f4983b031968b40ea0
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 28 11:09:06 2010 +0000

    2010-07-28  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            SVGMaskElement/SVGForeignObjectElement should not inherit from SVGURIReference
            https://bugs.webkit.org/show_bug.cgi?id=43113
    
            Remove wrong SVGURIReference inheritance for SVGMaskElement/SVGForeignObjectElement. Old copy/paste bug.
    
            * svg/SVGForeignObjectElement.cpp:
            (WebCore::SVGForeignObjectElement::synchronizeProperty):
            * svg/SVGForeignObjectElement.h:
            * svg/SVGMaskElement.cpp:
            (WebCore::SVGMaskElement::SVGMaskElement):
            (WebCore::SVGMaskElement::parseMappedAttribute):
            (WebCore::SVGMaskElement::svgAttributeChanged):
            (WebCore::SVGMaskElement::synchronizeProperty):
            * svg/SVGMaskElement.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64197 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 282b713..9707246 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,25 @@
 
         Reviewed by Dirk Schulze.
 
+        SVGMaskElement/SVGForeignObjectElement should not inherit from SVGURIReference
+        https://bugs.webkit.org/show_bug.cgi?id=43113
+
+        Remove wrong SVGURIReference inheritance for SVGMaskElement/SVGForeignObjectElement. Old copy/paste bug.
+
+        * svg/SVGForeignObjectElement.cpp:
+        (WebCore::SVGForeignObjectElement::synchronizeProperty):
+        * svg/SVGForeignObjectElement.h:
+        * svg/SVGMaskElement.cpp:
+        (WebCore::SVGMaskElement::SVGMaskElement):
+        (WebCore::SVGMaskElement::parseMappedAttribute):
+        (WebCore::SVGMaskElement::svgAttributeChanged):
+        (WebCore::SVGMaskElement::synchronizeProperty):
+        * svg/SVGMaskElement.h:
+
+2010-07-28  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
         WebKit shouldn't ignore resource cycles, but break them as Opera does
         https://bugs.webkit.org/show_bug.cgi?id=43031
 
diff --git a/WebCore/svg/SVGForeignObjectElement.cpp b/WebCore/svg/SVGForeignObjectElement.cpp
index 7ffe1c6..2157c5e 100644
--- a/WebCore/svg/SVGForeignObjectElement.cpp
+++ b/WebCore/svg/SVGForeignObjectElement.cpp
@@ -126,8 +126,6 @@ void SVGForeignObjectElement::synchronizeProperty(const QualifiedName& attrName)
         synchronizeHeight();
     else if (SVGExternalResourcesRequired::isKnownAttribute(attrName))
         synchronizeExternalResourcesRequired();
-    else if (SVGURIReference::isKnownAttribute(attrName))
-        synchronizeHref();
 }
 
 RenderObject* SVGForeignObjectElement::createRenderer(RenderArena* arena, RenderStyle*)
diff --git a/WebCore/svg/SVGForeignObjectElement.h b/WebCore/svg/SVGForeignObjectElement.h
index 86edc08..737addb 100644
--- a/WebCore/svg/SVGForeignObjectElement.h
+++ b/WebCore/svg/SVGForeignObjectElement.h
@@ -33,8 +33,7 @@ namespace WebCore {
     class SVGForeignObjectElement : public SVGStyledTransformableElement,
                                     public SVGTests,
                                     public SVGLangSpace,
-                                    public SVGExternalResourcesRequired,
-                                    public SVGURIReference {
+                                    public SVGExternalResourcesRequired {
     public:
         SVGForeignObjectElement(const QualifiedName&, Document*);
         virtual ~SVGForeignObjectElement();
diff --git a/WebCore/svg/SVGMaskElement.cpp b/WebCore/svg/SVGMaskElement.cpp
index 1376480..5013e5c 100644
--- a/WebCore/svg/SVGMaskElement.cpp
+++ b/WebCore/svg/SVGMaskElement.cpp
@@ -40,7 +40,6 @@ namespace WebCore {
 
 SVGMaskElement::SVGMaskElement(const QualifiedName& tagName, Document* doc)
     : SVGStyledLocatableElement(tagName, doc)
-    , SVGURIReference()
     , SVGTests()
     , SVGLangSpace()
     , SVGExternalResourcesRequired()
@@ -80,8 +79,6 @@ void SVGMaskElement::parseMappedAttribute(Attribute* attr)
     else if (attr->name() == SVGNames::heightAttr)
         setHeightBaseValue(SVGLength(LengthModeHeight, attr->value()));
     else {
-        if (SVGURIReference::parseMappedAttribute(attr))
-            return;
         if (SVGTests::parseMappedAttribute(attr))
             return;
         if (SVGLangSpace::parseMappedAttribute(attr))
@@ -108,7 +105,6 @@ void SVGMaskElement::svgAttributeChanged(const QualifiedName& attrName)
     if (invalidateClients
         || attrName == SVGNames::maskUnitsAttr
         || attrName == SVGNames::maskContentUnitsAttr
-        || SVGURIReference::isKnownAttribute(attrName)
         || SVGTests::isKnownAttribute(attrName)
         || SVGLangSpace::isKnownAttribute(attrName)
         || SVGExternalResourcesRequired::isKnownAttribute(attrName)
@@ -126,7 +122,6 @@ void SVGMaskElement::synchronizeProperty(const QualifiedName& attrName)
         synchronizeX();
         synchronizeY();
         synchronizeExternalResourcesRequired();
-        synchronizeHref();
         return;
     }
 
@@ -140,8 +135,6 @@ void SVGMaskElement::synchronizeProperty(const QualifiedName& attrName)
         synchronizeY();
     else if (SVGExternalResourcesRequired::isKnownAttribute(attrName))
         synchronizeExternalResourcesRequired();
-    else if (SVGURIReference::isKnownAttribute(attrName))
-        synchronizeHref();
 }
 
 void SVGMaskElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
diff --git a/WebCore/svg/SVGMaskElement.h b/WebCore/svg/SVGMaskElement.h
index 467128d..e941667 100644
--- a/WebCore/svg/SVGMaskElement.h
+++ b/WebCore/svg/SVGMaskElement.h
@@ -26,20 +26,19 @@
 #include "SVGLangSpace.h"
 #include "SVGStyledLocatableElement.h"
 #include "SVGTests.h"
-#include "SVGURIReference.h"
 
 namespace WebCore {
 
     class SVGLength;
 
     class SVGMaskElement : public SVGStyledLocatableElement,
-                           public SVGURIReference,
                            public SVGTests,
                            public SVGLangSpace,
                            public SVGExternalResourcesRequired {
     public:
         SVGMaskElement(const QualifiedName&, Document*);
         virtual ~SVGMaskElement();
+
         virtual bool isValid() const { return SVGTests::isValid(); }
 
         FloatRect maskBoundingBox(const FloatRect&) const;
@@ -60,9 +59,6 @@ namespace WebCore {
         DECLARE_ANIMATED_PROPERTY(SVGMaskElement, SVGNames::widthAttr, SVGLength, Width, width)
         DECLARE_ANIMATED_PROPERTY(SVGMaskElement, SVGNames::heightAttr, SVGLength, Height, height)
 
-        // SVGURIReference
-        DECLARE_ANIMATED_PROPERTY(SVGMaskElement, XLinkNames::hrefAttr, String, Href, href)
-
         // SVGExternalResourcesRequired
         DECLARE_ANIMATED_PROPERTY(SVGMaskElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired)
     };

-- 
WebKit Debian packaging