author | Jonathan Kew <jkew@mozilla.com> |
Mon, 06 Oct 2014 15:14:49 +0100 | |
changeset 209012 | af19f500d78b3cfed5d7bcaa2b995b91945492f7 |
parent 209011 | e7884626df18f1744484e0481611d49e5825c64e |
child 209013 | a3250bad7f3c09b2728a6c804ce8c09832d669e2 |
push id | 27600 |
push user | ryanvm@gmail.com |
push date | Mon, 06 Oct 2014 21:11:44 +0000 |
treeherder | mozilla-central@eaa80e4597a2 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jdaggett |
bugs | 1077371 |
milestone | 35.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
|
layout/generic/nsTextFrame.cpp | file | annotate | diff | comparison | revisions | |
layout/mathml/nsMathMLChar.cpp | file | annotate | diff | comparison | revisions |
--- a/layout/generic/nsTextFrame.cpp +++ b/layout/generic/nsTextFrame.cpp @@ -1791,18 +1791,16 @@ GetHyphenTextRun(gfxTextRun* aTextRun, g } static gfxFont::Metrics GetFirstFontMetrics(gfxFontGroup* aFontGroup) { if (!aFontGroup) return gfxFont::Metrics(); gfxFont* font = aFontGroup->GetFirstValidFont(); - if (!font) - return gfxFont::Metrics(); return font->GetMetrics(gfxFont::eHorizontal); // XXX vertical } PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_NORMAL == 0); PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_PRE == 1); PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_NOWRAP == 2); PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_PRE_WRAP == 3); PR_STATIC_ASSERT(NS_STYLE_WHITESPACE_PRE_LINE == 4); @@ -5677,18 +5675,16 @@ nsTextFrame::PaintTextSelectionDecoratio for (int32_t i = start; i < end; ++i) { selectedChars[i] = sdptr; } } sdptr = sdptr->mNext; } gfxFont* firstFont = aProvider.GetFontGroup()->GetFirstValidFont(); - if (!firstFont) - return; // OOM gfxFont::Metrics decorationMetrics(firstFont->GetMetrics(gfxFont::eHorizontal)); // XXX vertical? decorationMetrics.underlineOffset = aProvider.GetFontGroup()->GetUnderlineOffset(); gfxFloat startXOffset = aTextBaselinePt.x - aFramePt.x; SelectionIterator iterator(selectedChars, aContentOffset, aContentLength, aProvider, mTextRun, startXOffset); @@ -6372,18 +6368,16 @@ nsTextFrame::CombineSelectionUnderlineRe nsRect givenRect = aRect; nsRefPtr<nsFontMetrics> fm; nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fm), GetFontSizeInflation()); gfxFontGroup* fontGroup = fm->GetThebesFontGroup(); gfxFont* firstFont = fontGroup->GetFirstValidFont(); - if (!firstFont) - return false; // OOM const gfxFont::Metrics& metrics = firstFont->GetMetrics(gfxFont::eHorizontal); // XXX vertical? gfxFloat underlineOffset = fontGroup->GetUnderlineOffset(); gfxFloat ascent = aPresContext->AppUnitsToGfxUnits(mAscent); gfxFloat descentLimit = ComputeDescentLimitForSelectionUnderline(aPresContext, this, metrics); SelectionDetails *details = GetSelectionDetails();
--- a/layout/mathml/nsMathMLChar.cpp +++ b/layout/mathml/nsMathMLChar.cpp @@ -992,20 +992,18 @@ nsMathMLChar::SetFontFamily(nsPresContex gfxFont::eHorizontal, aPresContext->GetUserFontSet(), aPresContext->GetTextPerfMetrics(), *getter_AddRefs(fm)); // Set the font if it is an unicode table // or if the same family name has been found gfxFont *firstFont = fm->GetThebesFontGroup()->GetFirstValidFont(); FontFamilyList firstFontList; - if (firstFont) { - firstFontList.Append( - FontFamilyName(firstFont->GetFontEntry()->FamilyName(), eUnquotedName)); - } + firstFontList.Append( + FontFamilyName(firstFont->GetFontEntry()->FamilyName(), eUnquotedName)); if (aGlyphTable == &gGlyphTableList->mUnicodeTable || firstFontList == familyList) { aFont.fontlist = familyList; *aFontGroup = fm->GetThebesFontGroup(); } else { return false; // We did not set the font } }