Bug 1442693 - fix UnscaledFontFontconfig creation for variations. r=me
authorLee Salzman <lsalzman@mozilla.com>
Fri, 21 Dec 2018 11:56:51 -0500
changeset 451717 2b9466c27a2185685742ea4d5ee21898b9f31168
parent 451716 78e69c0b9293e493b1ecbb66b964d2411f7acada
child 451718 e94a166a769c05e9ea0a9dd7ab1c5c2a6246a1aa
push id35252
push userccoroiu@mozilla.com
push dateFri, 21 Dec 2018 21:56:22 +0000
treeherdermozilla-central@b23630094b9c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1442693
milestone66.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 1442693 - fix UnscaledFontFontconfig creation for variations. r=me
gfx/thebes/gfxFcPlatformFontList.cpp
--- a/gfx/thebes/gfxFcPlatformFontList.cpp
+++ b/gfx/thebes/gfxFcPlatformFontList.cpp
@@ -989,17 +989,17 @@ gfxFont* gfxFontconfigFontEntry::CreateF
       return nullptr;
     }
   }
 
   RefPtr<UnscaledFontFontconfig> unscaledFont =
       mUnscaledFontCache.Lookup(ToCharPtr(file), index);
   if (!unscaledFont) {
     unscaledFont = mFontData
-                       ? new UnscaledFontFontconfig(face)
+                       ? new UnscaledFontFontconfig(mFTFace)
                        : new UnscaledFontFontconfig(ToCharPtr(file), index);
     mUnscaledFontCache.Add(unscaledFont);
   }
 
   gfxFont* newFont = new gfxFontconfigFont(
       unscaledFont, scaledFont, renderPattern, size, this, aFontStyle);
   cairo_scaled_font_destroy(scaledFont);