WebCore/ChangeLog

 12010-10-01 David Hyatt <hyatt@apple.com>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 https://bugs.webkit.org/show_bug.cgi?id=46996, patch the functions dealing with the bottom of the block to
 6 be block-flow-aware.
 7
 8 * rendering/RenderBlock.cpp:
 9 (WebCore::RenderBlock::setCollapsedBottomMargin):
 10 (WebCore::RenderBlock::handleAfterSideOfBlock):
 11
1122010-10-01 Pratik Solanki <psolanki@apple.com>
213
314 Reviewed by Geoffrey Garen.
68899

WebCore/rendering/RenderBlock.cpp

@@void RenderBlock::setCollapsedBottomMarg
16891689 if (!marginInfo.marginAfterQuirk())
16901690 setMarginAfterQuirk(false);
16911691
1692  if (marginInfo.marginAfterQuirk() && marginBottom() == 0)
 1692 if (marginInfo.marginAfterQuirk() && marginAfter() == 0)
16931693 // We have no bottom margin and our last child has a quirky margin.
16941694 // We will pick up this quirky margin and pass it through.
16951695 // This deals with the <td><div><p> case.

@@void RenderBlock::setCollapsedBottomMarg
16971697 }
16981698}
16991699
1700 void RenderBlock::handleAfterSideOfBlock(int top, int bottom, MarginInfo& marginInfo)
 1700void RenderBlock::handleAfterSideOfBlock(int beforeSide, int afterSide, MarginInfo& marginInfo)
17011701{
17021702 marginInfo.setAtAfterSideOfBlock(true);
17031703

@@void RenderBlock::handleAfterSideOfBlock
17071707 setLogicalHeight(logicalHeight() + marginInfo.margin());
17081708
17091709 // Now add in our bottom border/padding.
1710  setLogicalHeight(logicalHeight() + bottom);
 1710 setLogicalHeight(logicalHeight() + afterSide);
17111711
17121712 // Negative margins can cause our height to shrink below our minimal height (border/padding).
17131713 // If this happens, ensure that the computed height is increased to the minimal height.
1714  setLogicalHeight(max(logicalHeight(), top + bottom));
 1714 setLogicalHeight(max(logicalHeight(), beforeSide + afterSide));
17151715
17161716 // Update our bottom collapsed margin info.
17171717 setCollapsedBottomMargin(marginInfo);
68842