[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 1358a3dc6e9abeccd7a41204eab9ce2233c5f4b8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 1 18:24:28 2003 +0000

    	Fix for 3244157, giantrobot.com misrenders with a lot of
    	vertical space.  Overflow heights were being miscomputed for
    	overflow:auto blocks.
    
            Reviewed by gramps
    
            * khtml/rendering/render_block.cpp:
            * khtml/rendering/render_block.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4245 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8998b11..a91b87c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-04-30  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3244157, giantrobot.com misrenders with a lot of
+	vertical space.  Overflow heights were being miscomputed for
+	overflow:auto blocks.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_block.cpp:
+        * khtml/rendering/render_block.h:
+
+2003-04-30  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3210725, invalid n/a selector treated as valid.  This
 	fix also makes the CSS1 test on the test suite for forward-compatible
 	parsing completely pass (yay!), which was an issue on
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8998b11..a91b87c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-04-30  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3244157, giantrobot.com misrenders with a lot of
+	vertical space.  Overflow heights were being miscomputed for
+	overflow:auto blocks.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_block.cpp:
+        * khtml/rendering/render_block.h:
+
+2003-04-30  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3210725, invalid n/a selector treated as valid.  This
 	fix also makes the CSS1 test on the test suite for forward-compatible
 	parsing completely pass (yay!), which was an issue on
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 84279cb..b1b48e0 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -495,7 +495,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
         // blocks that have overflowed content.
         // Check for an overhanging float first.
         // FIXME: This needs to look at the last flow, not the last child.
-        if (lastChild() && lastChild()->hasOverhangingFloats() ) {
+        if (lastChild() && lastChild()->hasOverhangingFloats()) {
             KHTMLAssert(lastChild()->isRenderBlock());
             m_height = lastChild()->yPos() + static_cast<RenderBlock*>(lastChild())->floatBottom();
             m_height += borderBottom() + paddingBottom();
@@ -945,16 +945,14 @@ void RenderBlock::layoutBlockChildren( bool relayoutChildren )
         child->setPos(chPos, child->yPos());
 
         m_height += child->height();
-        if (m_overflowHeight < m_height) {
-            int overflowDelta = child->overflowHeight() - child->height();
-            if (m_height + overflowDelta > m_overflowHeight)
-                m_overflowHeight = m_height + overflowDelta;
-        }
+        int overflowDelta = child->effectiveHeight() - child->height();
+        if (m_height + overflowDelta > m_overflowHeight)
+            m_overflowHeight = m_height + overflowDelta;
 
         if (child->isRenderBlock())
             prevFlow = static_cast<RenderBlock*>(child); 
 
-        if ( child->hasOverhangingFloats() && !child->style()->hidesOverflow()) {
+        if (child->hasOverhangingFloats() && !child->style()->hidesOverflow()) {
             // need to add the child's floats to our floating objects list, but not in the case where
             // overflow is auto/scroll
             addOverHangingFloats( static_cast<RenderBlock *>(child), -child->xPos(), -child->yPos(), true );

-- 
WebKit Debian packaging