Fix font family based fallback font selection

Source/platform/fonts/FontCache.h

 /*
  * Copyright (C) 2006, 2008 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007-2008 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 14 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef FontCache_h
 #define FontCache_h
 
 #include <limits.h>
 #include "platform/PlatformExport.h"
+#include "platform/fonts/FontFaceCreationParams.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 #include "wtf/unicode/Unicode.h"
 
 #if OS(WIN)
 #include "SkFontMgr.h"
 #include <windows.h>
 #include <objidl.h>
 #include <mlang.h>
 struct IDWriteFactory;
 #endif
 
 #if OS(ANDROID)
 #include <unicode/uscript.h>
 #endif
 
 class SkTypeface;
 
 namespace WebCore {
 
 class FontCacheClient;
+class FontFaceCreationParams;
 class FontPlatformData;
 class FontData;
 class FontDescription;
 class OpenTypeVerticalData;
 class SimpleFontData;
 
 enum ShouldRetain { Retain, DoNotRetain };
 enum PurgeSeverity { PurgeIfNeeded, ForcePurge };
 
 class PLATFORM_EXPORT FontCache {
@@ skipping 43 matching lines @@
     typedef uint32_t FontFileKey;
     PassRefPtr<OpenTypeVerticalData> getVerticalData(const FontFileKey&, const FontPlatformData&);
 #endif
 
 #if OS(ANDROID)
     static AtomicString getGenericFamilyNameForScript(const AtomicString& familyName, UScriptCode);
 #else
     struct PlatformFallbackFont {
         String name;
         CString filename;
+        int fontconfigInterfaceId;
         int ttcIndex;
         bool isBold;
         bool isItalic;
     };
     static void getFontForCharacter(UChar32, const char* preferredLocale, PlatformFallbackFont*);
 #endif
 
 private:
     FontCache();
     ~FontCache();
 
     void purge(PurgeSeverity = PurgeIfNeeded);
 
     void disablePurging() { m_purgePreventCount++; }
     void enablePurging()
     {
         ASSERT(m_purgePreventCount);
         if (!--m_purgePreventCount)
             purge(PurgeIfNeeded);
     }
 
     // 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);
 
     // Don't purge if this count is > 0;
     int m_purgePreventCount;
 
 #if OS(WIN)
     OwnPtr<SkFontMgr> m_fontManager;
     static bool s_useDirectWrite;
     static IDWriteFactory* s_directWriteFactory;
@@ skipping 10 matching lines @@
 
 class PLATFORM_EXPORT FontCachePurgePreventer {
 public:
     FontCachePurgePreventer() { FontCache::fontCache()->disablePurging(); }
     ~FontCachePurgePreventer() { FontCache::fontCache()->enablePurging(); }
 };
 
 }
 
 #endif