diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-26 15:24:48 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-05-26 15:25:04 -0700 |
| commit | 3ae2cf5eef8df00445146297df2bef1f74537dbf (patch) | |
| tree | 5d3ad3caf3844199e54dfb2b343af587cbc088ca | |
| parent | 06295b42c1937e8da9932a105dbb47d75977a6f6 (diff) | |
| parent | adef70b313908ec0945a678eb665ffc1e9d373dd (diff) | |
| download | external_webkit-3ae2cf5eef8df00445146297df2bef1f74537dbf.zip external_webkit-3ae2cf5eef8df00445146297df2bef1f74537dbf.tar.gz external_webkit-3ae2cf5eef8df00445146297df2bef1f74537dbf.tar.bz2 | |
Merge from honeycomb-LTE - do not merge
Change-Id: Ic966b478eb67830bfe44fbf4d3b7984508300c66
| -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) |