Bug 1250788 - Unified build fix.
authorCameron McCormack <cam@mcc.id.au>
Fri, 26 Feb 2016 12:51:02 +1100
changeset 322008 dbd451c2bc80be6d820816c494e6b7dd54aa9c2d
parent 322007 76673f4686dd577f7bf39a2a3b7c5bb598672a94
child 322009 1554dd69f3945ba8ba1f33ce7cc12af819905d42
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1250788
milestone47.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 1250788 - Unified build fix.
layout/style/nsFontFaceUtils.cpp
--- a/layout/style/nsFontFaceUtils.cpp
+++ b/layout/style/nsFontFaceUtils.cpp
@@ -16,17 +16,17 @@
 static bool
 StyleContextContainsFont(nsStyleContext* aStyleContext,
                          const gfxUserFontSet* aUserFontSet,
                          const gfxUserFontEntry* aFont)
 {
   // if the font is null, simply check to see whether fontlist includes
   // downloadable fonts
   if (!aFont) {
-    const FontFamilyList& fontlist =
+    const mozilla::FontFamilyList& fontlist =
       aStyleContext->StyleFont()->mFont.fontlist;
     return aUserFontSet->ContainsUserFontSetFonts(fontlist);
   }
 
   // first, check if the family name is in the fontlist
   const nsString& familyName = aFont->FamilyName();
   if (!aStyleContext->StyleFont()->mFont.fontlist.Contains(familyName)) {
     return false;