Changeset 31231 for trunk/WebCore/dom/Document.cpp

Timestamp:

03/22/08 02:50:54 (8 months ago)

Author:

eric@webkit.org

Message:

Reviewed by mjs.

Unify handling of NAMESPACE_ERR and fix Acid3 test 25
http://bugs.webkit.org/show_bug.cgi?id=16693

Test: fast/dom/DOMImplementation/createDocumentType-err.html

• dom/DOMImplementation.cpp: (WebCore::DOMImplementation::createDocumentType): (WebCore::DOMImplementation::createDocument):
• dom/DOMImplementation.idl:
• dom/Document.cpp: (WebCore::Document::hasPrefixNamespaceMismatch): (WebCore::Document::createElementNS): (WebCore::Document::parseQualifiedName): (WebCore::Document::createAttributeNS):
• dom/Document.h:
• dom/Element.cpp: (WebCore::Element::setAttributeNS):
• editing/FormatBlockCommand.cpp: (WebCore::FormatBlockCommand::doApply):

Files:

• trunk/WebCore/dom/Document.cpp (modified) (6 diffs)

trunk/WebCore/dom/Document.cpp

@@ -718 +718 @@
 }
 
-static bool hasNamespaceError(const QualifiedName& qName)
-{
-    static const AtomicString xmlnsNamespaceURI = "http://www.w3.org/2000/xmlns/";
-    static const AtomicString xmlns = "xmlns";
-    static const AtomicString xml = "xml";
+bool Document::hasPrefixNamespaceMismatch(const QualifiedName& qName)
+{
+    static const AtomicString xmlnsNamespaceURI("http://www.w3.org/2000/xmlns/");
+    static const AtomicString xmlns("xmlns");
+    static const AtomicString xml("xml");
 
     // These checks are from DOM Core Level 2, createElementNS
     // http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-DocCrElNS
-    if (qName.prefix() == emptyAtom) // createElementNS(null, ":div")
-        return true;
-    if (qName.localName().isEmpty()) // createElementNS(null, ""), createElementNS(null, null), createElementNS()
-        return true;
     if (!qName.prefix().isEmpty() && qName.namespaceURI().isNull()) // createElementNS(null, "html:div")
         return true;
@@ -778 +774 @@
 {
     String prefix, localName;
-    if (!parseQualifiedName(qualifiedName, prefix, localName)) {
-        ec = INVALID_CHARACTER_ERR;
+    if (!parseQualifiedName(qualifiedName, prefix, localName, ec))
         return 0;
-    }
 
     QualifiedName qName(prefix, localName, namespaceURI);
-    if (hasNamespaceError(qName)) {
+    if (hasPrefixNamespaceMismatch(qName)) {
         ec = NAMESPACE_ERR;
         return 0;
@@ -2820 +2814 @@
 }
 
-bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, String& localName)
+bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, String& localName, ExceptionCode& ec)
 {
     unsigned length = qualifiedName.length();
 
-    if (length == 0)
+    if (length == 0) {
+        ec = INVALID_CHARACTER_ERR;
         return false;
+    }
 
     bool nameStart = true;
@@ -2836 +2832 @@
         U16_NEXT(s, i, length, c)
         if (c == ':') {
-            if (sawColon)
+            if (sawColon) {
+                ec = NAMESPACE_ERR;
                 return false; // multiple colons: not allowed
+            }
             nameStart = true;
             sawColon = true;
             colonPos = i - 1;
         } else if (nameStart) {
-            if (!isValidNameStart(c))
+            if (!isValidNameStart(c)) {
+                ec = INVALID_CHARACTER_ERR;
                 return false;
+            }
             nameStart = false;
         } else {
-            if (!isValidNamePart(c))
+            if (!isValidNamePart(c)) {
+                ec = INVALID_CHARACTER_ERR;
                 return false;
+            }
         }
     }
@@ -2856 +2858 @@
     } else {
         prefix = qualifiedName.substring(0, colonPos);
+        if (prefix.isEmpty()) {
+            ec = NAMESPACE_ERR;
+            return false;
+        }
         localName = qualifiedName.substring(colonPos + 1);
+    }
+
+    if (localName.isEmpty()) {
+        ec = NAMESPACE_ERR;
+        return false;
     }
 
@@ -3528 +3539 @@
 {
     String prefix, localName;
-    if (!parseQualifiedName(qualifiedName, prefix, localName)) {
-        ec = INVALID_CHARACTER_ERR;
+    if (!parseQualifiedName(qualifiedName, prefix, localName, ec))
         return 0;
-    }
 
     QualifiedName qName(prefix, localName, namespaceURI);
-    if (hasNamespaceError(qName)) {
+    if (hasPrefixNamespaceMismatch(qName)) {
         ec = NAMESPACE_ERR;
         return 0;