Changeset 61971 in webkit

Timestamp:

Jun 27, 2010 3:09:17 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-06-27 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Actually insert Doctype elements
​https://bugs.webkit.org/show_bug.cgi?id=41262

This code is pretty much the same as in the old tree builder.

• html/HTMLToken.h: (WebCore::AtomicHTMLToken::publicIdentifier): (WebCore::AtomicHTMLToken::systemIdentifier):
• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::insertDoctype):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLToken.h (modified) (2 diffs)
• html/HTMLTreeBuilder.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-27  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Actually insert Doctype elements
+        https://bugs.webkit.org/show_bug.cgi?id=41262
+
+        This code is pretty much the same as in the old tree builder.
+
+        * html/HTMLToken.h:
+        (WebCore::AtomicHTMLToken::publicIdentifier):
+        (WebCore::AtomicHTMLToken::systemIdentifier):
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::insertDoctype):
+
 2010-06-27  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebCore/html/HTMLToken.h

@@ -362 +362 @@
 
     // FIXME: Distinguish between a missing public identifer and an empty one.
-    const WTF::Vector<UChar>& publicIdentifier() const
+    WTF::Vector<UChar>& publicIdentifier() const
     {
         ASSERT(m_type == HTMLToken::DOCTYPE);
@@ -369 +369 @@
 
     // FIXME: Distinguish between a missing system identifer and an empty one.
-    const WTF::Vector<UChar>& systemIdentifier() const
+    WTF::Vector<UChar>& systemIdentifier() const
     {
         ASSERT(m_type == HTMLToken::DOCTYPE);

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -29 +29 @@
 #include "Comment.h"
 #include "DocumentFragment.h"
+#include "DocumentType.h"
 #include "Element.h"
 #include "Frame.h"
@@ -593 +594 @@
 void HTMLTreeBuilder::insertDoctype(AtomicHTMLToken& token)
 {
-    ASSERT_UNUSED(token, token.type() == HTMLToken::DOCTYPE);
+    ASSERT(token.type() == HTMLToken::DOCTYPE);
+    m_document->addChild(DocumentType::create(m_document, token.name(), String::adopt(token.publicIdentifier()), String::adopt(token.systemIdentifier())));
+    // FIXME: Move quirks mode detection from DocumentType element to here.
+    notImplemented();
+    if (token.forceQuirks())
+        m_document->setParseMode(Document::Compat);
 }