Fix font family based fallback font selection

Source/core/css/CSSSegmentedFontFace.cpp

 /*
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  */
 
 #include "config.h"
 #include "core/css/CSSSegmentedFontFace.h"
 
 #include "core/css/CSSFontFace.h"
 #include "core/css/CSSFontSelector.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontDescription.h"
+#include "platform/fonts/FontFaceCreationParams.h"
 #include "platform/fonts/SegmentedFontData.h"
 #include "platform/fonts/SimpleFontData.h"
 
 namespace WebCore {
 
 CSSSegmentedFontFace::CSSSegmentedFontFace(CSSFontSelector* fontSelector, FontTraits traits)
     : m_fontSelector(fontSelector)
     , m_traits(traits)
     , m_firstNonCssConnectedFace(m_fontFaces.end())
 {
@@ skipping 79 matching lines @@
     for (unsigned j = 0; j < numRanges; ++j)
         newFontData->appendRange(FontDataRange(ranges.rangeAt(j).from(), ranges.rangeAt(j).to(), faceFontData));
 }
 
 PassRefPtr<FontData> CSSSegmentedFontFace::getFontData(const FontDescription& fontDescription)
 {
     if (!isValid())
         return nullptr;
 
     FontTraits desiredTraits = fontDescription.traits();
-    AtomicString emptyFontFamily = "";
-    FontCacheKey key = fontDescription.cacheKey(emptyFontFamily, desiredTraits);
+    FontCacheKey key = fontDescription.cacheKey(FontFaceCreationParams(), desiredTraits);
 
     RefPtr<SegmentedFontData>& fontData = m_fontDataTable.add(key.hash(), nullptr).storedValue->value;
     if (fontData && fontData->numRanges())
         return fontData; // No release, we have a reference to an object in the cache which should retain the ref count it has.
 
     if (!fontData)
         fontData = SegmentedFontData::create();
 
     FontDescription requestedFontDescription(fontDescription);
     requestedFontDescription.setTraits(m_traits);
@@ skipping 65 matching lines @@
     }
 }
 
 void CSSSegmentedFontFace::trace(Visitor* visitor)
 {
     visitor->trace(m_fontSelector);
     visitor->trace(m_fontFaces);
 }
 
 }