Bug 425249 gfxWindowsPlatform::InitBadUnderlineList() is broken by bug 424018 r+b1.9+a1.9b5=stuart
git-svn-id: svn://10.0.0.236/trunk@248612 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
1afb9ac466
commit
b13e53df9d
@ -77,6 +77,7 @@ private:
|
||||
public:
|
||||
nsTArray<nsRefPtr<FontEntry> > mVariations;
|
||||
nsString mName;
|
||||
PRPackedBool mIsBadUnderlineFont;
|
||||
|
||||
private:
|
||||
PRBool mHasStyles;
|
||||
|
||||
@ -203,6 +203,8 @@ FontFamily::FamilyAddStylesProc(const ENUMLOGFONTEXW *lpelfe,
|
||||
}
|
||||
}
|
||||
|
||||
fe->mIsBadUnderlineFont = ff->mIsBadUnderlineFont;
|
||||
|
||||
// read in the character map
|
||||
logFont.lfCharSet = DEFAULT_CHARSET;
|
||||
HFONT font = CreateFontIndirectW(&logFont);
|
||||
|
||||
@ -285,10 +285,7 @@ gfxWindowsPlatform::InitBadUnderlineList()
|
||||
FontFamily *ff = FindFontFamily(resolved);
|
||||
if (!ff)
|
||||
continue;
|
||||
for (PRUint32 j = 0; j < ff->mVariations.Length(); ++j) {
|
||||
nsRefPtr<FontEntry> fe = ff->mVariations[j];
|
||||
fe->mIsBadUnderlineFont = 1;
|
||||
}
|
||||
ff->mIsBadUnderlineFont = 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user