Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate speculative-top-margin cruft; use new block reflow context API

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@25295 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com 1999-03-27 01:23:30 +00:00
parent b804af8a30
commit e872d240b1
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/layout/generic/nsInlineFrame.cpp
View File

@ -1209,7 +1209,7 @@ nsInlineFrame::Reflow(nsIPresContext& aPresContext,
aMetrics.height = 0;
aMetrics.ascent = 0;
aMetrics.descent = 0;
aMetrics.mCarriedOutTopMargin = 0;
//XXX aMetrics.mCarriedOutTopMargin = 0;
aMetrics.mCarriedOutBottomMargin = 0;
aMetrics.mCombinedArea.SetRect(0, 0, 0, 0);
if (nsnull != aMetrics.maxElementSize) {
@ -1634,6 +1634,10 @@ nsInlineFrame::ReflowBlockFrame(nsIPresContext& aPresContext,
nscoord availableHeight = aReflowState.availableHeight;
#endif
// XXX_ib write me...
nscoord collapsedTopMargin = 0;
nscoord collapsedBottomMargin = 0;
// Reflow the block frame
nsBlockReflowContext bc(aPresContext, aReflowState,
nsnull != aMetrics.maxElementSize);
@ -1641,10 +1645,7 @@ nsInlineFrame::ReflowBlockFrame(nsIPresContext& aPresContext,
nsRect availSpace(x, y, availableWidth, availableHeight);
PRBool isAdjacentWithTop = PR_FALSE;
nsMargin computedOffsets;
nsresult rv = bc.ReflowBlock(blockFrame, availSpace,
#ifdef SPECULATIVE_TOP_MARGIN
PR_FALSE, 0,
#endif
nsresult rv = bc.ReflowBlock(blockFrame, availSpace, PR_FALSE, 0,
isAdjacentWithTop,
computedOffsets, aStatus);
if (NS_FAILED(rv)) {
@ -1659,10 +1660,7 @@ nsInlineFrame::ReflowBlockFrame(nsIPresContext& aPresContext,
// of it fits)
nsRect bounds;
PRBool anyFit = bc.PlaceBlock(isAdjacentWithTop,
#ifndef SPECULATIVE_TOP_MARGIN
PR_FALSE, 0,
#endif
computedOffsets,
computedOffsets, &collapsedBottomMargin,
bounds, aMetrics.mCombinedArea);
if (!anyFit) {
// None of the block fit
@ -1710,7 +1708,7 @@ nsInlineFrame::ReflowBlockFrame(nsIPresContext& aPresContext,
aMetrics.height = bounds.height;
aMetrics.ascent = bounds.height;
aMetrics.descent = 0;
aMetrics.mCarriedOutTopMargin = bc.GetCollapsedTopMargin();
//XXX aMetrics.mCarriedOutTopMargin = bc.GetCollapsedTopMargin();
aMetrics.mCarriedOutBottomMargin = bc.GetCarriedOutBottomMargin();
if (nsnull != aMetrics.maxElementSize) {
*aMetrics.maxElementSize = bc.GetMaxElementSize();

18
mozilla/layout/html/base/src/nsInlineFrame.cpp
View File

@ -1209,7 +1209,7 @@ nsInlineFrame::Reflow(nsIPresContext& aPresContext,
aMetrics.height = 0;
aMetrics.ascent = 0;
aMetrics.descent = 0;
aMetrics.mCarriedOutTopMargin = 0;
//XXX aMetrics.mCarriedOutTopMargin = 0;
aMetrics.mCarriedOutBottomMargin = 0;
aMetrics.mCombinedArea.SetRect(0, 0, 0, 0);
if (nsnull != aMetrics.maxElementSize) {
@ -1634,6 +1634,10 @@ nsInlineFrame::ReflowBlockFrame(nsIPresContext& aPresContext,
nscoord availableHeight = aReflowState.availableHeight;
#endif
// XXX_ib write me...
nscoord collapsedTopMargin = 0;
nscoord collapsedBottomMargin = 0;
// Reflow the block frame
nsBlockReflowContext bc(aPresContext, aReflowState,
nsnull != aMetrics.maxElementSize);
@ -1641,10 +1645,7 @@ nsInlineFrame::ReflowBlockFrame(nsIPresContext& aPresContext,
nsRect availSpace(x, y, availableWidth, availableHeight);
PRBool isAdjacentWithTop = PR_FALSE;
nsMargin computedOffsets;
nsresult rv = bc.ReflowBlock(blockFrame, availSpace,
#ifdef SPECULATIVE_TOP_MARGIN
PR_FALSE, 0,
#endif
nsresult rv = bc.ReflowBlock(blockFrame, availSpace, PR_FALSE, 0,
isAdjacentWithTop,
computedOffsets, aStatus);
if (NS_FAILED(rv)) {
@ -1659,10 +1660,7 @@ nsInlineFrame::ReflowBlockFrame(nsIPresContext& aPresContext,
// of it fits)
nsRect bounds;
PRBool anyFit = bc.PlaceBlock(isAdjacentWithTop,
#ifndef SPECULATIVE_TOP_MARGIN
PR_FALSE, 0,
#endif
computedOffsets,
computedOffsets, &collapsedBottomMargin,
bounds, aMetrics.mCombinedArea);
if (!anyFit) {
// None of the block fit
@ -1710,7 +1708,7 @@ nsInlineFrame::ReflowBlockFrame(nsIPresContext& aPresContext,
aMetrics.height = bounds.height;
aMetrics.ascent = bounds.height;
aMetrics.descent = 0;
aMetrics.mCarriedOutTopMargin = bc.GetCollapsedTopMargin();
//XXX aMetrics.mCarriedOutTopMargin = bc.GetCollapsedTopMargin();
aMetrics.mCarriedOutBottomMargin = bc.GetCarriedOutBottomMargin();
if (nsnull != aMetrics.maxElementSize) {
*aMetrics.maxElementSize = bc.GetMaxElementSize();