зеркало из https://github.com/mozilla/gecko-dev.git
Moved initial reflow processing into InitialReflow method (doh)
This commit is contained in:
Родитель
c3f1f480a4
Коммит
7938ef27e5
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче