bug 574287 - honor the bad-underline blacklist in dwrite font backend. r=bas

gfx/thebes/src/gfxDWriteFontList.cpp

@@ -136,6 +136,9 @@ gfxDWriteFontFamily::FindStyleVariations()
         NS_WARNING("Family with no font faces in it.");
     }
 
+    if (mIsBadUnderlineFamily) {
+        SetBadUnderlineFonts();
+    }
 }
 
 void
@@ -531,9 +534,11 @@ gfxDWriteFontList::InitFontList()
 
         if (!mFontFamilies.GetWeak(name)) {
             nsRefPtr<gfxFontFamily> fam = 
-                new gfxDWriteFontFamily(
+                new gfxDWriteFontFamily(nsDependentString(famName.Elements()),
-                    nsDependentString(famName.Elements()),
+                                        family);
-                    family);
+            if (mBadUnderlineFamilyNames.Contains(name)) {
+                fam->SetBadUnderlineFamily();
+            }
             mFontFamilies.Put(name, fam);
         }
     }

gfx/thebes/src/gfxDWriteFonts.cpp

@@ -231,7 +231,7 @@ gfxDWriteFont::ComputeMetrics()
 
     mFUnitsConvFactor = GetAdjustedSize() / fontMetrics.designUnitsPerEm;
 
-    SanitizeMetrics(&mMetrics, PR_FALSE);
+    SanitizeMetrics(&mMetrics, GetFontEntry()->mIsBadUnderlineFont);
 
 #if 0
     printf("Font: %p (%s) size: %f\n", this,