Reviewed by Darin.

	<rdar://problem/3745808> Seed: WebKit: Table's caption broken

        * khtml/html/htmlparser.cpp:
        (KHTMLParser::insertNode): When a caption appears in an illegal
	place in a table, pop blocks until we hit a place where it's
	allowed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7158 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 79ef684a2276f4d32664e8516e113e9f9f0d910d..f1799da411e06895323dd8fbc08e3c97edc9c838 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-07-29  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+       <rdar://problem/3745808> Seed: WebKit: Table's caption broken
+       
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode): When a caption appears in an illegal
+       place in a table, pop blocks until we hit a place where it's
+       allowed.
+
 === Safari-154 ===
 
 2004-07-29  Darin Adler  <darin@apple.com>

diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 0b1e187f98c6c7fc96ee50777af2889072c9baf7..ff6c5faeb0bc54a369be1e1c2091db2287f3b014 100644 (file)
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -582,12 +582,17 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
         case ID_TFOOT:
         case ID_TBODY:
         case ID_TR:
+       case ID_TD:
             switch(id)
             {
             case ID_TABLE:
                 popBlock(ID_TABLE); // end the table
                 handled = true;      // ...and start a new one
                 break;
+           case ID_CAPTION:
+               popBlock(current->id());
+               handled = true;
+               break;
             case ID_TEXT:
             {
                 TextImpl *t = static_cast<TextImpl *>(n);