Fix font family based fallback font selection

Source/platform/fonts/android/FontCacheAndroid.cpp

 /*
  * Copyright (c) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/fonts/FontCache.h"
 
 
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/fonts/FontDescription.h"
+#include "platform/fonts/FontFaceCreationParams.h"
 
 #include "SkTypeface_android.h"
 
 namespace WebCore {
 
 static AtomicString getFamilyNameForCharacter(UChar32 c, UScriptCode script)
 {
     // This is a hack to use the preferred font for CJK scripts.
     // FIXME: Use new Skia API once Android system supports per-family and per-script fallback fonts.
     const char* locale;
@@ skipping 20 matching lines @@
         return emptyAtom;
 
     return skiaFamilyName.c_str();
 }
 
 PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(const FontDescription& fontDescription, UChar32 c, const SimpleFontData*)
 {
     AtomicString familyName = getFamilyNameForCharacter(c, fontDescription.script());
     if (familyName.isEmpty())
         return getLastResortFallbackFont(fontDescription, DoNotRetain);
-    return fontDataFromFontPlatformData(getFontPlatformData(fontDescription, familyName), DoNotRetain);
+    return fontDataFromFontPlatformData(getFontPlatformData(fontDescription, FontFaceCreationParams(familyName)), DoNotRetain);
 }
 
 // static
 AtomicString FontCache::getGenericFamilyNameForScript(const AtomicString& familyName, UScriptCode script)
 {
     // This is a hack to use the preferred font for CJK scripts.
     // FIXME: Use new Skia API once Android system supports per-family and per-script fallback fonts.
     UChar32 examplerChar;
     switch (script) {
     case USCRIPT_SIMPLIFIED_HAN:
     case USCRIPT_TRADITIONAL_HAN:
     case USCRIPT_KATAKANA_OR_HIRAGANA:
         examplerChar = 0x4E00; // A common character in Japanese and Chinese.
         break;
     case USCRIPT_HANGUL:
         examplerChar = 0xAC00;
         break;
     default:
         // For other scripts, use the default generic family mapping logic.
         return familyName;
     }
 
     return getFamilyNameForCharacter(examplerChar, script);
 }
 
 } // namespace WebCore