Changeset 57517 in webkit

Timestamp:

Apr 13, 2010 8:31:19 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-13 Stephan Aßmus <​superstippi@gmx.de>

Reviewed by David Levin.

[Haiku] Use the system's default font family as last fall back font.
​https://bugs.webkit.org/show_bug.cgi?id=37501

No new tests needed.

• platform/graphics/haiku/FontCacheHaiku.cpp: (WebCore::FontCache::getLastResortFallbackFont):
  • Use the system's default font family (from be_plain_font global).

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/haiku/FontCacheHaiku.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-13  Stephan Aßmus  <superstippi@gmx.de>
+
+        Reviewed by David Levin.
+
+        [Haiku] Use the system's default font family as last fall back font.
+        https://bugs.webkit.org/show_bug.cgi?id=37501
+
+        No new tests needed.
+
+        * platform/graphics/haiku/FontCacheHaiku.cpp:
+        (WebCore::FontCache::getLastResortFallbackFont):
+            - Use the system's default font family (from be_plain_font global).
+
 2010-04-13  Eskil Blomfeldt <eblomfel@trolltech.com>, Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/WebCore/platform/graphics/haiku/FontCacheHaiku.cpp

@@ -2 +2 @@
  * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com>
+ * Copyright (C) 2010 Stephan Aßmus <superstippi@gmx.de>
  *
  * All rights reserved.
@@ -38 +39 @@
 #include "NotImplemented.h"
 #include <String.h>
-
+#include <interface/Font.h>
 
 namespace WebCore {
@@ -60 +61 @@
 SimpleFontData* FontCache::getLastResortFallbackFont(const FontDescription& fontDescription)
 {
-    // FIXME: Would be even better to somehow get the user's default font here.
-    // For now we'll pick the default that the user would get without changing any prefs.
-    static AtomicString defaultString("DejaVu Serif");
-    return getCachedFontData(fontDescription, defaultString);
+    font_family family;
+    font_style style;
+    be_plain_font->GetFamilyAndStyle(&family, &style);
+    AtomicString plainFontFamily(family);
+    return getCachedFontData(fontDescription, plainFontFamily);
 }