From 104ca7dcc3d7c7fdc36a2eebab7cb3147e71ccdb Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Thu, 15 Dec 2005 23:08:07 +0000 Subject: [PATCH] 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 git-svn-id: svn://10.0.0.236/trunk@186137 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrame.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 4de95a17c6b..003bc8b467e 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -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;