Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1056479 p7 - fixup assertion for non-italic fallback. r=m_kato

Browse Source
This commit is contained in:
John Daggett 2015-05-13 14:11:26 +09:00
parent 6ea78832dc
commit 340819d049
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/thebes/gfxTextRun.cpp
View File

@ -2803,9 +2803,11 @@ gfxFontGroup::FindFontForChar(uint32_t aCh, uint32_t aPrevCh, uint32_t aNextCh,
// If italic, test the regular face to see if it supports the character. // If italic, test the regular face to see if it supports the character.
// Only do this for platform fonts, not userfonts. // Only do this for platform fonts, not userfonts.
fe = ff.FontEntry();
if (mStyle.style != NS_FONT_STYLE_NORMAL && if (mStyle.style != NS_FONT_STYLE_NORMAL &&
!ff.FontEntry()->IsUserFont()) { !fe->mIsUserFontContainer &&
font = FindNonItalicFaceForChar(mFonts[i].Family(), aCh); !fe->IsUserFont()) {
font = FindNonItalicFaceForChar(ff.Family(), aCh);
if (font) { if (font) {
*aMatchType = gfxTextRange::kFontGroup; *aMatchType = gfxTextRange::kFontGroup;
return font.forget(); return font.forget();