[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

Sat Sep 26 07:01:50 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 199f6bddb48598c311895b796120d182310010d9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 17 01:33:23 2002 +0000

    	Make <caption> error-handling more robust.
    
    	Specifically, handle <tr> and <td> misplaced inside
    	<caption>s and still make them be part of the table.
    
            * khtml/html/htmlparser.cpp:
            (KHTMLParser::insertNode):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2710 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7157b2d..c068656 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Make <caption> error-handling more robust.
+
+	Specifically, handle <tr> and <td> misplaced inside
+	<caption>s and still make them be part of the table.
+	
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode):
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Implement the collapsing top margin quirk for <body> (the same
 	quirk used for table cells) and make sure it works even when the
 	<body> has margins of its own.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7157b2d..c068656 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Make <caption> error-handling more robust.
+
+	Specifically, handle <tr> and <td> misplaced inside
+	<caption>s and still make them be part of the table.
+	
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode):
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Implement the collapsing top margin quirk for <body> (the same
 	quirk used for table cells) and make sure it works even when the
 	<body> has margins of its own.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7157b2d..c068656 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Make <caption> error-handling more robust.
+
+	Specifically, handle <tr> and <td> misplaced inside
+	<caption>s and still make them be part of the table.
+	
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode):
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Implement the collapsing top margin quirk for <body> (the same
 	quirk used for table cells) and make sure it works even when the
 	<body> has margins of its own.
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 211d1ba..b2c107c 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -580,6 +580,19 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
             break;
         case ID_BODY:
             break;
+        case ID_CAPTION:
+            // Illegal content in a caption. Close the caption and try again.
+            popBlock(ID_CAPTION);
+            switch( id ) {
+            case ID_THEAD:
+            case ID_TFOOT:
+            case ID_TBODY:
+            case ID_TR:
+            case ID_TD:
+            case ID_TH:
+                return insertNode(n, flat);
+            }
+            break;
         case ID__KONQBLOCK:
             switch( id ) {
             case ID_THEAD:

-- 
WebKit Debian packaging

