Changeset 34315 in webkit

Timestamp:

Jun 2, 2008 12:51:32 PM (16 years ago)

Author:

jchaffraix@webkit.org

Message:

WebCore:

2008-06-02 Julien Chaffraix <​jchaffraix@webkit.org>

Reviewed by Darin.

Bug 18066: REGRESSION: createAttribute throws NAMESPACE_ERR exception
​https://bugs.webkit.org/show_bug.cgi?id=18066

Test: fast/dom/createAttribute-exception.html

• dom/Document.cpp: (WebCore::Document::createAttributeNS):
• dom/Document.h: Add a bool parameter shouldIgnoreNamespaceChecks to createNamespaceNS() used by createAttribute() to bypass namespace checking.

LayoutTests:

2008-06-02 Julien Chaffraix <​jchaffraix@webkit.org>

Reviewed by Darin.

Bug 18066: REGRESSION: createAttribute throws NAMESPACE_ERR exception
​https://bugs.webkit.org/show_bug.cgi?id=18066

• fast/dom/createAttribute-exception-expected.txt: Added.
• fast/dom/createAttribute-exception.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/createAttribute-exception-expected.txt (added)
• LayoutTests/fast/dom/createAttribute-exception.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (3 diffs)
• WebCore/dom/Document.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-06-02  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Reviewed by Darin.
+
+        Bug 18066: REGRESSION: createAttribute throws NAMESPACE_ERR exception
+        https://bugs.webkit.org/show_bug.cgi?id=18066
+
+        * fast/dom/createAttribute-exception-expected.txt: Added.
+        * fast/dom/createAttribute-exception.html: Added.
+
 2008-06-02  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-06-02  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Reviewed by Darin.
+
+        Bug 18066: REGRESSION: createAttribute throws NAMESPACE_ERR exception
+        https://bugs.webkit.org/show_bug.cgi?id=18066
+
+        Test: fast/dom/createAttribute-exception.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::createAttributeNS):
+        * dom/Document.h: Add a bool parameter shouldIgnoreNamespaceChecks
+        to createNamespaceNS() used by createAttribute() to bypass namespace
+        checking.
+
 2008-06-02  Darin Adler  <darin@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -3609 +3609 @@
 }
 
-PassRefPtr<Attr> Document::createAttributeNS(const String& namespaceURI, const String& qualifiedName, ExceptionCode& ec)
+PassRefPtr<Attr> Document::createAttributeNS(const String& namespaceURI, const String& qualifiedName, ExceptionCode& ec, bool shouldIgnoreNamespaceChecks)
 {
     String prefix, localName;
@@ -3616 +3616 @@
 
     QualifiedName qName(prefix, localName, namespaceURI);
-    if (hasPrefixNamespaceMismatch(qName)) {
+    if (!shouldIgnoreNamespaceChecks && hasPrefixNamespaceMismatch(qName)) {
         ec = NAMESPACE_ERR;
         return 0;
@@ -3622 +3622 @@
 
     // Spec: DOM Level 2 Core: http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-DocCrAttrNS
-    if (qName.localName() == "xmlns" && qName.namespaceURI() != "http://www.w3.org/2000/xmlns/") {
+    if (!shouldIgnoreNamespaceChecks && qName.localName() == "xmlns" && qName.namespaceURI() != "http://www.w3.org/2000/xmlns/") {
         ec = NAMESPACE_ERR;
         return 0;

trunk/WebCore/dom/Document.h

@@ -210 +210 @@
     PassRefPtr<CDATASection> createCDATASection(const String& data, ExceptionCode&);
     PassRefPtr<ProcessingInstruction> createProcessingInstruction(const String& target, const String& data, ExceptionCode&);
-    PassRefPtr<Attr> createAttribute(const String& name, ExceptionCode& ec) { return createAttributeNS(String(), name, ec); }
-    PassRefPtr<Attr> createAttributeNS(const String& namespaceURI, const String& qualifiedName, ExceptionCode&);
+    PassRefPtr<Attr> createAttribute(const String& name, ExceptionCode& ec) { return createAttributeNS(String(), name, ec, true); }
+    PassRefPtr<Attr> createAttributeNS(const String& namespaceURI, const String& qualifiedName, ExceptionCode&, bool shouldIgnoreNamespaceChecks = false);
     PassRefPtr<EntityReference> createEntityReference(const String& name, ExceptionCode&);
     PassRefPtr<Node> importNode(Node* importedNode, bool deep, ExceptionCode&);