Fix font family based fallback font selection

Source/platform/fonts/FontDescription.cpp

 /*
  * Copyright (C) 2007 Nicholas Shanks <contact@nickshanks.com>
  * Copyright (C) 2008 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 109 matching lines @@
 {
     float size = (RuntimeEnabledFeatures::subpixelFontScalingEnabled())
         ? computedSize()
         : computedPixelSize();
 
     // Ensure that the effective precision matches the font-cache precision.
     // This guarantees that the same precision is used regardless of cache status.
     return floorf(size * FontCacheKey::precisionMultiplier()) / FontCacheKey::precisionMultiplier();
 }
 
-FontCacheKey FontDescription::cacheKey(const AtomicString& familyName, FontTraits desiredTraits) const
+FontCacheKey FontDescription::cacheKey(const FontFaceCreationParams& creationParams, FontTraits desiredTraits) const
 {
     FontTraits fontTraits = desiredTraits.mask()
         ? desiredTraits
         : traits();
 
     unsigned options =
         static_cast<unsigned>(m_syntheticItalic) << 7 | // bit 8
         static_cast<unsigned>(m_syntheticBold) << 6 | // bit 7
         static_cast<unsigned>(m_fontSmoothing) << 4 | // bits 5-6
         static_cast<unsigned>(m_textRendering) << 2 | // bits 3-4
         static_cast<unsigned>(m_orientation) << 1 | // bit 2
         static_cast<unsigned>(m_subpixelTextPosition); // bit 1
 
-    return FontCacheKey(familyName, effectiveFontSize(), options | fontTraits.mask() << 8);
+    return FontCacheKey(creationParams, effectiveFontSize(), options | fontTraits.mask() << 8);
 }
 
 
 void FontDescription::setDefaultTypesettingFeatures(TypesettingFeatures typesettingFeatures)
 {
     s_defaultTypesettingFeatures = typesettingFeatures;
 }
 
 TypesettingFeatures FontDescription::defaultTypesettingFeatures()
 {
@@ skipping 45 matching lines @@
 
         if (discretionaryLigaturesState() == FontDescription::EnabledLigaturesState
             || historicalLigaturesState() == FontDescription::EnabledLigaturesState
             || contextualLigaturesState() == FontDescription::EnabledLigaturesState) {
             m_typesettingFeatures |= WebCore::Ligatures;
         }
     }
 }
 
 } // namespace WebCore