From b9e5bd7ba986feb7cefc466e16accb9a2e4eaa3c 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 git-svn-id: svn://10.0.0.236/trunk@2606 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsInlineFrame.cpp | 7 ++++++- mozilla/layout/html/base/src/nsInlineFrame.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp index c497cec6cfc..0c273a04003 100644 --- a/mozilla/layout/generic/nsInlineFrame.cpp +++ b/mozilla/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/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp index c497cec6cfc..0c273a04003 100644 --- a/mozilla/layout/html/base/src/nsInlineFrame.cpp +++ b/mozilla/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;