[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 84fd3e027c8a3fb5a03674502609d737485e9b61
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 23:19:15 2010 +0000

    Fix typo in previous checkin.
    
    Reviewed by Sam Weinig.
    
    * rendering/RenderBlock.cpp:
    (WebCore::RenderBlock::MarginInfo::MarginInfo):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68605 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8f09145..91e9c0c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-28  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix typo in previous checkin.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::MarginInfo::MarginInfo):
+
 2010-09-28  Nat Duca  <nduca at chromium.org>
 
         Reviewed by James Robinson.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index d2731d7..7fa6e3c 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -105,7 +105,7 @@ RenderBlock::MarginInfo::MarginInfo(RenderBlock* block, int beforeBorderPadding,
         block->style()->marginAfterCollapse() == MDISCARD;
 
     m_posMargin = m_canCollapseMarginBeforeWithChildren ? block->maxTopMargin(true) : 0;
-    m_negMargin = m_canCollapseMarginAfterWithChildren ? block->maxTopMargin(false) : 0;
+    m_negMargin = m_canCollapseMarginBeforeWithChildren ? block->maxTopMargin(false) : 0;
 }
 
 // -------------------------------------------------------------------------------------------------------

-- 
WebKit Debian packaging