Bug 762332 - Make the "EnsureTextRun should have set font size inflation" assertion non-fatal for now so it doesn't block fuzzing. r=sjohnson

This commit is contained in:
Mats Palmgren 2013-04-17 22:16:15 +02:00
parent 1c5df35566
commit 6bda3b5219
3 changed files with 5 additions and 2 deletions

View File

@ -433,6 +433,7 @@ 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

View File

@ -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>

View File

@ -7659,8 +7659,8 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
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