From b3f2588ada6799e47e728cc0f7a8bef79a2fa451 Mon Sep 17 00:00:00 2001 From: kipp Date: Fri, 29 May 1998 02:15:00 +0000 Subject: [PATCH] Pass on initial reflow to ProcessInitialReflow --- layout/generic/nsInlineFrame.cpp | 7 ++++++- layout/html/base/src/nsInlineFrame.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index c497cec6cfc..0c273a04003 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/layout/generic/nsInlineFrame.cpp @@ -801,7 +801,12 @@ NS_METHOD nsInlineFrame::Reflow(nsIPresContext* aPresContext, } #endif -//XXX not now NS_PRECONDITION((aMaxSize.width > 0) && (aMaxSize.height > 0), "unexpected max size"); + if (eReflowReason_Initial == aReflowState.reason) { + nsresult rv = ProcessInitialReflow(aPresContext); + if (NS_OK != rv) { + return rv; + } + } PRBool reflowMappedOK = PR_TRUE; diff --git a/layout/html/base/src/nsInlineFrame.cpp b/layout/html/base/src/nsInlineFrame.cpp index c497cec6cfc..0c273a04003 100644 --- a/layout/html/base/src/nsInlineFrame.cpp +++ b/layout/html/base/src/nsInlineFrame.cpp @@ -801,7 +801,12 @@ NS_METHOD nsInlineFrame::Reflow(nsIPresContext* aPresContext, } #endif -//XXX not now NS_PRECONDITION((aMaxSize.width > 0) && (aMaxSize.height > 0), "unexpected max size"); + if (eReflowReason_Initial == aReflowState.reason) { + nsresult rv = ProcessInitialReflow(aPresContext); + if (NS_OK != rv) { + return rv; + } + } PRBool reflowMappedOK = PR_TRUE;