Bug 1119423 - Fix reversed test of aMatchData->mStyle in gfxFontFamily::FindFontForChar. r=jdaggett
--- a/gfx/thebes/gfxFontEntry.cpp
+++ b/gfx/thebes/gfxFontEntry.cpp
@@ -1456,20 +1456,20 @@ gfxFontFamily::FindFontForChar(GlobalFon
{
if (mFamilyCharacterMapInitialized && !TestCharacterMap(aMatchData->mCh)) {
// none of the faces in the family support the required char,
// so bail out immediately
return;
}
bool needsBold;
- gfxFontStyle normal;
- gfxFontEntry *fe = FindFontForStyle(
- (aMatchData->mStyle == nullptr) ? *aMatchData->mStyle : normal,
- needsBold);
+ gfxFontEntry *fe =
+ FindFontForStyle(aMatchData->mStyle ? *aMatchData->mStyle
+ : gfxFontStyle(),
+ needsBold);
if (fe && !fe->SkipDuringSystemFallback()) {
int32_t rank = 0;
if (fe->TestCharacterMap(aMatchData->mCh)) {
rank += RANK_MATCHED_CMAP;
aMatchData->mCount++;
#ifdef PR_LOGGING