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

Wed Dec 22 14:16:12 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit f3cd2bc88610625db4ced3c2cfaf6a3e50859314
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 6 03:04:18 2010 +0000

    2010-10-05  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            Issue in treebuilder parsing related to table tags
            https://bugs.webkit.org/show_bug.cgi?id=47190
    
            Add test coverage.
    
            * html5lib/resources/webkit02.dat:
    2010-10-05  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            Issue in treebuilder parsing related to table tags
            https://bugs.webkit.org/show_bug.cgi?id=47190
    
            Update ASSERT to match the spec and our behavior.
    
            * html/parser/HTMLTreeBuilder.cpp:
            (WebCore::HTMLTreeBuilder::processEndTagForInCell):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69170 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 619a086..15aa797 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-05  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Issue in treebuilder parsing related to table tags
+        https://bugs.webkit.org/show_bug.cgi?id=47190
+
+        Add test coverage.
+
+        * html5lib/resources/webkit02.dat:
+
 2010-10-05  Kenneth Russell  <kbr at google.com>
 
         Unreviewed, test expectations update.
diff --git a/LayoutTests/html5lib/resources/webkit02.dat b/LayoutTests/html5lib/resources/webkit02.dat
index 69fbe5d..468879b 100644
--- a/LayoutTests/html5lib/resources/webkit02.dat
+++ b/LayoutTests/html5lib/resources/webkit02.dat
@@ -40,3 +40,55 @@
 | <html>
 |   <head>
 |   <body>
+
+#data
+<table><td></tbody>A
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "A"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+
+#data
+<table><td></thead>A
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "A"
+
+#data
+<table><td></tfoot>A
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "A"
+
+#data
+<table><thead><td></tbody>A
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <table>
+|       <thead>
+|         <tr>
+|           <td>
+|             "A"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ca04b87..7967095 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-05  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Issue in treebuilder parsing related to table tags
+        https://bugs.webkit.org/show_bug.cgi?id=47190
+
+        Update ASSERT to match the spec and our behavior.
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processEndTagForInCell):
+
 2010-10-05  Victoria Kirst  <vrk at google.com>
 
         Reviewed by James Robinson.
diff --git a/WebCore/html/parser/HTMLTreeBuilder.cpp b/WebCore/html/parser/HTMLTreeBuilder.cpp
index 355dc8d..a2236d5 100644
--- a/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -1849,7 +1849,7 @@ void HTMLTreeBuilder::processEndTagForInCell(AtomicHTMLToken& token)
         || token.name() == trTag
         || isTableBodyContextTag(token.name())) {
         if (!m_tree.openElements()->inTableScope(token.name())) {
-            ASSERT(isParsingFragment());
+            ASSERT(isTableBodyContextTag(token.name()) || isParsingFragment());
             parseError(token);
             return;
         }

-- 
WebKit Debian packaging

