[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c9786d5ed6d1a0b96c032b8eaab16860d2fdea22
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 13 23:08:38 2010 +0000

    2010-09-13  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            More trivial EOF handling in tree builder
            https://bugs.webkit.org/show_bug.cgi?id=45648
    
            The spec says to treat these modes like the InBodyMode, which is what
            this patch does.  Doing so is indistinguishable from our current
            behavior, which is why we didn't catch this based on tests.
    
            * html/parser/HTMLTreeBuilder.cpp:
            (WebCore::HTMLTreeBuilder::processEndOfFile):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67419 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0707329..c948f05 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-13  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        More trivial EOF handling in tree builder
+        https://bugs.webkit.org/show_bug.cgi?id=45648
+
+        The spec says to treat these modes like the InBodyMode, which is what
+        this patch does.  Doing so is indistinguishable from our current
+        behavior, which is why we didn't catch this based on tests.
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processEndOfFile):
+
 2010-09-13  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/html/parser/HTMLTreeBuilder.cpp b/WebCore/html/parser/HTMLTreeBuilder.cpp
index 2c2a574..f1e3175 100644
--- a/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -2594,7 +2594,9 @@ void HTMLTreeBuilder::processEndOfFile(AtomicHTMLToken& token)
         // Fall through
     case InBodyMode:
     case InCellMode:
-        ASSERT(insertionMode() == InBodyMode || insertionMode() == InCellMode);
+    case InCaptionMode:
+    case InRowMode:
+        ASSERT(insertionMode() == InBodyMode || insertionMode() == InCellMode || insertionMode() == InCaptionMode || insertionMode() == InRowMode);
         notImplemented(); // Emit parse error based on what elements are still open.
         break;
     case AfterBodyMode:
@@ -2653,10 +2655,6 @@ void HTMLTreeBuilder::processEndOfFile(AtomicHTMLToken& token)
         setInsertionMode(m_originalInsertionMode);
         processEndOfFile(token);
         return;
-    case InCaptionMode:
-    case InRowMode:
-        notImplemented();
-        break;
     }
     ASSERT(m_tree.openElements()->top());
     m_tree.openElements()->popAll();

-- 
WebKit Debian packaging