Bug 1037442 - Part 2: Fix the family name of Gill Sans faces when merging into Gill Sans MT under DWrite. r=jdaggett a=sylvestre
authorJonathan Kew <jkew@mozilla.com>
Tue, 22 Jul 2014 11:41:31 +0100
changeset 217250 50ef305a562bd7b2ac8c9d60728ddec872233a55
parent 217249 8e8546266e99f8687e0775dce33a45b1c0edfa15
child 217251 79c2ffbea8f6ca9713d612f2401b8f11dcc6a5c1
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdaggett, sylvestre
bugs1037442
milestone33.0a2
Bug 1037442 - Part 2: Fix the family name of Gill Sans faces when merging into Gill Sans MT under DWrite. r=jdaggett a=sylvestre
gfx/thebes/gfxDWriteFontList.cpp
--- a/gfx/thebes/gfxDWriteFontList.cpp
+++ b/gfx/thebes/gfxDWriteFontList.cpp
@@ -1025,16 +1025,18 @@ gfxDWriteFontList::DelayedInitFontList()
         }
 
         // if all the Gill Sans faces are Ultra Bold ==> move faces
         // for Gill Sans into Gill Sans MT family
         if (allUltraBold) {
 
             // add faces to Gill Sans MT
             for (i = 0; i < faces.Length(); i++) {
+                // change the entry's family name to match its adoptive family
+                faces[i]->mFamilyName = gillSansMTFamily->Name();
                 gillSansMTFamily->AddFontEntry(faces[i]);
 
 #ifdef PR_LOGGING
                 if (LOG_FONTLIST_ENABLED()) {
                     gfxFontEntry *fe = faces[i];
                     LOG_FONTLIST(("(fontlist) moved (%s) to family (%s)"
                          " with style: %s weight: %d stretch: %d",
                          NS_ConvertUTF16toUTF8(fe->Name()).get(),