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

Wed Dec 22 15:25:32 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit bd0efac2a5b9df72226978d368582133d4c6f82e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 3 03:56:46 2010 +0000

    2010-11-02  James Simonsen  <simonjam at chromium.org>
    
            Reviewed by Adam Barth.
    
            mathml in html sometimes incorrectly parsed
            https://bugs.webkit.org/show_bug.cgi?id=48105
    
            * html5lib/resources/webkit01.dat: Test case for bug.
    2010-11-02  James Simonsen  <simonjam at chromium.org>
    
            Reviewed by Adam Barth.
    
            mathml in html sometimes incorrectly parsed
            https://bugs.webkit.org/show_bug.cgi?id=48105
    
            * html/parser/HTMLTreeBuilder.cpp:
            (WebCore::HTMLTreeBuilder::processEndTag): Fixed to match HTML5 spec.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 31372e3..896d11c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-02  James Simonsen  <simonjam at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        mathml in html sometimes incorrectly parsed
+        https://bugs.webkit.org/show_bug.cgi?id=48105
+
+        * html5lib/resources/webkit01.dat: Test case for bug.
+
 2010-11-02  Dmitry Titov  <dimich at chromium.org>
 
         [Chromium] Unreviewed update of test expectations.
diff --git a/LayoutTests/html5lib/resources/webkit01.dat b/LayoutTests/html5lib/resources/webkit01.dat
index 9869454..f8d73f9 100644
--- a/LayoutTests/html5lib/resources/webkit01.dat
+++ b/LayoutTests/html5lib/resources/webkit01.dat
@@ -572,3 +572,18 @@ console.log("FOO<span>BAR</span>BAZ");
 |     <svg svg>
 |       <svg tfoot>
 |         <svg td>
+
+#data
+<math><mrow><mrow><mn>1</mn></mrow><mi>a</mi></mrow></math>
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mrow>
+|         <math mrow>
+|           <math mn>
+|             "1"
+|         <math mi>
+|           "a"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7739304..4f10a74 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-02  James Simonsen  <simonjam at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        mathml in html sometimes incorrectly parsed
+        https://bugs.webkit.org/show_bug.cgi?id=48105
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processEndTag): Fixed to match HTML5 spec.
+
 2010-11-02  Chris Guillory  <chris.guillory at google.com>
 
         Reviewed by Dmitry Titov.
diff --git a/WebCore/html/parser/HTMLTreeBuilder.cpp b/WebCore/html/parser/HTMLTreeBuilder.cpp
index c385437..6134607 100644
--- a/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -2295,7 +2295,8 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken& token)
             while (1) {
                 if (nodeRecord->element()->hasLocalName(token.name())) {
                     m_tree.openElements()->popUntilPopped(nodeRecord->element());
-                    break;
+                    resetForeignInsertionMode();
+                    return;
                 }
                 nodeRecord = nodeRecord->next();
                 if (nodeRecord->element()->namespaceURI() == xhtmlNamespaceURI)

-- 
WebKit Debian packaging

