Changeset 44015 in webkit

Timestamp:

May 21, 2009 5:15:48 PM (15 years ago)

Author:

levin@chromium.org

Message:

2009-05-21 Evan Martin <​evan@chromium.org>

Reviewed by Eric Seidel.

Flesh out font fallback for Chromium's Skia port.
getLastResortFallbackFont should fall back on well-known fonts.
​https://bugs.webkit.org/show_bug.cgi?id=25860

• platform/graphics/chromium/FontCacheLinux.cpp: (WebCore::FontCache::getLastResortFallbackFont): try known font names.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontCacheLinux.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-05-21  Evan Martin  <evan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Flesh out font fallback for Chromium's Skia port.
+        getLastResortFallbackFont should fall back on well-known fonts.
+        https://bugs.webkit.org/show_bug.cgi?id=25860
+
+        * platform/graphics/chromium/FontCacheLinux.cpp:
+        (WebCore::FontCache::getLastResortFallbackFont): try known font names.
+
 2009-05-21  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/platform/graphics/chromium/FontCacheLinux.cpp

@@ -46 +46 @@
 #include "SkTypeface.h"
 #include "SkUtils.h"
+
+#include <wtf/Assertions.h>
 
 namespace WebCore {
@@ -98 +100 @@
 FontPlatformData* FontCache::getLastResortFallbackFont(const FontDescription& description)
 {
-    static AtomicString arialStr("Arial");
-    return getCachedFontPlatformData(description, arialStr);
+    static const AtomicString sansStr("Sans");
+    static const AtomicString serifStr("Serif");
+    static const AtomicString monospaceStr("Monospace");
+
+    FontPlatformData* fontPlatformData = 0;
+    switch (description.genericFamily()) {
+    case FontDescription::SerifFamily:
+        fontPlatformData = getCachedFontPlatformData(description, serifStr);
+        break;
+    case FontDescription::MonospaceFamily:
+        fontPlatformData = getCachedFontPlatformData(description, monospaceStr);
+        break;
+    case FontDescription::SansSerifFamily:
+    default:
+        fontPlatformData = getCachedFontPlatformData(description, sansStr);
+        break;
+    }
+
+    ASSERT(fontPlatformData);
+    return fontPlatformData;
 }