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

diff --git a/WebCore/platform/graphics/android/FontCacheAndroid.cpp b/WebCore/platform/graphics/android/FontCacheAndroid.cpp
index 428628c..20ffd17 100644 (file)
--- 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)