Backed out changeset 357b7bb14462 (bug 1083004) for frequent b2g m-9 test failures

This commit is contained in:
Carsten "Tomcat" Book 2014-11-12 11:26:12 +01:00
parent ed5d6b9e18
commit de08411809

View File

@ -64,11 +64,13 @@ nsRubyTextContainerFrame::BeginRTCLineLayout(nsPresContext* aPresContext,
nsBlockReflowState state(aReflowState, aPresContext, this, true, true, nsBlockReflowState state(aReflowState, aPresContext, this, true, true,
false, consumedBSize); false, consumedBSize);
line_iterator* firstLine = nullptr; NS_ASSERTION(!mLines.empty(),
"There should be at least one line in the ruby text container");
line_iterator firstLine = begin_lines();
mLineLayout = mozilla::MakeUnique<nsLineLayout>( mLineLayout = mozilla::MakeUnique<nsLineLayout>(
state.mPresContext, state.mPresContext,
state.mReflowState.mFloatManager, state.mReflowState.mFloatManager,
&state.mReflowState, firstLine); &state.mReflowState, &firstLine);
mLineLayout->Init(&state, state.mMinLineHeight, state.mLineNumber); mLineLayout->Init(&state, state.mMinLineHeight, state.mLineNumber);
mozilla::WritingMode lineWM = aReflowState.mLineLayout->GetWritingMode(); mozilla::WritingMode lineWM = aReflowState.mLineLayout->GetWritingMode();