Bug 1486541 - Turn assertion back into a non-fatal assertion. r=jfkthame
authorEmilio Cobos Álvarez <emilio@crisal.io>
Fri, 12 Jul 2019 22:09:17 +0000
changeset 482675 c87032ced936ed71c09abb309d2a472983bab848
parent 482674 842d2fac084206b7807133480acb7c6354b437b6
child 482676 24bfd549a6f9cf395bef073519dda85a035a8234
push id36286
push usercsabou@mozilla.com
push dateSat, 13 Jul 2019 09:54:01 +0000
treeherdermozilla-central@3e793ca066f2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjfkthame
bugs1486541
milestone70.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 1486541 - Turn assertion back into a non-fatal assertion. r=jfkthame It doesn't seem we're going to work on fixing this in the near term. Differential Revision: https://phabricator.services.mozilla.com/D37902
layout/generic/nsLineLayout.cpp
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -1469,19 +1469,19 @@ bool nsLineLayout::TryToPlaceFloat(nsIFr
   NS_ASSERTION(!(aFloat->IsLetterFrame() && GetFirstLetterStyleOK()),
                "FirstLetterStyle set on line with floating first letter");
   return GetOutermostLineLayout()->AddFloat(aFloat, availableISize);
 }
 
 bool nsLineLayout::NotifyOptionalBreakPosition(nsIFrame* aFrame,
                                                int32_t aOffset, bool aFits,
                                                gfxBreakPriority aPriority) {
-  MOZ_ASSERT(!aFits || !mNeedBackup,
-             "Shouldn't be updating the break position with a break that fits "
-             "after we've already flagged an overrun");
+  NS_ASSERTION(!aFits || !mNeedBackup,
+               "Shouldn't be updating the break position with a break that fits"
+               " after we've already flagged an overrun");
   MOZ_ASSERT(mCurrentSpan, "Should be doing line layout");
   if (mCurrentSpan->mNoWrap) {
     FlushNoWrapFloats();
   }
 
   // Remember the last break position that fits; if there was no break that fit,
   // just remember the first break
   if ((aFits && aPriority >= mLastOptionalBreakPriority) ||