Revert of Add FontCache API for retrieving prioritized fallback fonts

third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 2009 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 25 matching lines @@
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontFaceCreationParams.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "public/platform/Platform.h"
 #include "public/platform/linux/WebSandboxSupport.h"
 #include "wtf/Assertions.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/CString.h"
 #include <unicode/locid.h>
 
-// Unfortunately, these chosen font names require a bit of experimentation and
-// researching on the respective platforms as to what works best and is widely
-// available. They may require further manual tuning. Mozilla's choices in the
-// gfxPlatform*::GetCommonFallbackFonts methods collects some of the outcome of
-// this experimentation. On Android, the available fonts in
-// /system/etc/fonts.xml give a clearer picture of which fonts are available and
-// can be widely used successfully. On Linux, updating and improving this list
-// requires finding out widely used distribution fonts, for example on current
-// Ubuntu versions.
-#if OS(WIN)
-const char* kColorEmojiFonts[] = { "Segoe UI Emoji", "Segoe UI Symbol" };
-const char* kTextEmojiFonts[] = { "Segoe UI Symbol", "Code2000", "Lucida Sans Unicode" };
-const char* kSymbolsFonts[] = { "Segoe UI Symbol", "Code2000", "Lucida Sans Unicode" };
-const char* kMathFonts[] = { "Cambria Math", "Segoe UI Symbol", "Code2000" };
-#elif OS(ANDROID)
-// Due to crbug.com/322658 we cannot properly specify Android font family names here,
-// The way Skia's SkFontMgr_android gives them canonical names, we can however
-// reference the Noto Color Emoji font under "56##fallback" on Android 6.0.1
-const char* kColorEmojiFonts[] = { "56##fallback", "Noto Color Emoji", "Android Emoji" };
-const char* kTextEmojiFonts[] = { "Droid Sans Fallback" };
-const char* kSymbolsFonts[] = { "Droid Sans Fallback" };
-const char* kMathFonts[] = { "Droid Sans Fallback" };
-#elif OS(LINUX)
-const char* kColorEmojiFonts[] = { "Noto Color Emoji", "Noto Sans Symbols", "Symbola", "DejaVu Sans" };
-const char* kTextEmojiFonts[] = { "Noto Sans Symbols", "Symbola", "Droid Sans Fallback", "DejaVu Sans" };
-const char* kSymbolsFonts[] = { "FreeSerif", "FreeMono", "Droid Sans Fallback", "DejaVu Sans" };
-const char* kMathFonts[] = { "FreeSerif", "FreeMono", "Droid Sans Fallback", "DejaVu Sans" };
-#endif
-
 #if !OS(WIN) && !OS(ANDROID)
 #include "SkFontConfigInterface.h"
 
 static PassRefPtr<SkTypeface> typefaceForFontconfigInterfaceIdAndTtcIndex(int fontconfigInterfaceId, int ttcIndex)
 {
     SkAutoTUnref<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal());
     SkFontConfigInterface::FontIdentity fontIdentity;
     fontIdentity.fID = fontconfigInterfaceId;
     fontIdentity.fTTCIndex = ttcIndex;
     return adoptRef(fci->createTypeface(fontIdentity));
@@ skipping 98 matching lines @@
     if (!fontPlatformData) {
         DEFINE_STATIC_LOCAL(const FontFaceCreationParams, mssansserifCreationParams, (AtomicString("Microsoft Sans Serif", AtomicString::ConstructFromLiteral)));
         fontPlatformData = getFontPlatformData(description, mssansserifCreationParams);
     }
 #endif
 
     ASSERT(fontPlatformData);
     return fontDataFromFontPlatformData(fontPlatformData, shouldRetain);
 }
 
-const Vector<AtomicString> FontCache::platformFontListForFallbackPriority(FontFallbackPriority fallbackPriority) const
-{
-    Vector<AtomicString> returnVector;
-    switch (fallbackPriority) {
-    case FontFallbackPriority::EmojiEmoji:
-        for (size_t i = 0; i < WTF_ARRAY_LENGTH(kColorEmojiFonts); ++i)
-            returnVector.append(kColorEmojiFonts[i]);
-        break;
-    case FontFallbackPriority::EmojiText:
-        for (size_t i = 0; i < WTF_ARRAY_LENGTH(kTextEmojiFonts); ++i)
-            returnVector.append(kTextEmojiFonts[i]);
-        break;
-    case FontFallbackPriority::Math:
-        for (size_t i = 0; i < WTF_ARRAY_LENGTH(kMathFonts); ++i)
-            returnVector.append(kMathFonts[i]);
-        break;
-    case FontFallbackPriority::Symbols:
-        for (size_t i = 0; i < WTF_ARRAY_LENGTH(kSymbolsFonts); ++i)
-            returnVector.append(kSymbolsFonts[i]);
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-    }
-    return returnVector;
-}
-
 #if OS(WIN)
 static inline SkFontStyle fontStyle(const FontDescription& fontDescription)
 {
     int width = static_cast<int>(fontDescription.stretch());
     int weight = (fontDescription.weight() - FontWeight100 + 1) * 100;
     SkFontStyle::Slant slant = fontDescription.style() == FontStyleItalic
         ? SkFontStyle::kItalic_Slant
         : SkFontStyle::kUpright_Slant;
     return SkFontStyle(weight, width, slant);
 }
@@ skipping 66 matching lines @@
         name.data(),
         fontSize,
         (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDescription.isSyntheticBold(),
         ((fontDescription.style() == FontStyleItalic || fontDescription.style() == FontStyleOblique) && !tf->isItalic()) || fontDescription.isSyntheticItalic(),
         fontDescription.orientation(),
         fontDescription.useSubpixelPositioning()));
 }
 #endif // !OS(WIN)
 
 } // namespace blink