bug 765906 - don't ignore boldness when using system fallback fonts. r=jdaggett

gfx/thebes/gfxFont.cpp

@@ -3979,8 +3979,9 @@ gfxFontGroup::WhichSystemFontSupportsChar(PRUint32 aCh, PRInt32 aRunScript)
         gfxPlatformFontList::PlatformFontList()->
             SystemFindFontForChar(aCh, aRunScript, &mStyle);
     if (fe) {
-        // ignore bolder considerations in system fallback case...
-        nsRefPtr<gfxFont> font = fe->FindOrMakeFont(&mStyle, false);
+        bool wantBold = mStyle.ComputeWeight() >= 6;
+        nsRefPtr<gfxFont> font =
+            fe->FindOrMakeFont(&mStyle, wantBold && !fe->IsBold());
         return font.forget();
     }
 

layout/reftests/font-matching/reftest.list

@@ -11,7 +11,7 @@
 != defaultfont-bolditalic.html defaultfont.html 
 != defaultfont-bolditalic.html defaultfont-bold.html
 
-fails-if(Android) != defaultjapanese-bold.html defaultjapanese.html
+!= defaultjapanese-bold.html defaultjapanese.html
 != defaultjapanese-italic.html defaultjapanese.html
 != defaultjapanese-oblique.html defaultjapanese.html
 != defaultjapanese-bolditalic.html defaultjapanese.html