Bug 1146103 - Use NS_WARNING instead of MOZ_ASSERT for bcoord check i…

…n ruby text container. r=dbaron --HG-- extra : source : b0392b1184e2ab066399e6f38e06212ef1c53c18
shellylin · Mar 31, 2015 · 4d19e08 · 4d19e08
1 parent e42f820
commit 4d19e08
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/layout/generic/nsRubyTextContainerFrame.cpp b/layout/generic/nsRubyTextContainerFrame.cpp
@@ -147,9 +147,12 @@ nsRubyTextContainerFrame::Reflow(nsPresContext* aPresContext,
     maxBCoord = std::max(maxBCoord, blockEnd);
   }
 
-  MOZ_ASSERT(minBCoord <= maxBCoord || mFrames.IsEmpty());
   LogicalSize size(lineWM, mISize, 0);
   if (!mFrames.IsEmpty()) {
+    if (MOZ_UNLIKELY(minBCoord > maxBCoord)) {
+      NS_WARNING("bad block coord");
+      minBCoord = maxBCoord = 0;
+    }
     size.BSize(lineWM) = maxBCoord - minBCoord;
     nscoord containerWidth = size.Width(lineWM);
     for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) {