Bug 762332 - Make the "EnsureTextRun should have set font size inflation" assertion non-fatal for now so it doesn't block fuzzing. r=sjohnson
authorMats Palmgren <matspal@gmail.com>
Wed, 17 Apr 2013 22:16:15 +0200
changeset 129117 9a1a4d67cc93
parent 129116 b064ea1f6af7
child 129118 c42747a5cd4b
push id24559
push userryanvm@gmail.com
push date2013-04-18 14:56 +0000
treeherdermozilla-central@fa5d5fccbc11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssjohnson
bugs762332
milestone23.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 762332 - Make the "EnsureTextRun should have set font size inflation" assertion non-fatal for now so it doesn't block fuzzing. r=sjohnson
layout/generic/crashtests/crashtests.list
layout/generic/crashtests/font-inflation-762332.html
layout/generic/nsTextFrameThebes.cpp
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -428,16 +428,17 @@ load 700031.xhtml
 load 718516.html
 load 724978.xhtml
 load first-letter-638937.html
 load first-letter-638937-2.html
 load 734777.html
 test-pref(layout.css.flexbox.enabled,true) load 737313-1.html
 test-pref(layout.css.flexbox.enabled,true) load 737313-2.html
 test-pref(layout.css.flexbox.enabled,true) load 737313-3.html
+test-pref(font.size.inflation.emPerLine,15) asserts(1-100) load font-inflation-762332.html # bug 762332
 load 762902.html
 load 762764-1.html
 load 786740-1.html
 asserts(12) test-pref(layout.css.flexbox.enabled,true) load 798020-1.html
 test-pref(layout.css.flexbox.enabled,true) load 798235-1.html
 test-pref(layout.css.flexbox.enabled,true) load 799207-1.html
 asserts(12) test-pref(layout.css.flexbox.enabled,true) load 799207-2.html
 test-pref(layout.css.flexbox.enabled,true) load 801268-1.html
new file mode 100644
--- /dev/null
+++ b/layout/generic/crashtests/font-inflation-762332.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<div style="-moz-column-width: 1px; font-family: monospace; width: 2ch;"><div style="position: relative;"><div style="position: absolute;">xxxxxxxxxxxxxx x xxxxxxx x xxxxxxxxxxxxxxxxxx x xxxxxxx x</div></div></div>
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -7654,18 +7654,18 @@ nsTextFrame::ReflowText(nsLineLayout& aL
     // the uninflated text run.
     ClearTextRun(nullptr, nsTextFrame::eInflated);
   }
 
   gfxSkipCharsIterator iter =
     EnsureTextRun(nsTextFrame::eInflated, ctx,
                   lineContainer, aLineLayout.GetLine(), &flowEndInTextRun);
 
-  NS_ABORT_IF_FALSE(IsCurrentFontInflation(fontSizeInflation),
-                    "EnsureTextRun should have set font size inflation");
+  NS_ASSERTION(IsCurrentFontInflation(fontSizeInflation),
+               "EnsureTextRun should have set font size inflation");
 
   if (mTextRun && iter.GetOriginalEnd() < offset + length) {
     // The textrun does not map enough text for this frame. This can happen
     // when the textrun was ended in the middle of a text node because a
     // preformatted newline was encountered, and prev-in-flow frames have
     // consumed all the text of the textrun. We need a new textrun.
     ClearTextRuns();
     iter = EnsureTextRun(nsTextFrame::eInflated, ctx,