[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 59a3cc9497e54eff25ddd2cb333585251727ff33
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 21 22:53:31 2003 +0000

    	Fix for 3333557, crash on www.dremedia.com.  markDescendants in RenderBlock
    	was not passing in its argument in the recursive step, so the float wasn't
    	getting properly cleared out of everyone's lists.
    
            Reviewed by darin
    
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4683 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a9b4407..19210ac 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2003-07-21  Dave Hyatt  <hyatt at apple.com>
 
+	Fix for 3333557, crash on www.dremedia.com.  markDescendants in RenderBlock
+	was not passing in its argument in the recursive step, so the float wasn't
+	getting properly cleared out of everyone's lists.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_block.cpp:
+
+2003-07-21  Dave Hyatt  <hyatt at apple.com>
+
 	Fix for 3182596, percentage height tables with cells that specify
 	tiny percentage heights used that height even if it was smaller
 	than the cell's minimum required height.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a9b4407..19210ac 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-07-21  Dave Hyatt  <hyatt at apple.com>
 
+	Fix for 3333557, crash on www.dremedia.com.  markDescendants in RenderBlock
+	was not passing in its argument in the recursive step, so the float wasn't
+	getting properly cleared out of everyone's lists.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_block.cpp:
+
+2003-07-21  Dave Hyatt  <hyatt at apple.com>
+
 	Fix for 3182596, percentage height tables with cells that specify
 	tiny percentage heights used that height even if it was smaller
 	than the cell's minimum required height.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 8b4c697..293fc9d 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1726,7 +1726,7 @@ void RenderBlock::markAllDescendantsWithFloatsForLayout(RenderObject* floatToRem
         for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
             if (isBlockFlow() && !child->isFloatingOrPositioned() &&
                 (floatToRemove ? child->containsFloat(floatToRemove) : child->containsFloats()))
-                child->markAllDescendantsWithFloatsForLayout();
+                child->markAllDescendantsWithFloatsForLayout(floatToRemove);
         }
     }
 }

-- 
WebKit Debian packaging