Roll out dominantScript, getGenericFontForScript patches to unfork a bunch of...

third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp

Index: third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp
===================================================================
--- third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp	(revision 13094)
+++ third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp	(working copy)
@@ -414,15 +414,7 @@
 FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription& description)
 {
     FontDescription::GenericFamilyType generic = description.genericFamily();
-    // FIXME: Mapping webkit generic to GenericFamilyType needs to
-    // be more intelligent. 
-    // This spot rarely gets reached. GetFontDataForCharacters() gets hit a lot
-    // more often (see FIXME comment there). 
-    const wchar_t* family = getFontFamilyForScript(description.dominantScript(), generic);
 
-    if (family)
-        return getCachedFontPlatformData(description, AtomicString(family, wcslen(family)));
-
     // FIXME: Would be even better to somehow get the user's default font here.
     // For now we'll pick the default that the user would get without changing
     // any prefs.
@@ -455,13 +447,6 @@
     return gdiFontWeights[fontWeight];
 }
 
-// FIXME: This may not be the best place to put this function
-AtomicString FontCache::getGenericFontForScript(UScriptCode script, const FontDescription& description)
-{
-    const wchar_t* scriptFont = getFontFamilyForScript( script, description.genericFamily());
-    return scriptFont ? AtomicString(scriptFont, wcslen(scriptFont)) : emptyAtom;
-}
-
 static void FillLogFont(const FontDescription& fontDescription, LOGFONT* winfont)
 {
     // The size here looks unusual.  The negative number is intentional.