diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-19 19:22:37 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-19 19:22:37 +0100 |
| commit | 38ec1c796d64fcf9d73a897685cadbf0ad74fed0 (patch) | |
| tree | 94d72a131ada51fd3dc0cf8338cd447b537ddc12 /gfx/thebes/gfxGDIFontList.cpp | |
| parent | f297ef798e3b4577bb82119161ea9628f37ba796 (diff) | |
| download | UXP-38ec1c796d64fcf9d73a897685cadbf0ad74fed0.tar UXP-38ec1c796d64fcf9d73a897685cadbf0ad74fed0.tar.gz UXP-38ec1c796d64fcf9d73a897685cadbf0ad74fed0.tar.lz UXP-38ec1c796d64fcf9d73a897685cadbf0ad74fed0.tar.xz UXP-38ec1c796d64fcf9d73a897685cadbf0ad74fed0.zip | |
Remove gfx/thebes checks for Windows 7+.
Diffstat (limited to 'gfx/thebes/gfxGDIFontList.cpp')
| -rw-r--r-- | gfx/thebes/gfxGDIFontList.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gfx/thebes/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp index 97a3d36ab..cc047ef38 100644 --- a/gfx/thebes/gfxGDIFontList.cpp +++ b/gfx/thebes/gfxGDIFontList.cpp @@ -862,15 +862,8 @@ gfxGDIFontList::MakePlatformFont(const nsAString& aFontName, gfxWindowsFontType(isCFF ? GFX_FONT_TYPE_PS_OPENTYPE : GFX_FONT_TYPE_TRUETYPE) /*type*/, aStyle, w, aStretch, winUserFontData, false); - if (!fe) - return fe; - - fe->mIsDataUserFont = true; - - // Uniscribe doesn't place CFF fonts loaded privately - // via AddFontMemResourceEx on XP/Vista - if (isCFF && !IsWin7OrLater()) { - fe->mForceGDI = true; + if (fe) { + fe->mIsDataUserFont = true; } return fe; |