Revert of Add code to call skia's matchFamilyStyleCharacter API, which uses the

third_party/WebKit/Source/platform/fonts/FontCache.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * 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 63 matching lines @@
 static FallbackListShaperCache* gFallbackListShaperCache = nullptr;
 
 SkFontMgr* FontCache::s_fontManager = nullptr;
 
 #if OS(WIN)
 bool FontCache::s_useDirectWrite = false;
 bool FontCache::s_antialiasedTextEnabled = false;
 bool FontCache::s_lcdTextEnabled = false;
 bool FontCache::s_useSubpixelPositioning = false;
 float FontCache::s_deviceScaleFactor = 1.0;
-bool FontCache::s_useSkiaFontFallback = false;
 #endif // OS(WIN)
 
 FontCache* FontCache::fontCache()
 {
     DEFINE_STATIC_LOCAL(FontCache, globalFontCache, ());
     return &globalFontCache;
 }
 
 FontPlatformData* FontCache::getFontPlatformData(const FontDescription& fontDescription,
     const FontFaceCreationParams& creationParams, bool checkingAlternateName)
@@ skipping 273 matching lines @@
     FallbackListShaperCache::iterator iter;
     for (iter = gFallbackListShaperCache->begin();
         iter != gFallbackListShaperCache->end();
         ++iter) {
         shapeResultCacheSize += iter->value->byteSize();
     }
     dump->addScalar("size", "bytes", shapeResultCacheSize);
     memoryDump->addSuballocation(dump->guid(), String(WTF::Partitions::kAllocatedObjectPoolName));
 }
 
-// SkFontMgr requires script-based locale names, like "zh-Hant" and "zh-Hans",
-// instead of "zh-CN" and "zh-TW".
-CString toSkFontMgrLocale(const String& locale)
-{
-    if (!locale.startsWith("zh", TextCaseInsensitive))
-        return locale.ascii();
-
-    switch (localeToScriptCodeForFontSelection(locale)) {
-    case USCRIPT_SIMPLIFIED_HAN:
-        return "zh-Hans";
-    case USCRIPT_TRADITIONAL_HAN:
-        return "zh-Hant";
-    default:
-        return locale.ascii();
-    }
-}
 
 } // namespace blink