From 7938ef27e57f76d0ebc83e581cf3ec6c3099b4b3 Mon Sep 17 00:00:00 2001 From: kipp Date: Thu, 2 Jul 1998 22:55:15 +0000 Subject: [PATCH] Moved initial reflow processing into InitialReflow method (doh) --- layout/css/layout/src/nsCSSInlineFrame.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/layout/css/layout/src/nsCSSInlineFrame.cpp b/layout/css/layout/src/nsCSSInlineFrame.cpp index 5a11ba5fc800..158c02f094c6 100644 --- a/layout/css/layout/src/nsCSSInlineFrame.cpp +++ b/layout/css/layout/src/nsCSSInlineFrame.cpp @@ -248,10 +248,6 @@ nsCSSInlineFrame::InlineReflow(nsCSSLineLayout& aLineLayout, // that needs generating. if (eReflowReason_Initial == aReflowState.reason) { NS_ASSERTION(0 != (NS_FRAME_FIRST_REFLOW & mState), "bad mState"); - nsresult rv = ProcessInitialReflow(aLineLayout.mPresContext); - if (NS_OK != rv) { - return rv; - } } else { NS_ASSERTION(0 == (NS_FRAME_FIRST_REFLOW & mState), "bad mState"); @@ -394,6 +390,11 @@ nsCSSInlineFrame::InitialReflow(nsCSSInlineReflowState& aState) NS_PRECONDITION(nsnull == mNextInFlow, "bad frame-appended-reflow"); NS_PRECONDITION(mLastContentIsComplete == PR_TRUE, "bad state"); + nsresult rv = ProcessInitialReflow(aLineLayout.mPresContext); + if (NS_OK != rv) { + return rv; + } + #if XXX // Create any frames that need creating; note that they should have // been created during FindTextRuns which should have been called