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

Null out line layout when crossing from box to non-box so we don't reuse an incorrect linelayout object. b=307992 r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@186137 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org 2005-12-15 23:08:07 +00:00
parent 16fb16ad2a
commit 104ca7dcc3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/layout/generic/nsFrame.cpp
View File

@ -4946,6 +4946,10 @@ nsFrame::RefreshSizeCache(nsBoxLayoutState& aState)
childReflowState.reason = reason;
childReflowState.path = path;
// a line layout from outside the box shouldn't be used for inline
// frames inside the box
childReflowState.mLineLayout = nsnull;
// do the nasty.
rv = BoxReflow(aState,
presContext,
@ -5379,6 +5383,10 @@ nsFrame::BoxReflow(nsBoxLayoutState& aState,
reflowState.reason = reason;
reflowState.path = path;
// a line layout from outside the box shouldn't be used for inline
// frames inside the box
reflowState.mLineLayout = nsnull;
// XXX this needs to subtract out the border and padding of mFrame since it is content size
reflowState.mComputedWidth = size.width;
reflowState.mComputedHeight = size.height;