[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 8b01cd270ceaae8813dc01c750aea4a73e198f45
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 17:55:12 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=46996, patch the functions dealing with the bottom of the block to
    be block-flow-aware.
    
    Reviewed by Darin Adler.
    
    * rendering/RenderBlock.cpp:
    (WebCore::RenderBlock::setCollapsedBottomMargin):
    (WebCore::RenderBlock::handleAfterSideOfBlock):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68900 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e6ee9e1..5f708b8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-01  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46996, patch the functions dealing with the bottom of the block to
+        be block-flow-aware.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::setCollapsedBottomMargin):
+        (WebCore::RenderBlock::handleAfterSideOfBlock):
+
 2010-10-01  Pratik Solanki  <psolanki at apple.com>
 
         Reviewed by Geoffrey Garen.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 7827326..d503fe4 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -1689,7 +1689,7 @@ void RenderBlock::setCollapsedBottomMargin(const MarginInfo& marginInfo)
         if (!marginInfo.marginAfterQuirk())
             setMarginAfterQuirk(false);
 
-        if (marginInfo.marginAfterQuirk() && marginBottom() == 0)
+        if (marginInfo.marginAfterQuirk() && marginAfter() == 0)
             // We have no bottom margin and our last child has a quirky margin.
             // We will pick up this quirky margin and pass it through.
             // This deals with the <td><div><p> case.
@@ -1697,7 +1697,7 @@ void RenderBlock::setCollapsedBottomMargin(const MarginInfo& marginInfo)
     }
 }
 
-void RenderBlock::handleAfterSideOfBlock(int top, int bottom, MarginInfo& marginInfo)
+void RenderBlock::handleAfterSideOfBlock(int beforeSide, int afterSide, MarginInfo& marginInfo)
 {
     marginInfo.setAtAfterSideOfBlock(true);
 
@@ -1707,11 +1707,11 @@ void RenderBlock::handleAfterSideOfBlock(int top, int bottom, MarginInfo& margin
         setLogicalHeight(logicalHeight() + marginInfo.margin());
         
     // Now add in our bottom border/padding.
-    setLogicalHeight(logicalHeight() + bottom);
+    setLogicalHeight(logicalHeight() + afterSide);
 
     // Negative margins can cause our height to shrink below our minimal height (border/padding).
     // If this happens, ensure that the computed height is increased to the minimal height.
-    setLogicalHeight(max(logicalHeight(), top + bottom));
+    setLogicalHeight(max(logicalHeight(), beforeSide + afterSide));
 
     // Update our bottom collapsed margin info.
     setCollapsedBottomMargin(marginInfo);

-- 
WebKit Debian packaging