Bug 1436048 followup, fix for Windows build bustage. r=emilio(irc) on a CLOSED TREE
authorJonathan Kew <jkew@mozilla.com>
Mon, 23 Apr 2018 18:42:49 +0100
changeset 468666 fdcc03769fbcfd6415aef10f798299bea652c2b7
parent 468665 ded40b73ba230b1799ebb79daf79de10b0f85ac9
child 468667 d19e729f33707ff2aac6189c94912caabb65b07f
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
bugs1436048
milestone61.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
Bug 1436048 followup, fix for Windows build bustage. r=emilio(irc) on a CLOSED TREE
gfx/thebes/gfxDWriteFontList.cpp
--- a/gfx/thebes/gfxDWriteFontList.cpp
+++ b/gfx/thebes/gfxDWriteFontList.cpp
@@ -403,17 +403,17 @@ gfxDWriteFontEntry::CopyFontTable(uint32
     gfxDWriteFontList *pFontList = gfxDWriteFontList::PlatformFontList();
     const uint32_t tagBE = NativeEndian::swapToBigEndian(aTableTag);
 
     // Don't use GDI table loading for symbol fonts or for
     // italic fonts in Arabic-script system locales because of
     // potential cmap discrepancies, see bug 629386.
     // Ditto for Hebrew, bug 837498.
     if (mFont && pFontList->UseGDIFontTableAccess() &&
-        !(mStyle && UsingArabicOrHebrewScriptSystemLocale()) &&
+        !(!IsUpright() && UsingArabicOrHebrewScriptSystemLocale()) &&
         !mFont->IsSymbolFont())
     {
         LOGFONTW logfont = { 0 };
         if (InitLogFont(mFont, &logfont)) {
             AutoDC dc;
             AutoSelectFont font(dc.GetDC(), &logfont);
             if (font.IsValid()) {
                 uint32_t tableSize =