[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 111d7b1e956877bd1eb6022a21613632a0849592
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 20:37:13 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=46932
    
    Reviewed by Beth Dakin.
    
    Get fast/blockflow/root-lr-basic.html results to be correct by patching a few more
    height() calls to be logicalHeight().
    
    * rendering/RenderBlock.cpp:
    (WebCore::RenderBlock::collapseMargins):
    (WebCore::RenderBlock::handleAfterSideOfBlock):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68820 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.txt b/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.txt
index b6f335f..e9ee9e0 100644
--- a/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.txt
+++ b/LayoutTests/platform/mac/fast/blockflow/root-lr-basic-expected.txt
@@ -2,4 +2,4 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 104x600
   RenderBlock {HTML} at (0,0) size 104x600 [border: (2px solid #000000)]
-    RenderBody {BODY} at (10,0) size 0x580
+    RenderBody {BODY} at (10,10) size 0x580
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 561342a..b0de4ea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-30  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Beth Dakin.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46932
+        
+        Get fast/blockflow/root-lr-basic.html results to be correct by patching a few more
+        height() calls to be logicalHeight().
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::collapseMargins):
+        (WebCore::RenderBlock::handleAfterSideOfBlock):
+
 2010-09-30  Cris Neckar  <cdn at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 0d235b0..b14cbda 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -1509,7 +1509,7 @@ int RenderBlock::collapseMargins(RenderBox* child, MarginInfo& marginInfo)
     if (marginInfo.quirkContainer() && marginInfo.atBeforeSideOfBlock() && (posTop - negTop))
         marginInfo.setMarginBeforeQuirk(topQuirk);
 
-    int beforeCollapseY = height();
+    int beforeCollapseY = logicalHeight();
     int ypos = beforeCollapseY;
     if (child->isSelfCollapsingBlock()) {
         // This child has no height.  We need to compute our
@@ -1529,20 +1529,20 @@ int RenderBlock::collapseMargins(RenderBox* child, MarginInfo& marginInfo)
             // is correct, since it could have overflowing content
             // that needs to be positioned correctly (e.g., a block that
             // had a specified height of 0 but that actually had subcontent).
-            ypos = height() + collapsedTopPos - collapsedTopNeg;
+            ypos = logicalHeight() + collapsedTopPos - collapsedTopNeg;
     }
     else {
         if (child->style()->marginBeforeCollapse() == MSEPARATE) {
-            setLogicalHeight(height() + marginInfo.margin() + child->marginTop());
-            ypos = height();
+            setLogicalHeight(logicalHeight() + marginInfo.margin() + child->marginTop());
+            ypos = logicalHeight();
         }
         else if (!marginInfo.atBeforeSideOfBlock() ||
             (!marginInfo.canCollapseMarginBeforeWithChildren()
              && (!document()->inQuirksMode() || !marginInfo.quirkContainer() || !marginInfo.marginBeforeQuirk()))) {
             // We're collapsing with a previous sibling's margins and not
             // with the top of the block.
-            setLogicalHeight(height() + max(marginInfo.posMargin(), posTop) - max(marginInfo.negMargin(), negTop));
-            ypos = height();
+            setLogicalHeight(logicalHeight() + max(marginInfo.posMargin(), posTop) - max(marginInfo.negMargin(), negTop));
+            ypos = logicalHeight();
         }
 
         marginInfo.setPosMargin(child->maxMarginAfter(PositiveMargin));
@@ -1558,7 +1558,7 @@ int RenderBlock::collapseMargins(RenderBox* child, MarginInfo& marginInfo)
     if (paginated && ypos > beforeCollapseY) {
         int oldY = ypos;
         ypos = min(ypos, nextPageTop(beforeCollapseY));
-        setLogicalHeight(height() + (ypos - oldY));
+        setLogicalHeight(logicalHeight() + (ypos - oldY));
     }
     return ypos;
 }
@@ -1699,14 +1699,14 @@ void RenderBlock::handleAfterSideOfBlock(int top, int bottom, MarginInfo& margin
     // If we can't collapse with children then go ahead and add in the bottom margin.
     if (!marginInfo.canCollapseWithMarginAfter() && !marginInfo.canCollapseWithMarginBefore()
         && (!document()->inQuirksMode() || !marginInfo.quirkContainer() || !marginInfo.marginAfterQuirk()))
-        setLogicalHeight(height() + marginInfo.margin());
+        setLogicalHeight(logicalHeight() + marginInfo.margin());
         
     // Now add in our bottom border/padding.
-    setLogicalHeight(height() + bottom);
+    setLogicalHeight(logicalHeight() + bottom);
 
     // 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(height(), top + bottom));
+    setLogicalHeight(max(logicalHeight(), top + bottom));
 
     // Update our bottom collapsed margin info.
     setCollapsedBottomMargin(marginInfo);

-- 
WebKit Debian packaging