Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(984)

Unified Diff: third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

Issue 1750213003: Revert of Add FontCache API for retrieving prioritized fallback fonts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
index d9af8814f20745f374402948176848edc5db9597..591ba4f2cbf8872ef6eac5ec127e8ec2ee268ed0 100644
--- a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
+++ b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
@@ -43,35 +43,6 @@
#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"
@@ -190,32 +161,6 @@
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)
{
« no previous file with comments | « third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698