Changeset 14204 in webkit

Timestamp:

May 5, 2006, 7:59:18 AM (19 years ago)

Author:

darin

Message:

LayoutTests:

Reviewed by Darin.

<​http://bugzilla.opendarwin.org/show_bug.cgi?id=8563>

Tests that the name, publicID and systemID are all read correctly
and that the doctype object preserves the case of the
components from the source html:

• fast/doctypes/005-case-preserving.html: Added.
• fast/doctypes/005-case-preserving-expected.txt: Added.

WebCore:

Reviewed by Darin.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=8563

The doctype object in the DOM is now usable by client code
as opposed to always being exposed as nil. Now also ensures that
the 'name' of the component preserves the case of the original html source.
(i.e HtMl -> HtMl not HTML)

• dom/Document.h: Changes comment by docType() to say it may return 0 for html
• html/HTMLDocument.cpp: (WebCore::parseDocTypeDeclaration): (WebCore::HTMLDocument::determineParseMode): Preserves the case of the name component (WebCore::HTMLDocument::doctype):removed
• html/HTMLDocument.h: (WebCore::HTMLDocument::doctype):removed

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (2 diffs)
• LayoutTests/fast/doctypes/005-case-preserving-expected.txt (added)
• LayoutTests/fast/doctypes/005-case-preserving.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.h (modified) (1 diff)
• WebCore/html/HTMLDocument.cpp (modified) (4 diffs)
• WebCore/html/HTMLDocument.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-05-05  Matt Gough  <matt@softchaos.com>
+
+        Reviewed by Darin.
+
+        <http://bugzilla.opendarwin.org/show_bug.cgi?id=8563>
+
+        Tests that the name, publicID and systemID are all read correctly
+        and that the doctype object preserves the case of the
+        components from the source html:
+        * fast/doctypes/005-case-preserving.html: Added.
+        * fast/doctypes/005-case-preserving-expected.txt: Added.
+
 2006-05-04  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 
@@ -465 +477 @@
         that Node is autogenerated.
 
+>>>>>>> .r14170
 2006-04-25  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-05-05  Matt Gough  <matt@softchaos.com>
+
+        Reviewed by Darin.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8563
+
+        The doctype object in the DOM is now usable by client code
+        as opposed to always being exposed as nil. Now also ensures that
+        the 'name' of the component preserves the case of the original html source.
+        (i.e HtMl -> HtMl not HTML)
+
+        * dom/Document.h:
+        Changes comment by docType() to say it may return 0 for html
+        * html/HTMLDocument.cpp:
+        (WebCore::parseDocTypeDeclaration):
+        (WebCore::HTMLDocument::determineParseMode):
+        Preserves the case of the name component
+        (WebCore::HTMLDocument::doctype):removed
+        * html/HTMLDocument.h:
+        (WebCore::HTMLDocument::doctype):removed
+
 2006-05-05  Rob Buis  <buis@kde.org>
 

trunk/WebCore/dom/Document.h

@@ -122 +122 @@
     // DOM methods & attributes for Document
 
-    virtual DocumentType* doctype() const; // returns 0 for HTML documents
+    virtual DocumentType* doctype() const; // May return 0 for HTML documents
     DocumentType* realDocType() const { return m_docType.get(); }
 

trunk/WebCore/html/HTMLDocument.cpp

@@ -245 +245 @@
 static bool parseDocTypeDeclaration(const DeprecatedString& buffer,
                                     int* resultFlags,
+                                    DeprecatedString& name,
                                     DeprecatedString& publicID,
                                     DeprecatedString& systemID)
@@ -280 +281 @@
         return false;
     
+    name = buffer.mid(index, 4);
     index = parseDocTypePart(buffer, index+4);
     bool hasPublic = containsString("public", buffer, index);
@@ -367 +369 @@
     // the letter.
 
-    DeprecatedString systemID, publicID;
+    DeprecatedString name, systemID, publicID;
     int resultFlags = 0;
-    if (parseDocTypeDeclaration(str, &resultFlags, publicID, systemID)) {
+    if (parseDocTypeDeclaration(str, &resultFlags, name, publicID, systemID)) {
         if (resultFlags & PARSEMODE_HAVE_DOCTYPE)
-            setDocType(new DocumentType(this, "HTML", publicID, systemID));
+            setDocType(new DocumentType(this, name, publicID, systemID));
         if (!(resultFlags & PARSEMODE_HAVE_DOCTYPE)) {
             // No doctype found at all.  Default to quirks mode and Html4.
@@ -430 +432 @@
 }
 
-DocumentType *HTMLDocument::doctype() const
-{
-    // According to a comment in dom_doc.cpp, doctype is null for HTML documents.
-    return 0;
-}
-
-}
+}

trunk/WebCore/html/HTMLDocument.h

@@ -75 +75 @@
     }
 
-    virtual DocumentType* doctype() const;
-
     typedef HashMap<StringImpl*, int> NameCountMap;