Changeset 62522 in webkit

Timestamp:

Jul 5, 2010 10:38:36 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-07-05 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

ASSERT that we're processing the correct type of token
​https://bugs.webkit.org/show_bug.cgi?id=41647

Making these asserts work required a small (non-observable) tweak to
some old code.

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processDoctypeToken): (WebCore::HTMLTreeBuilder::processStartTag): (WebCore::HTMLTreeBuilder::processBodyEndTagForInBody): (WebCore::HTMLTreeBuilder::processAnyOtherEndTagForInBody): (WebCore::HTMLTreeBuilder::processEndTag): (WebCore::HTMLTreeBuilder::processComment): (WebCore::HTMLTreeBuilder::processCharacter): (WebCore::HTMLTreeBuilder::processEndOfFile): (WebCore::HTMLTreeBuilder::processStartTagForInHead):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLTreeBuilder.cpp (modified) (10 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-05  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        ASSERT that we're processing the correct type of token
+        https://bugs.webkit.org/show_bug.cgi?id=41647
+
+        Making these asserts work required a small (non-observable) tweak to
+        some old code.
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processDoctypeToken):
+        (WebCore::HTMLTreeBuilder::processStartTag):
+        (WebCore::HTMLTreeBuilder::processBodyEndTagForInBody):
+        (WebCore::HTMLTreeBuilder::processAnyOtherEndTagForInBody):
+        (WebCore::HTMLTreeBuilder::processEndTag):
+        (WebCore::HTMLTreeBuilder::processComment):
+        (WebCore::HTMLTreeBuilder::processCharacter):
+        (WebCore::HTMLTreeBuilder::processEndOfFile):
+        (WebCore::HTMLTreeBuilder::processStartTagForInHead):
+
 2010-07-05  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -415 +415 @@
 void HTMLTreeBuilder::processDoctypeToken(AtomicHTMLToken& token)
 {
+    ASSERT(token.type() == HTMLToken::DOCTYPE);
     if (insertionMode() == InitialMode) {
         insertDoctype(token);
@@ -458 +459 @@
 void HTMLTreeBuilder::processStartTag(AtomicHTMLToken& token)
 {
+    ASSERT(token.type() == HTMLToken::StartTag);
     switch (insertionMode()) {
     case InitialMode:
@@ -963 +965 @@
 bool HTMLTreeBuilder::processBodyEndTagForInBody(AtomicHTMLToken& token)
 {
+    ASSERT(token.type() == HTMLToken::EndTag);
+    ASSERT(token.name() == bodyTag);
     if (!m_openElements.inScope(bodyTag.localName())) {
         parseError(token);
@@ -974 +978 @@
 void HTMLTreeBuilder::processAnyOtherEndTagForInBody(AtomicHTMLToken& token)
 {
+    ASSERT(token.type() == HTMLToken::EndTag);
     HTMLElementStack::ElementRecord* record = m_openElements.topRecord();
     while (1) {
@@ -1228 +1233 @@
 void HTMLTreeBuilder::processEndTag(AtomicHTMLToken& token)
 {
+    ASSERT(token.type() == HTMLToken::EndTag);
     switch (insertionMode()) {
     case InitialMode:
@@ -1277 +1283 @@
         }
         if (token.name() == htmlTag) {
-            if (processBodyEndTagForInBody(token))
+            AtomicHTMLToken endBody(HTMLToken::EndTag, bodyTag.localName());
+            if (processBodyEndTagForInBody(endBody))
                 processEndTag(token);
             return;
@@ -1520 +1527 @@
 void HTMLTreeBuilder::processComment(AtomicHTMLToken& token)
 {
+    ASSERT(token.type() == HTMLToken::Comment);
     if (m_insertionMode == InitialMode || m_insertionMode == BeforeHTMLMode || m_insertionMode == AfterAfterBodyMode || m_insertionMode == AfterAfterFramesetMode) {
         insertCommentOnDocument(token);
@@ -1533 +1541 @@
 void HTMLTreeBuilder::processCharacter(AtomicHTMLToken& token)
 {
+    ASSERT(token.type() == HTMLToken::Character);
     // FIXME: We need to figure out how to handle each character individually.
     switch (insertionMode()) {
@@ -1599 +1608 @@
 void HTMLTreeBuilder::processEndOfFile(AtomicHTMLToken& token)
 {
+    ASSERT(token.type() == HTMLToken::EndOfFile);
     switch (insertionMode()) {
     case InitialMode:
@@ -1695 +1705 @@
 bool HTMLTreeBuilder::processStartTagForInHead(AtomicHTMLToken& token)
 {
+    ASSERT(token.type() == HTMLToken::StartTag);
     if (token.name() == htmlTag) {
         insertHTMLStartTagInBody(token);