Fix font family based fallback font selection

Source/platform/fonts/FontCache.h

Index: Source/platform/fonts/FontCache.h
diff --git a/Source/platform/fonts/FontCache.h b/Source/platform/fonts/FontCache.h
index 0aef86a8dbce5ef78c316d0a8b169f57bef9d1b6..49746fcb1c6706f23e5f803eb7e679c80ef89b98 100644
--- a/Source/platform/fonts/FontCache.h
+++ b/Source/platform/fonts/FontCache.h
@@ -32,6 +32,7 @@
 
 #include <limits.h>
 #include "platform/PlatformExport.h"
+#include "platform/fonts/FontFaceCreationParams.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/PassRefPtr.h"
@@ -58,6 +59,7 @@ class SkTypeface;
 namespace WebCore {
 
 class FontCacheClient;
+class FontFaceCreationParams;
 class FontPlatformData;
 class FontData;
 class FontDescription;
@@ -121,6 +123,7 @@ public:
     struct PlatformFallbackFont {
         String name;
         CString filename;
+        int fontconfigInterfaceId;
         int ttcIndex;
         bool isBold;
         bool isItalic;
@@ -143,13 +146,13 @@ private:
     }
 
     // FIXME: This method should eventually be removed.
-    FontPlatformData* getFontPlatformData(const FontDescription&, const AtomicString& family, bool checkingAlternateName = false);
+    FontPlatformData* getFontPlatformData(const FontDescription&, const FontFaceCreationParams&, bool checkingAlternateName = false);
 
     // These methods are implemented by each platform.
-    FontPlatformData* createFontPlatformData(const FontDescription&, const AtomicString& family, float fontSize);
+    FontPlatformData* createFontPlatformData(const FontDescription&, const FontFaceCreationParams&, float fontSize);
 
     // Implemented on skia platforms.
-    PassRefPtr<SkTypeface> createTypeface(const FontDescription&, const AtomicString& family, CString& name);
+    PassRefPtr<SkTypeface> createTypeface(const FontDescription&, const FontFaceCreationParams&, CString& name);
 
     PassRefPtr<SimpleFontData> fontDataFromFontPlatformData(const FontPlatformData*, ShouldRetain = Retain);