[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/rendering
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2005-10-14 1:36:47
Message-ID: 1129253807.418424.20326.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 470392 by ggarand:

adjust the vertical position of self-collapsing children also if
our block's top can't margin-collapse. 

Cases that seemingly diverged from the behaviour of Gecko in
this matter were due to a bug in static positioning of positioned
objects in this engine.

BUG: 95503



 M  +0 -8      render_block.cpp  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_block.cpp #470391:470392
@@ -988,11 +988,7 @@
         marginInfo.setPosMarginIfLarger(child->maxBottomMargin(true));
         marginInfo.setNegMarginIfLarger(child->maxBottomMargin(false));
 
-#ifdef APPLE_CHANGES
         if (!marginInfo.canCollapseWithTop())
-#else
-        if (!marginInfo.atTopOfBlock())
-#endif
             // We need to make sure that the position of the self-collapsing block
             // is correct, since it could have overflowing content
             // that needs to be positioned correctly (e.g., a block that
@@ -1228,11 +1224,7 @@
 
 void RenderBlock::setCollapsedBottomMargin(const MarginInfo& marginInfo)
 {
-#ifdef APPLE_CHANGES
     if (marginInfo.canCollapseWithBottom() && !marginInfo.canCollapseWithTop()) {
-#else
-    if (marginInfo.canCollapseWithBottom() && !marginInfo.atTopOfBlock()) {
-#endif
         // Update our max pos/neg bottom margins, since we collapsed our bottom margins
         // with our children.
         m_maxBottomPosMargin = kMax((int)m_maxBottomPosMargin, marginInfo.posMargin());
[prev in list] [next in list] [prev in thread] [next in thread]