diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp index baefeb73ce4..61012f36a54 100644 --- a/layout/generic/nsFrameSetFrame.cpp +++ b/layout/generic/nsFrameSetFrame.cpp @@ -749,7 +749,9 @@ nsHTMLFramesetFrame::ReflowPlaceChild(nsIFrame* aChild, nsIntPoint* aCellIndex) { // reflow the child - nsHTMLReflowState reflowState(aPresContext, aReflowState, aChild, aSize); + nsHTMLReflowState reflowState(aPresContext, aReflowState, aChild, aSize); + reflowState.SetComputedWidth(std::max(0, aSize.width - reflowState.mComputedBorderPadding.LeftRight())); + reflowState.SetComputedHeight(std::max(0, aSize.height - reflowState.mComputedBorderPadding.TopBottom())); nsHTMLReflowMetrics metrics; metrics.width = aSize.width; metrics.height= aSize.height; diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp index 70e60bba066..f801755f3e8 100644 --- a/layout/generic/nsSubDocumentFrame.cpp +++ b/layout/generic/nsSubDocumentFrame.cpp @@ -677,28 +677,19 @@ nsSubDocumentFrame::Reflow(nsPresContext* aPresContext, NS_ASSERTION(mContent->GetPrimaryFrame() == this, "Shouldn't happen"); + // XUL