diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-05-26 15:18:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 15:18:52 -0700 |
| commit | adef70b313908ec0945a678eb665ffc1e9d373dd (patch) | |
| tree | b077eba1adefd7eec8061f2450cafc9bdb99db1d | |
| parent | 4ce956cc43762bec0962eae9707369b235c354a2 (diff) | |
| parent | 0da3e5e1d2b913ba0c47bfd1c7923bbce60faa6a (diff) | |
| download | webkit-honeycomb-LTE-release.tar.gz | |
am 0da3e5e1: Update isFallbackFamily() with missing fontsandroid-3.2.4_r1android-3.2.2_r2android-3.2.2_r1honeycomb-LTE-release
* commit '0da3e5e1d2b913ba0c47bfd1c7923bbce60faa6a':
Update isFallbackFamily() with missing fonts
| -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 428628ced..20ffd17c6 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) |