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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 3de55bfc06a31709436f360fe79ab3d6261b073c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 10 00:14:41 2003 +0000

            Reviewed by Dave.
    
    	- fixed Radar 3143013 - hang trying to load spiny.com/software
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::layoutRows): Check for the render root as a loop
    	termination condition, to avoid an infinite loop for an absolute
    	but non-fixed table cell.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3286 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3a0f5c0..34d5a53 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-01-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed Radar 3143013 - hang trying to load spiny.com/software
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layoutRows): Check for the render root as a loop
+	termination condition, to avoid an infinite loop for an absolute
+	but non-fixed table cell.
+
 2003-01-09  David Hyatt  <hyatt at apple.com>
 
 	The "flow-mode" quirk for lists is just that - a quirk, and should
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3a0f5c0..34d5a53 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-01-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed Radar 3143013 - hang trying to load spiny.com/software
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layoutRows): Check for the render root as a loop
+	termination condition, to avoid an infinite loop for an absolute
+	but non-fixed table cell.
+
 2003-01-09  David Hyatt  <hyatt at apple.com>
 
 	The "flow-mode" quirk for lists is just that - a quirk, and should
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index e32ae14..48d4ed7 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1465,7 +1465,7 @@ void RenderTable::layoutRows(int yoff)
     {
         RenderObject* c = containingBlock();
         for ( ; 
-             !c->isBody() && !c->isTableCell() && !c->isPositioned() && !c->isFloating(); 
+	     !c->isRoot() && !c->isBody() && !c->isTableCell() && !c->isPositioned() && !c->isFloating(); 
              c = c->containingBlock()) {
             Length ch = c->style()->height();
             if (ch.isFixed()) {

-- 
WebKit Debian packaging