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

A little cleanup. b=229654 r+sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@152538 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org 2004-02-09 05:22:58 +00:00
parent 564b504848
commit 251f155cb8
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/layout/generic/nsBlockFrame.cpp
View File

@ -1170,14 +1170,8 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
// If the parent reflow state is also shrink wrap width, then
// we don't need to do this, because it will reflow us after it
// calculates the final width
PRBool parentIsShrinkWrapWidth = PR_FALSE;
if (aReflowState.parentReflowState) {
if (NS_SHRINKWRAPWIDTH == aReflowState.parentReflowState->mComputedWidth) {
parentIsShrinkWrapWidth = PR_TRUE;
}
}
if (!parentIsShrinkWrapWidth) {
const nsHTMLReflowState *prs = aReflowState.parentReflowState;
if (!prs || NS_SHRINKWRAPWIDTH != prs->mComputedWidth) {
// XXX Is this only used on things that are already NS_BLOCK_SPACE_MGR
// and NS_BLOCK_MARGIN_ROOT?
nsHTMLReflowState reflowState(aReflowState);
@ -1190,8 +1184,8 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
#ifdef DEBUG
nscoord oldDesiredWidth = aMetrics.width;
#endif
nsBlockReflowState state(reflowState, aState.mPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
nsBlockReflowState state(reflowState, aState.mPresContext, this,
aMetrics, NS_BLOCK_MARGIN_ROOT & mState);
ReflowDirtyLines(state);
aState.mY = state.mY;
NS_ASSERTION(oldDesiredWidth == aMetrics.width, "bad desired width");

14
mozilla/layout/html/base/src/nsBlockFrame.cpp
View File

@ -1170,14 +1170,8 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
// If the parent reflow state is also shrink wrap width, then
// we don't need to do this, because it will reflow us after it
// calculates the final width
PRBool parentIsShrinkWrapWidth = PR_FALSE;
if (aReflowState.parentReflowState) {
if (NS_SHRINKWRAPWIDTH == aReflowState.parentReflowState->mComputedWidth) {
parentIsShrinkWrapWidth = PR_TRUE;
}
}
if (!parentIsShrinkWrapWidth) {
const nsHTMLReflowState *prs = aReflowState.parentReflowState;
if (!prs || NS_SHRINKWRAPWIDTH != prs->mComputedWidth) {
// XXX Is this only used on things that are already NS_BLOCK_SPACE_MGR
// and NS_BLOCK_MARGIN_ROOT?
nsHTMLReflowState reflowState(aReflowState);
@ -1190,8 +1184,8 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
#ifdef DEBUG
nscoord oldDesiredWidth = aMetrics.width;
#endif
nsBlockReflowState state(reflowState, aState.mPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
nsBlockReflowState state(reflowState, aState.mPresContext, this,
aMetrics, NS_BLOCK_MARGIN_ROOT & mState);
ReflowDirtyLines(state);
aState.mY = state.mY;
NS_ASSERTION(oldDesiredWidth == aMetrics.width, "bad desired width");