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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 9814be06808c8dd7b1c9b9eb05bb2c607fbe1cf8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 4 03:25:47 2002 +0000

    	Fix for 3078227, hanging in table code.  Make sure <form>s
    	don't get wrapped in anonymous rows and cells.
    
            Reviewed by: rjw
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::addChild):
            (RenderTableSection::addChild):
            (RenderTableRow::addChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2920 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ee34805..138c117 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,17 @@
 2002-12-03  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3078227, hanging in table code.  Make sure <form>s
+	don't get wrapped in anonymous rows and cells.
+	
+        Reviewed by: rjw
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addChild):
+        (RenderTableSection::addChild):
+        (RenderTableRow::addChild):
+
+2002-12-03  David Hyatt  <hyatt at apple.com>
+
 	Backing out a file that I did not intend to check in.
 
         * khtml/misc/loader.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ee34805..138c117 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2002-12-03  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3078227, hanging in table code.  Make sure <form>s
+	don't get wrapped in anonymous rows and cells.
+	
+        Reviewed by: rjw
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addChild):
+        (RenderTableSection::addChild):
+        (RenderTableRow::addChild):
+
+2002-12-03  David Hyatt  <hyatt at apple.com>
+
 	Backing out a file that I did not intend to check in.
 
         * khtml/misc/loader.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ee34805..138c117 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2002-12-03  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3078227, hanging in table code.  Make sure <form>s
+	don't get wrapped in anonymous rows and cells.
+	
+        Reviewed by: rjw
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addChild):
+        (RenderTableSection::addChild):
+        (RenderTableRow::addChild):
+
+2002-12-03  David Hyatt  <hyatt at apple.com>
+
 	Backing out a file that I did not intend to check in.
 
         * khtml/misc/loader.cpp:
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 7fe7c82..1291436 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -157,8 +157,13 @@ void RenderTable::addChild(RenderObject *child, RenderObject *beforeChild)
     kdDebug( 6040 ) << renderName() << "(Table)::addChild( " << child->renderName() << ", " <<
                        (beforeChild ? beforeChild->renderName() : "0") << " )" << endl;
 #endif
+    if (child->element() && child->element()->id() == ID_FORM) {
+        RenderContainer::addChild(child,beforeChild);
+        return;
+    }
+            
     RenderObject *o = child;
-
+    
     switch(child->style()->display())
     {
     case TABLE_CAPTION:
@@ -1877,8 +1882,12 @@ void RenderTableSection::addChild(RenderObject *child, RenderObject *beforeChild
 #endif
     RenderObject *row = child;
 
+    if (child->element() && child->element()->id() == ID_FORM) {
+        RenderContainer::addChild(child,beforeChild);
+        return;
+    }
+    
     if ( !child->isTableRow() ) {
-
         if( !beforeChild )
             beforeChild = lastChild();
 
@@ -1969,6 +1978,11 @@ void RenderTableRow::addChild(RenderObject *child, RenderObject *beforeChild)
 #endif
     RenderTableCell *cell;
 
+    if (child->element() && child->element()->id() == ID_FORM) {
+        RenderContainer::addChild(child,beforeChild);
+        return;
+    }
+
     if ( !child->isTableCell() ) {
         if ( !beforeChild )
             beforeChild = lastChild();

-- 
WebKit Debian packaging