diff options
author | Ben Wagner <bungeman@google.com> | 2018-02-15 10:20:04 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-22 20:55:05 +0000 |
commit | c912d6133c66df7cde3d64adc76941856a12da64 (patch) | |
tree | d930e2c70814d21347d5069089fa6f18c25ddcb8 /tools/fonts/sk_tool_utils_font.cpp | |
parent | 0f66681ff1c7a2b22d89424ba69e3a5bb8c40b0b (diff) |
Add color fonts.
BUG=skia:7624
Change-Id: Id2b7449048591892ff802484d5e3745a7e1402bb
Reviewed-on: https://skia-review.googlesource.com/109521
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'tools/fonts/sk_tool_utils_font.cpp')
-rw-r--r-- | tools/fonts/sk_tool_utils_font.cpp | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/tools/fonts/sk_tool_utils_font.cpp b/tools/fonts/sk_tool_utils_font.cpp index d2aac851bb..4d5b86aa0a 100644 --- a/tools/fonts/sk_tool_utils_font.cpp +++ b/tools/fonts/sk_tool_utils_font.cpp @@ -11,7 +11,7 @@ #include "SkFontStyle.h" #include "SkMutex.h" #include "SkOSFile.h" -#include "SkTestScalerContext.h" +#include "SkTestTypeface.h" #include "SkUtils.h" #include "sk_tool_utils.h" @@ -70,42 +70,23 @@ sk_sp<SkTypeface> create_font(const char* name, SkFontStyle style) { } sk_sp<SkTypeface> emoji_typeface() { + const char* filename; #if defined(SK_BUILD_FOR_WIN) - sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault()); - const char *colorEmojiFontName = "Segoe UI Emoji"; - sk_sp<SkTypeface> typeface(fm->matchFamilyStyle(colorEmojiFontName, SkFontStyle())); - if (typeface) { - return typeface; - } - sk_sp<SkTypeface> fallback(fm->matchFamilyStyleCharacter( - colorEmojiFontName, SkFontStyle(), nullptr /* bcp47 */, 0 /* bcp47Count */, - 0x1f4b0 /* character: π° */)); - if (fallback) { - return fallback; - } - // If we don't have Segoe UI Emoji and can't find a fallback, try Segoe UI Symbol. - // Windows 7 does not have Segoe UI Emoji; Segoe UI Symbol has the (non - color) emoji. - return SkTypeface::MakeFromName("Segoe UI Symbol", SkFontStyle()); - + filename = "fonts/colr.ttf"; #elif defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) - return SkTypeface::MakeFromName("Apple Color Emoji", SkFontStyle()); - + filename = "fonts/sbix.ttf"; #else - return MakeResourceAsTypeface("fonts/Funkster.ttf"); - + filename = "fonts/cbdt.ttf"; #endif + sk_sp<SkTypeface> typeface = MakeResourceAsTypeface(filename); + if (typeface) { + return typeface; + } + return SkTypeface::MakeFromName("Emoji", SkFontStyle()); } const char* emoji_sample_text() { -#if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) - return "\xF0\x9F\x92\xB0" "\xF0\x9F\x8F\xA1" "\xF0\x9F\x8E\x85" // π°π‘π
- "\xF0\x9F\x8D\xAA" "\xF0\x9F\x8D\x95" "\xF0\x9F\x9A\x80" // πͺππ - "\xF0\x9F\x9A\xBB" "\xF0\x9F\x92\xA9" "\xF0\x9F\x93\xB7" // π»π©π· - "\xF0\x9F\x93\xA6" // π¦ - "\xF0\x9F\x87\xBA" "\xF0\x9F\x87\xB8" "\xF0\x9F\x87\xA6"; // πΊπΈπ¦ -#else - return "Hamburgefons"; -#endif + return "\xF0\x9F\x98\x80" " " "\xE2\x99\xA2"; // π β’ } static const char* platform_os_name() { |