diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-05-26 14:05:45 -0700 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2011-05-26 14:05:45 -0700 |
| commit | 0da3e5e1d2b913ba0c47bfd1c7923bbce60faa6a (patch) | |
| tree | b077eba1adefd7eec8061f2450cafc9bdb99db1d | |
| parent | 3d487c65ee7e11672335cae6240879d3421abf24 (diff) | |
| download | external_webkit-0da3e5e1d2b913ba0c47bfd1c7923bbce60faa6a.zip external_webkit-0da3e5e1d2b913ba0c47bfd1c7923bbce60faa6a.tar.gz external_webkit-0da3e5e1d2b913ba0c47bfd1c7923bbce60faa6a.tar.bz2 | |
Update isFallbackFamily() with missing fonts
Skia maps numerous fonts to the standard system fonts. Only a few of
these were matched by isFallbackFamily(). This brings them to parity,
adding standards like arial, times, courier, and more.
Bug: 4499169
Change-Id: I02a1816501c61f59ebaddb487bb0ff24cc5c1cca
| -rw-r--r-- | WebCore/platform/graphics/android/FontCacheAndroid.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/FontCacheAndroid.cpp b/WebCore/platform/graphics/android/FontCacheAndroid.cpp index 428628c..20ffd17 100644 --- a/WebCore/platform/graphics/android/FontCacheAndroid.cpp +++ b/WebCore/platform/graphics/android/FontCacheAndroid.cpp @@ -65,8 +65,22 @@ static bool isFallbackFamily(String family) || equalIgnoringCase(family, "sans-serif") || equalIgnoringCase(family, "sans") || equalIgnoringCase(family, "monospace") + || equalIgnoringCase(family, "times") // skia aliases for serif + || equalIgnoringCase(family, "times new roman") + || equalIgnoringCase(family, "palatino") + || equalIgnoringCase(family, "georgia") + || equalIgnoringCase(family, "baskerville") + || equalIgnoringCase(family, "goudy") || equalIgnoringCase(family, "cursive") - || equalIgnoringCase(family, "fantasy"); + || equalIgnoringCase(family, "fantasy") + || equalIgnoringCase(family, "ITC Stone Serif") + || equalIgnoringCase(family, "arial") // skia aliases for sans-serif + || equalIgnoringCase(family, "helvetica") + || equalIgnoringCase(family, "tahoma") + || equalIgnoringCase(family, "verdana") + || equalIgnoringCase(family, "courier") // skia aliases for monospace + || equalIgnoringCase(family, "courier new") + || equalIgnoringCase(family, "monaco"); } static char* AtomicStringToUTF8String(const AtomicString& utf16) |