[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 e0c825d386d732768c10e8d2502fd261c131e81e
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 30 21:44:29 2003 +0000

    	Fix for the Adam Rice float/padding test on diveintomark's list
    	of bugs.  We weren't adding in the parent's border/padding in
    	one case in the clearFloats function, which resulted in the
    	float being incorrectly positioned.
    
            Reviewed by darin
    
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4220 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5d7c1be..ad8b6bd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-04-29  David Hyatt  <hyatt at apple.com>
 
+	Fix for the Adam Rice float/padding test on diveintomark's list
+	of bugs.  We weren't adding in the parent's border/padding in
+	one case in the clearFloats function, which resulted in the
+	float being incorrectly positioned.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_block.cpp:
+
+2003-04-29  David Hyatt  <hyatt at apple.com>
+
 	This patch fixes the following bugs:
 
 	(1) 3186174 - padding-left improperly applied to list items.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5d7c1be..ad8b6bd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-04-29  David Hyatt  <hyatt at apple.com>
 
+	Fix for the Adam Rice float/padding test on diveintomark's list
+	of bugs.  We weren't adding in the parent's border/padding in
+	one case in the clearFloats function, which resulted in the
+	float being incorrectly positioned.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_block.cpp:
+
+2003-04-29  David Hyatt  <hyatt at apple.com>
+
 	This patch fixes the following bugs:
 
 	(1) 3186174 - padding-left improperly applied to list items.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 56a9f3e..84279cb 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1615,18 +1615,18 @@ RenderBlock::clearFloats()
     }
 
     int offset = m_y;
+    if (parentHasFloats)
+        addOverHangingFloats( static_cast<RenderBlock *>( parent() ),
+                              parent()->borderLeft() + parent()->paddingLeft(), offset, false );
 
-    if ( parentHasFloats ) {
-        addOverHangingFloats( static_cast<RenderBlock *>( parent() ), parent()->borderLeft() + parent()->paddingLeft() , offset, false );
-    }
-
-    if(prev ) {
+    int xoffset = 0;
+    if (prev) {
         if(prev->isTableCell()) return;
-
         offset -= prev->yPos();
     } else {
         prev = parent();
         if(!prev) return;
+        xoffset += prev->borderLeft() + prev->paddingLeft();
     }
     //kdDebug() << "RenderBlock::clearFloats found previous "<< (void *)this << " prev=" << (void *)prev<< endl;
 
@@ -1638,7 +1638,7 @@ RenderBlock::clearFloats()
         return; // these elements don't allow floats from previous blocks to intrude into their space.
 
     if(flow->floatBottom() > offset)
-        addOverHangingFloats( flow, 0, offset );
+        addOverHangingFloats( flow, xoffset, offset );
 }
 
 void RenderBlock::addOverHangingFloats( RenderBlock *flow, int xoff, int offset, bool child )

-- 
WebKit Debian packaging