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

Support BR tags in inline frames

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@2747 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp 1998-05-30 17:45:46 +00:00
parent 312f0bab39
commit 5f78a9d123
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,10 +252,11 @@ nsInlineFrame::DidFitChild(nsIPresContext* aPresContext,
* @return true if we successfully reflowed all the mapped children and false
* otherwise, e.g. we pushed children to the next in flow
*/
PRBool nsInlineFrame::ReflowMappedChildrenFrom(nsIPresContext* aPresContext,
nsInlineState& aState,
nsIFrame* aChildFrame,
PRInt32 aChildIndex)
PRBool
nsInlineFrame::ReflowMappedChildrenFrom(nsIPresContext* aPresContext,
nsInlineState& aState,
nsIFrame* aChildFrame,
PRInt32 aChildIndex)
{
#ifdef NS_DEBUG
if (GetVerifyTreeEnable()) {
@ -438,9 +439,14 @@ PRBool nsInlineFrame::PullUpChildren(nsIPresContext* aPresContext,
}
}
// It's time to stop pulling up if our last child wants a break
if (NS_STYLE_CLEAR_NONE != aState.lineLayout->mPendingBreak) {
result = PR_FALSE;
break;
}
// XXX if the frame being pulled up is not appropriate (e.g. a block
// frame) then we should stop! If we have an inline BR tag we should
// stop too!
// frame) then we should stop!
// If there is no room, stop pulling up
if (!CanFitChild(aPresContext, aState, kidFrame)) {
@ -657,6 +663,12 @@ nsInlineFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext,
break;
}
// It's time to stop pulling up if our previous child wants a line
// break
if (NS_STYLE_CLEAR_NONE != aState.lineLayout->mPendingBreak) {
break;
}
// Make sure we still have room left
if (!CanFitChild(aPresContext, aState, nsnull)) {
// Note: return status was set to 0 above...
@ -862,6 +874,7 @@ NS_METHOD nsInlineFrame::Reflow(nsIPresContext* aPresContext,
PRInt32 kidIndex = RecoverState(aPresContext, state, kidFrame);
// Reflow the child into the available space
kidFrame->WillReflow(*aPresContext);
aStatus = ReflowChild(kidFrame, aPresContext, kidSize, kidReflowState);
// Did the child fit?

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

@ -252,10 +252,11 @@ nsInlineFrame::DidFitChild(nsIPresContext* aPresContext,
* @return true if we successfully reflowed all the mapped children and false
* otherwise, e.g. we pushed children to the next in flow
*/
PRBool nsInlineFrame::ReflowMappedChildrenFrom(nsIPresContext* aPresContext,
nsInlineState& aState,
nsIFrame* aChildFrame,
PRInt32 aChildIndex)
PRBool
nsInlineFrame::ReflowMappedChildrenFrom(nsIPresContext* aPresContext,
nsInlineState& aState,
nsIFrame* aChildFrame,
PRInt32 aChildIndex)
{
#ifdef NS_DEBUG
if (GetVerifyTreeEnable()) {
@ -438,9 +439,14 @@ PRBool nsInlineFrame::PullUpChildren(nsIPresContext* aPresContext,
}
}
// It's time to stop pulling up if our last child wants a break
if (NS_STYLE_CLEAR_NONE != aState.lineLayout->mPendingBreak) {
result = PR_FALSE;
break;
}
// XXX if the frame being pulled up is not appropriate (e.g. a block
// frame) then we should stop! If we have an inline BR tag we should
// stop too!
// frame) then we should stop!
// If there is no room, stop pulling up
if (!CanFitChild(aPresContext, aState, kidFrame)) {
@ -657,6 +663,12 @@ nsInlineFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext,
break;
}
// It's time to stop pulling up if our previous child wants a line
// break
if (NS_STYLE_CLEAR_NONE != aState.lineLayout->mPendingBreak) {
break;
}
// Make sure we still have room left
if (!CanFitChild(aPresContext, aState, nsnull)) {
// Note: return status was set to 0 above...
@ -862,6 +874,7 @@ NS_METHOD nsInlineFrame::Reflow(nsIPresContext* aPresContext,
PRInt32 kidIndex = RecoverState(aPresContext, state, kidFrame);
// Reflow the child into the available space
kidFrame->WillReflow(*aPresContext);
aStatus = ReflowChild(kidFrame, aPresContext, kidSize, kidReflowState);
// Did the child fit?