Fix font family based fallback font selection

Source/platform/fonts/win/FontCacheSkiaWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 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.
@@ skipping 18 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/fonts/FontCache.h"
 
 #include "SkFontMgr.h"
 #include "SkTypeface_win.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/FontDescription.h"
+#include "platform/fonts/FontFaceCreationParams.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/fonts/harfbuzz/FontPlatformDataHarfbuzz.h"
 #include "platform/fonts/win/FontFallbackWin.h"
 
 namespace WebCore {
 
 HashMap<String, SkTypeface*>* FontCache::s_sideloadedFonts = 0;
 
 // static
 void FontCache::addSideloadedFontForTesting(SkTypeface* typeface)
@@ skipping 39 matching lines @@
 PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(const FontDescription& fontDescription, UChar32 character, const SimpleFontData*)
 {
     // FIXME: Consider passing fontDescription.dominantScript()
     // to GetFallbackFamily here.
     UScriptCode script;
     const wchar_t* family = getFallbackFamily(character,
         fontDescription.genericFamily(),
         &script,
         m_fontManager.get());
     FontPlatformData* data = 0;
-    if (family)
-        data = getFontPlatformData(fontDescription,  AtomicString(family, wcslen(family)));
+    if (family) {
+        FontFaceCreationParams createByFamily(AtomicString(family, wcslen(family)));
+        data = getFontPlatformData(fontDescription, createByFamily);
+    }
 
     // Last resort font list : PanUnicode. CJK fonts have a pretty
     // large repertoire. Eventually, we need to scan all the fonts
     // on the system to have a Firefox-like coverage.
     // Make sure that all of them are lowercased.
     const static wchar_t* const cjkFonts[] = {
         L"arial unicode ms",
         L"ms pgothic",
         L"simsun",
         L"gulim",
@@ skipping 38 matching lines @@
         panUniFonts = commonFonts;
         numFonts = WTF_ARRAY_LENGTH(commonFonts);
     }
     // Font returned from getFallbackFamily may not cover |character|
     // because it's based on script to font mapping. This problem is
     // critical enough for non-Latin scripts (especially Han) to
     // warrant an additional (real coverage) check with fontCotainsCharacter.
     int i;
     for (i = 0; (!data || !fontContainsCharacter(data, family, character)) && i < numFonts; ++i) {
         family = panUniFonts[i];
-        data = getFontPlatformData(fontDescription, AtomicString(family, wcslen(family)));
+        FontFaceCreationParams createByFamily(AtomicString(family, wcslen(family)));
+        data = getFontPlatformData(fontDescription, createByFamily);
     }
 
     // When i-th font (0-base) in |panUniFonts| contains a character and
     // we get out of the loop, |i| will be |i + 1|. That is, if only the
     // last font in the array covers the character, |i| will be numFonts.
     // So, we have to use '<=" rather than '<' to see if we found a font
     // covering the character.
     if (i <= numFonts)
         return fontDataFromFontPlatformData(data, DoNotRetain);
 
@@ skipping 25 matching lines @@
     if (!matchesRequestedFamily) {
         SkString familyName;
         tf->getFamilyName(&familyName);
         if (equalIgnoringCase(family, familyName))
             matchesRequestedFamily = true;
     }
 
     return matchesRequestedFamily;
 }
 
-FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family, float fontSize)
+FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontDescription, const FontFaceCreationParams& creationParams, float fontSize)
 {
+    ASSERT(creationParams.creationType() == CreateFontByFamily);
     CString name;
-    RefPtr<SkTypeface> tf = createTypeface(fontDescription, family, name);
+    RefPtr<SkTypeface> tf = createTypeface(fontDescription, creationParams, name);
     if (!tf)
         return 0;
 
     // Windows will always give us a valid pointer here, even if the face name
     // is non-existent. We have to double-check and see if the family name was
     // really used.
     // FIXME: Do we need to use predefined fonts "guaranteed" to exist
     // when we're running in layout-test mode?
-    if (!typefacesMatchesFamily(tf.get(), family)) {
+    if (!typefacesMatchesFamily(tf.get(), creationParams.family())) {
         return 0;
     }
 
     FontPlatformData* result = new FontPlatformData(tf,
         name.data(),
         fontSize,
         fontDescription.weight() >= FontWeightBold && !tf->isBold() || fontDescription.isSyntheticBold(),
         fontDescription.style() == FontStyleItalic && !tf->isItalic() || fontDescription.isSyntheticItalic(),
         fontDescription.orientation(),
         s_useSubpixelPositioning);
@@ skipping 13 matching lines @@
         if (typefacesMatchesFamily(tf.get(), entry.family)) {
             result->setMinSizeForAntiAlias(entry.minSize);
             break;
         }
     }
 
     return result;
 }
 
 }