diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-05-26 15:45:39 -0700 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2011-05-26 15:45:39 -0700 |
| commit | e34da8b408683ed4f0b8859ce243fb89dd9ccf83 (patch) | |
| tree | 754f25b206623c909a39bc96952d458a539a4008 /Source/WebCore | |
| parent | 40e04567ebf81b0600a4ee02831215c653d157cd (diff) | |
| download | external_webkit-e34da8b408683ed4f0b8859ce243fb89dd9ccf83.zip external_webkit-e34da8b408683ed4f0b8859ce243fb89dd9ccf83.tar.gz external_webkit-e34da8b408683ed4f0b8859ce243fb89dd9ccf83.tar.bz2 | |
merge from honeycomb mr2
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: I8fdcb804f8ad4c9b34a8a4ea88ce39c49b364ccc
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontCacheAndroid.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontCacheAndroid.cpp b/Source/WebCore/platform/graphics/android/FontCacheAndroid.cpp index 428628c..20ffd17 100644 --- a/Source/WebCore/platform/graphics/android/FontCacheAndroid.cpp +++ b/Source/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) |