Bug 1083004 - Fix crashes for tests. r=dbaron
☠☠ backed out by 365a279ba34e ☠ ☠
authorXidorn Quan <quanxunzhen@gmail.com>
Wed, 12 Nov 2014 17:31:31 +1100
changeset 215174 357b7bb1446272ccc80882729c0f454e240be0a5
parent 215173 fda1b680307f7da280b51f1c3a6a4f7042317a7c
child 215175 61fa2ff606b82ff943dde7929a61eb6a1255b118
push id51685
push userxquan@mozilla.com
push dateWed, 12 Nov 2014 06:32:02 +0000
treeherdermozilla-inbound@61fa2ff606b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1083004
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1083004 - Fix crashes for tests. r=dbaron
layout/generic/nsRubyTextContainerFrame.cpp
--- a/layout/generic/nsRubyTextContainerFrame.cpp
+++ b/layout/generic/nsRubyTextContainerFrame.cpp
@@ -59,23 +59,21 @@ nsRubyTextContainerFrame::BeginRTCLineLa
 
   ClearLineCursor();
 
   mISize = 0;
 
   nsBlockReflowState state(aReflowState, aPresContext, this, true, true,
                            false, consumedBSize);
 
-  NS_ASSERTION(!mLines.empty(),
-    "There should be at least one line in the ruby text container");
-  line_iterator firstLine = begin_lines();
+  line_iterator* firstLine = nullptr;
   mLineLayout = mozilla::MakeUnique<nsLineLayout>(
                            state.mPresContext,
                            state.mReflowState.mFloatManager,
-                           &state.mReflowState, &firstLine);
+                           &state.mReflowState, firstLine);
   mLineLayout->Init(&state, state.mMinLineHeight, state.mLineNumber);
 
   mozilla::WritingMode lineWM = aReflowState.mLineLayout->GetWritingMode();
   mozilla::LogicalRect lineRect(state.mContentArea);
   nscoord iStart = lineRect.IStart(lineWM);
   nscoord availISize = lineRect.ISize(lineWM);
   nscoord availBSize = NS_UNCONSTRAINEDSIZE;