[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 857986beaf99ee87950028eabf5475c098f30b04
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 17 01:51:41 2002 +0000

    	When a clear occurs (thus causing a block to move underneath
    	a float), make sure the block gets a fresh layout, so that it
    	can readjust its contents now that they don't have to flow
    	around the float.
    
            Reviewed by darin
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3095 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 827a643..616aea5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-12-16  David Hyatt  <hyatt at apple.com>
+
+	When a clear occurs (thus causing a block to move underneath
+	a float), make sure the block gets a fresh layout, so that it
+	can readjust its contents now that they don't have to flow
+	around the float.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
 2002-12-16  Richard Williamson   <rjw at apple.com>
 
         Fixed 3128477.  Check KJS::Window before saving js objects.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 827a643..616aea5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-12-16  David Hyatt  <hyatt at apple.com>
+
+	When a clear occurs (thus causing a block to move underneath
+	a float), make sure the block gets a fresh layout, so that it
+	can readjust its contents now that they don't have to flow
+	around the float.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
 2002-12-16  Richard Williamson   <rjw at apple.com>
 
         Fixed 3128477.  Check KJS::Window before saving js objects.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index c578816..d11534a 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -441,7 +441,7 @@ void RenderBox::repaint(bool immediate)
 {
     //kdDebug( 6040 ) << "repaint!" << endl;
     int ow = style() ? style()->outlineWidth() : 0;
-    repaintRectangle(-ow, -ow, m_width+ow*2, m_height+ow*2, immediate);
+    repaintRectangle(-ow, -ow, overflowWidth()+ow*2, overflowHeight()+ow*2, immediate);
 }
 
 void RenderBox::repaintRectangle(int x, int y, int w, int h, bool immediate, bool f)
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 7140877..5be7c5f 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -672,6 +672,12 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
                 m_maxTopPosMargin = oldPosMargin;
                 m_maxTopNegMargin = oldNegMargin;
             }
+            
+            // If our value of clear caused us to be repositioned vertically to be
+            // underneath a float, we have to do another layout to take into account
+            // the extra space we now have available.
+            child->setLayouted(false);
+            child->layout();
         }
         
         // Reset the top margin contributor to false if we encountered

-- 
WebKit Debian packaging