diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-05-26 15:59:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-26 15:59:02 -0700 |
| commit | fc3703708ecc211b0e0410a4c67562eef0abc645 (patch) | |
| tree | 1b85f15361a75c2a1a955d0afd524041beda7ff7 | |
| parent | 0b6add0fb0e2220c6c59b8840ae2d1884e575a57 (diff) | |
| parent | e34da8b408683ed4f0b8859ce243fb89dd9ccf83 (diff) | |
| download | external_webkit-fc3703708ecc211b0e0410a4c67562eef0abc645.zip external_webkit-fc3703708ecc211b0e0410a4c67562eef0abc645.tar.gz external_webkit-fc3703708ecc211b0e0410a4c67562eef0abc645.tar.bz2 | |
Merge "merge from honeycomb mr2"
| -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) |