Changeset 62536 in webkit

Timestamp:

Jul 6, 2010 1:06:01 AM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

Implement more of InTableMode
​https://bugs.webkit.org/show_bug.cgi?id=41652

By the time we got around to landing this patch, it turns out to be
just a bit of cleanup (the functional changes where landed already.)

• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processCharacter): (WebCore::HTMLTreeBuilder::processEndOfFile):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-06  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Implement more of InTableMode
+        https://bugs.webkit.org/show_bug.cgi?id=41652
+
+        By the time we got around to landing this patch, it turns out to be
+        just a bit of cleanup (the functional changes where landed already.)
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processCharacter):
+        (WebCore::HTMLTreeBuilder::processEndOfFile):
+
 2010-07-06  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -1698 +1698 @@
         // Fall through
     case InBodyMode:
+    case InCaptionMode:
+        ASSERT(insertionMode() == InBodyMode || insertionMode() == InCaptionMode);
+        notImplemented();
+        insertTextNode(token);
+        break;
     case InTableMode:
-    case InCaptionMode:
-        ASSERT(insertionMode() == InBodyMode || insertionMode() == InTableMode || insertionMode() == InCaptionMode);
-        notImplemented();
+        ASSERT(insertionMode() == InTableMode);
+        notImplemented(); // Crazy pending characters.
         insertTextNode(token);
         break;
@@ -1774 +1778 @@
         processToken(token);
         break;
-    case InFramesetMode:
-        ASSERT(insertionMode() == InFramesetMode);
-        if (currentElement() != m_openElements.htmlElement())
-            parseError(token);
-        break;
     case AfterFramesetMode:
     case AfterAfterFramesetMode:
         ASSERT(insertionMode() == AfterFramesetMode || insertionMode() == AfterAfterFramesetMode);
         break;
+    case InFramesetMode:
+    case InTableMode:
     case InSelectInTableMode:
     case InSelectMode:
-        ASSERT(insertionMode() == InSelectMode || insertionMode() == InSelectInTableMode);
+        ASSERT(insertionMode() == InSelectMode || insertionMode() == InSelectInTableMode || insertionMode() == InTableMode || insertionMode() == InFramesetMode);
         if (currentElement() != m_openElements.htmlElement())
             parseError(token);