[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 041cf379cc9a2a56da83c8b5c04ffa5d47c7469b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 5 02:30:54 2002 +0000

    	Fix assert on compuserve page.  <form> under <table> should not
    	get a layout() call.
    
            Reviewed by: gramps
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layout):
            * khtml/rendering/render_table.cpp:
            (RenderTable::layout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2939 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7f8c838..36718d0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2002-12-04  David Hyatt  <hyatt at apple.com>
 
+	Fix assert on compuserve page.  <form> under <table> should not
+	get a layout() call.
+	
+        Reviewed by: gramps
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layout):
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layout):
+
+2002-12-04  David Hyatt  <hyatt at apple.com>
+
 	Fix shroudedisles.com table misalignment by removing more\
 	bogus rules from html4.css.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7f8c838..36718d0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2002-12-04  David Hyatt  <hyatt at apple.com>
 
+	Fix assert on compuserve page.  <form> under <table> should not
+	get a layout() call.
+	
+        Reviewed by: gramps
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layout):
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layout):
+
+2002-12-04  David Hyatt  <hyatt at apple.com>
+
 	Fix shroudedisles.com table misalignment by removing more\
 	bogus rules from html4.css.
 
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 5813b7d..38eccc3 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -226,8 +226,8 @@ void RenderFlow::layout()
 
     KHTMLAssert( !layouted() );
     KHTMLAssert( minMaxKnown() );
-    //KHTMLAssert(!isInline());
-
+    KHTMLAssert(!isInline());
+        
     int oldWidth = m_width;
 
     calcWidth();
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 1291436..6aca780 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1386,9 +1386,9 @@ void RenderTable::layout()
     // layout child objects
     RenderObject *child = firstChild();
     while( child ) {
-	if ( child != tCaption && !child->layouted() )
-	    child->layout();
-	child = child->nextSibling();
+        if ( child != tCaption && !child->layouted() && !(child->element() && child->element()->id() == ID_FORM))
+            child->layout();
+        child = child->nextSibling();
     }
 
     // layout rows

-- 
WebKit Debian packaging