Changeset 31231 for trunk/WebCore/dom/DOMImplementation.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/DOMImplementation.cpp (modified) (4 diffs)

trunk/WebCore/dom/DOMImplementation.cpp

@@ -52 +52 @@
 
 namespace WebCore {
-
-// FIXME: An implementation of this is still waiting for me to understand the distinction between
-// a "malformed" qualified name and one with bad characters in it. For example, is a second colon
-// an illegal character or a malformed qualified name? This will determine both what parameters
-// this function needs to take and exactly what it will do. Should also be exported so that
-// Element can use it too.
-static bool qualifiedNameIsMalformed(const String&)
-{
-    return false;
-}
 
 #if ENABLE(SVG)
@@ -207 +197 @@
     const String& publicId, const String& systemId, ExceptionCode& ec)
 {
-    // Not mentioned in spec: throw NAMESPACE_ERR if no qualifiedName supplied
-    if (qualifiedName.isNull()) {
-        ec = NAMESPACE_ERR;
+    String prefix, localName;
+    if (!Document::parseQualifiedName(qualifiedName, prefix, localName, ec))
         return 0;
-    }
-
-    // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
-    String prefix, localName;
-    if (!Document::parseQualifiedName(qualifiedName, prefix, localName)) {
-        ec = INVALID_CHARACTER_ERR;
-        return 0;
-    }
-
-    // NAMESPACE_ERR: Raised if the qualifiedName is malformed.
-    if (qualifiedNameIsMalformed(qualifiedName)) {
-        ec = NAMESPACE_ERR;
-        return 0;
-    }
-
-    ec = 0;
+
     return new DocumentType(this, 0, qualifiedName, publicId, systemId);
 }
@@ -239 +213 @@
     const String& qualifiedName, DocumentType* doctype, ExceptionCode& ec)
 {
-    if (!qualifiedName.isEmpty()) {
-        // INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an illegal character.
-        String prefix, localName;
-        if (!Document::parseQualifiedName(qualifiedName, prefix, localName)) {
-            ec = INVALID_CHARACTER_ERR;
-            return 0;
-        }
-
-        // NAMESPACE_ERR:
-        // - Raised if the qualifiedName is malformed,
-        // - if the qualifiedName has a prefix and the namespaceURI is null, or
-        // - if the qualifiedName has a prefix that is "xml" and the namespaceURI is different
-        //   from "http://www.w3.org/XML/1998/namespace" [Namespaces].
-        int colonpos = qualifiedName.find(':');    
-        if (qualifiedNameIsMalformed(qualifiedName) ||
-            (colonpos >= 0 && namespaceURI.isNull()) ||
-            (colonpos == 3 && qualifiedName[0] == 'x' && qualifiedName[1] == 'm' && qualifiedName[2] == 'l' &&
-#if ENABLE(SVG)
-             namespaceURI != SVGNames::svgNamespaceURI &&
-#endif
-             namespaceURI != XMLNames::xmlNamespaceURI)) {
-
-            ec = NAMESPACE_ERR;
-            return 0;
-        }
-    }
-    
     // WRONG_DOCUMENT_ERR: Raised if doctype has already been used with a different document or was
     // created from a different implementation.
-    if (doctype && (doctype->document() || doctype->implementation() != this)) {
-        ec = WRONG_DOCUMENT_ERR;
-        return 0;
-    }
+    bool shouldThrowWrongDocErr = false;
+    if (doctype && (doctype->document() || doctype->implementation() != this))
+        shouldThrowWrongDocErr = true;
 
     RefPtr<Document> doc;
@@ -288 +234 @@
         doc->addChild(doctype);
 
-    if (!qualifiedName.isEmpty())
+    if (!qualifiedName.isEmpty()) {
         doc->addChild(doc->createElementNS(namespaceURI, qualifiedName, ec));
-    
-    ec = 0;
+        if (ec != 0)
+            return 0;
+    }
+
+    // Hixie's interpretation of the DOM Core spec suggests we should prefer
+    // other exceptions to WRONG_DOCUMENT_ERR (based on order mentioned in spec)
+    if (shouldThrowWrongDocErr) {
+        ec = WRONG_DOCUMENT_ERR;
+        return 0;
+    }
+
     return doc.release();
 }