Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 11:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

continuing work on bug 25510

Browse Source 
r=troy
This commit is contained in:
buster%netscape.com 2000-02-16 00:50:06 +00:00
parent 0d6278177c
commit 5665393ec2
6 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
layout/generic/nsBlockFrame.cpp
View File

@ -1529,13 +1529,16 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater);
if (line && (PR_FALSE==line->IsBlock()))
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
if (!isFloater) // punt if isFloater!
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
}
// XXX To Do: we need to check some metrics here to see if anything changed
// if nothing changed, we're done
// otherwise, we should mark the line and the previous line both dirty

17
layout/generic/nsBlockReflowState.cpp
View File

@ -1529,13 +1529,16 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater);
if (line && (PR_FALSE==line->IsBlock()))
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
if (!isFloater) // punt if isFloater!
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
}
// XXX To Do: we need to check some metrics here to see if anything changed
// if nothing changed, we're done
// otherwise, we should mark the line and the previous line both dirty

17
layout/generic/nsBlockReflowState.h
View File

@ -1529,13 +1529,16 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater);
if (line && (PR_FALSE==line->IsBlock()))
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
if (!isFloater) // punt if isFloater!
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
}
// XXX To Do: we need to check some metrics here to see if anything changed
// if nothing changed, we're done
// otherwise, we should mark the line and the previous line both dirty

17
layout/html/base/src/nsBlockFrame.cpp
View File

@ -1529,13 +1529,16 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater);
if (line && (PR_FALSE==line->IsBlock()))
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
if (!isFloater) // punt if isFloater!
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
}
// XXX To Do: we need to check some metrics here to see if anything changed
// if nothing changed, we're done
// otherwise, we should mark the line and the previous line both dirty

17
layout/html/base/src/nsBlockReflowState.cpp
View File

@ -1529,13 +1529,16 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater);
if (line && (PR_FALSE==line->IsBlock()))
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
if (!isFloater) // punt if isFloater!
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
}
// XXX To Do: we need to check some metrics here to see if anything changed
// if nothing changed, we're done
// otherwise, we should mark the line and the previous line both dirty

17
layout/html/base/src/nsBlockReflowState.h
View File

@ -1529,13 +1529,16 @@ nsBlockFrame::Reflow(nsIPresContext* aPresContext,
nsLineBox* line = FindLineFor(state.mNextRCFrame, &prevLine, &isFloater);
if (line && (PR_FALSE==line->IsBlock()))
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
if (!isFloater) // punt if isFloater!
{
nsBlockReflowState incrState(aReflowState, aPresContext, this, aMetrics,
NS_BLOCK_MARGIN_ROOT & mState);
incrState.mNextRCFrame = state.mNextRCFrame;
PRBool keepGoing;
rv = ReflowLine(incrState, line, &keepGoing, PR_TRUE);
state.mNextRCFrame = nsnull;
}
}
// XXX To Do: we need to check some metrics here to see if anything changed
// if nothing changed, we're done
// otherwise, we should mark the line and the previous line both dirty