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

Removed compact margin hackery

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@25646 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com 1999-03-31 04:10:51 +00:00
parent ef9d0f734e
commit 2ef973d34d
4 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/layout/generic/nsBlockReflowContext.cpp
View File

@ -44,7 +44,6 @@ nsBlockReflowContext::nsBlockReflowContext(nsIPresContext& aPresContext,
mOuterReflowState(aParentRS),
mMetrics(aComputeMaxElementSize ? &mMaxElementSize : nsnull)
{
mCompactMarginWidth = 0;
mStyleSpacing = nsnull;
#ifdef DEBUG
mIndent = 0;
@ -159,7 +158,6 @@ nsBlockReflowContext::ReflowBlock(nsIFrame* aFrame,
availSpace, reason);
aComputedOffsets = reflowState.computedOffsets;
reflowState.lineLayout = nsnull;
reflowState.mCompactMarginWidth = mCompactMarginWidth;
if (!aIsAdjacentWithTop) {
reflowState.isTopOfPage = PR_FALSE; // make sure this is cleared
}
@ -410,7 +408,7 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
// Collapse the bottom margin with the top margin that was already
// applied.
nscoord newBottomMargin = MaxMargin(collapsedBottomMargin, mTopMargin);
*aBottomMarginResult = collapsedBottomMargin;
*aBottomMarginResult = newBottomMargin;
}
// Empty blocks do not have anything special done to them and they

5
mozilla/layout/generic/nsBlockReflowContext.h
View File

@ -38,10 +38,6 @@ public:
PRBool aComputeMaxElementSize);
~nsBlockReflowContext() { }
void SetCompactMarginWidth(nscoord aCompactMarginWidth) {
mCompactMarginWidth = aCompactMarginWidth;
}
void SetNextRCFrame(nsIFrame* aNextRCFrame) {
mNextRCFrame = aNextRCFrame;
}
@ -107,7 +103,6 @@ protected:
const nsHTMLReflowState& mOuterReflowState;
nsIFrame* mFrame;
nscoord mCompactMarginWidth;
nsRect mSpace;
nsIFrame* mNextRCFrame;

4
mozilla/layout/html/base/src/nsBlockReflowContext.cpp
View File

@ -44,7 +44,6 @@ nsBlockReflowContext::nsBlockReflowContext(nsIPresContext& aPresContext,
mOuterReflowState(aParentRS),
mMetrics(aComputeMaxElementSize ? &mMaxElementSize : nsnull)
{
mCompactMarginWidth = 0;
mStyleSpacing = nsnull;
#ifdef DEBUG
mIndent = 0;
@ -159,7 +158,6 @@ nsBlockReflowContext::ReflowBlock(nsIFrame* aFrame,
availSpace, reason);
aComputedOffsets = reflowState.computedOffsets;
reflowState.lineLayout = nsnull;
reflowState.mCompactMarginWidth = mCompactMarginWidth;
if (!aIsAdjacentWithTop) {
reflowState.isTopOfPage = PR_FALSE; // make sure this is cleared
}
@ -410,7 +408,7 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
// Collapse the bottom margin with the top margin that was already
// applied.
nscoord newBottomMargin = MaxMargin(collapsedBottomMargin, mTopMargin);
*aBottomMarginResult = collapsedBottomMargin;
*aBottomMarginResult = newBottomMargin;
}
// Empty blocks do not have anything special done to them and they

5
mozilla/layout/html/base/src/nsBlockReflowContext.h
View File

@ -38,10 +38,6 @@ public:
PRBool aComputeMaxElementSize);
~nsBlockReflowContext() { }
void SetCompactMarginWidth(nscoord aCompactMarginWidth) {
mCompactMarginWidth = aCompactMarginWidth;
}
void SetNextRCFrame(nsIFrame* aNextRCFrame) {
mNextRCFrame = aNextRCFrame;
}
@ -107,7 +103,6 @@ protected:
const nsHTMLReflowState& mOuterReflowState;
nsIFrame* mFrame;
nscoord mCompactMarginWidth;
nsRect mSpace;
nsIFrame* mNextRCFrame;