Changeset 105379 in webkit

Timestamp:

Jan 18, 2012 9:40:22 PM (12 years ago)

Author:

eric@webkit.org

Message:

setAttributeNS should comply with the obscure rules of DOM2, just like createAttributeNS and createElementNS do
​https://bugs.webkit.org/show_bug.cgi?id=76143

Reviewed by Adam Barth.

Source/WebCore:

Test: fast/dom/Element/setAttributeNS-namespace-err.html

• dom/Element.cpp:

(WebCore::Element::setAttributeNS):

LayoutTests:

• fast/dom/Element/script-tests/setAttributeNS-namespace-err.js: Added.

(assert):
(stringForExceptionCode):
(assertEquals):
(sourceify):
(runNSTests):

• fast/dom/Element/setAttributeNS-namespace-err-expected.txt: Added.
• fast/dom/Element/setAttributeNS-namespace-err.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Element/script-tests/setAttributeNS-namespace-err.js (added)
• LayoutTests/fast/dom/Element/setAttributeNS-namespace-err-expected.txt (added)
• LayoutTests/fast/dom/Element/setAttributeNS-namespace-err.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-18  Eric Seidel  <eric@webkit.org>
+
+        setAttributeNS should comply with the obscure rules of DOM2, just like createAttributeNS and createElementNS do
+        https://bugs.webkit.org/show_bug.cgi?id=76143
+
+        Reviewed by Adam Barth.
+
+        * fast/dom/Element/script-tests/setAttributeNS-namespace-err.js: Added.
+        (assert):
+        (stringForExceptionCode):
+        (assertEquals):
+        (sourceify):
+        (runNSTests):
+        * fast/dom/Element/setAttributeNS-namespace-err-expected.txt: Added.
+        * fast/dom/Element/setAttributeNS-namespace-err.html: Added.
+
 2012-01-18  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-18  Eric Seidel  <eric@webkit.org>
+
+        setAttributeNS should comply with the obscure rules of DOM2, just like createAttributeNS and createElementNS do
+        https://bugs.webkit.org/show_bug.cgi?id=76143
+
+        Reviewed by Adam Barth.
+
+        Test: fast/dom/Element/setAttributeNS-namespace-err.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::setAttributeNS):
+
 2012-01-18  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -66 +66 @@
 #include "WebKitMutationObserver.h"
 #include "WebKitAnimationList.h"
+#include "XMLNSNames.h"
 #include "XMLNames.h"
 #include "htmlediting.h"
@@ -1446 +1447 @@
         return;
 
-    if (namespaceURI.isNull() && !prefix.isNull()) {
+    QualifiedName qName(prefix, localName, namespaceURI);
+
+    // Spec: DOM Level 2 Core: http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-ElSetAttrNS
+    if (qName.prefix().isEmpty() && qName.localName() == xmlnsAtom) {
+        if (qName.namespaceURI() != XMLNSNames::xmlnsNamespaceURI) {
+            ec = NAMESPACE_ERR;
+            return;
+        }
+        // Note: The case of an "xmlns" qualified name with a namespace of
+        // xmlnsNamespaceURI is specifically allowed (See
+        // <http://www.w3.org/2000/xmlns/>).
+    } else if (document()->hasPrefixNamespaceMismatch(qName)) {
         ec = NAMESPACE_ERR;
         return;
     }
-
-    QualifiedName qName(prefix, localName, namespaceURI);
 
     if (scriptingPermission == FragmentScriptingNotAllowed && (isEventHandlerAttribute(qName) || isAttributeToRemove(qName, value)))