Ticket #6118: fallback2.patch

WebKit/haiku/API/WebSettings.cpp

@@ -31 +31 @@
 #include "ApplicationCacheStorage.h"
 #include "BitmapImage.h"
 #include "DatabaseTracker.h"
+#include "FontPlatformData.h"
 #include "IconDatabase.h"
 #include "Image.h"
 #include "IntSize.h"
@@ -461 +462 @@
     case SERIF_FONT:
         fData->serifFontFamily = font;
         fData->serifFontFamilySet = true;
+        WebCore::FontPlatformData::SetFallBackSerifFont(font);
         break;
     case SANS_SERIF_FONT:
         fData->sansSerifFontFamily = font;
         fData->sansSerifFontFamilySet = true;
+        WebCore::FontPlatformData::SetFallBackSansSerifFont(font);
         break;
     case FIXED_FONT:
         fData->fixedFontFamily = font;
         fData->fixedFontFamilySet = true;
+        WebCore::FontPlatformData::SetFallBackFixedFont(font);
         break;
     case STANDARD_FONT:
         fData->standardFontFamily = font;
         fData->standardFontFamilySet = true;
+        WebCore::FontPlatformData::SetFallBackStandardFont(font);
         break;
     }
 }

WebCore/platform/graphics/haiku/FontPlatformData.h

@@ -32 +32 @@
 #include "FontDescription.h"
 #include "GlyphBuffer.h"
 #include <interface/Font.h>
+#include <support/String.h>
 
 namespace WebCore {
 
@@ -46 +47 @@
 
     ~FontPlatformData();
 
+    static void SetFallBackSerifFont(const BString& font);
+    static void SetFallBackSansSerifFont(const BString& font);
+    static void SetFallBackFixedFont(const BString& font);
+    static void SetFallBackStandardFont(const BString& font);
+
     FontPlatformData& operator=(const FontPlatformData&);
     bool operator==(const FontPlatformData&) const;
 
@@ -62 +68 @@
     String description() const;
 
 private:
+    static void findMatchingFontFamily(const AtomicString& familyName, font_family* fontFamily);
     class FontPlatformDataPrivate;
     FontPlatformDataPrivate* m_data;
+
+    static font_family m_FallbackSerifFontFamily;
+    static font_family m_FallbackSansSerifFontFamily;
+    static font_family m_FallbackFixedFontFamily;
+    static font_family m_FallbackStandardFontFamily;
+    
 };
 
 } // namespace WebCore

WebCore/platform/graphics/haiku/FontPlatformDataHaiku.cpp

@@ -28 +28 @@
 #include <wtf/text/CString.h>
 
 namespace WebCore {
+font_family FontPlatformData::m_FallbackSerifFontFamily= "DejaVu Sans";
+font_family FontPlatformData::m_FallbackSansSerifFontFamily = "DejaVu Serif";
+font_family FontPlatformData::m_FallbackFixedFontFamily = "DejaVu Mono";
+font_family FontPlatformData::m_FallbackStandardFontFamily = "DejaVu Serif";
 
 static inline bool isEmtpyValue(const float size, const bool bold, const bool oblique)
 {
@@ -35 +39 @@
     return !bold && !oblique && size == 0;
 }
 
-static void findMatchingFontFamily(const AtomicString& familyName, font_family* fontFamily)
+void
+FontPlatformData::findMatchingFontFamily(const AtomicString& familyName, font_family* fontFamily)
 {
     if (BFont().SetFamilyAndStyle(familyName.string().utf8().data(), 0) == B_OK)
         strncpy(*fontFamily, familyName.string().utf8().data(), B_FONT_FAMILY_LENGTH + 1);
     else {
         // If no font family is found for the given name, we use a generic font.
         if (familyName.contains("Sans", false) != B_ERROR)
-            strncpy(*fontFamily, "DejaVu Sans", B_FONT_FAMILY_LENGTH + 1);
+            strncpy(*fontFamily, m_FallbackSansSerifFontFamily, B_FONT_FAMILY_LENGTH + 1);
         else if (familyName.contains("Serif", false) != B_ERROR)
-            strncpy(*fontFamily, "DejaVu Serif", B_FONT_FAMILY_LENGTH + 1);
+            strncpy(*fontFamily, m_FallbackSerifFontFamily, B_FONT_FAMILY_LENGTH + 1);
         else if (familyName.contains("Mono", false) != B_ERROR)
-            strncpy(*fontFamily, "DejaVu Mono", B_FONT_FAMILY_LENGTH + 1);
+            strncpy(*fontFamily, m_FallbackFixedFontFamily, B_FONT_FAMILY_LENGTH + 1);
         else {
             // This is the fallback font.
-            strncpy(*fontFamily, "DejaVu Serif", B_FONT_FAMILY_LENGTH + 1);
+            strncpy(*fontFamily, m_FallbackStandardFontFamily, B_FONT_FAMILY_LENGTH + 1);
         }
     }
 }
@@ -307 +312 @@
     return String(fontFamily) + "/" + String(fontStyle) + String::format("/%.1f/%d&%d", size, isBold, isOblique);
 }
 
+void
+FontPlatformData::SetFallBackSerifFont(const BString& font)
+{
+    strncpy(m_FallbackSerifFontFamily, font.String(), B_FONT_FAMILY_LENGTH + 1);
+}
+
+void
+FontPlatformData::SetFallBackSansSerifFont(const BString& font)
+{
+    strncpy(m_FallbackSansSerifFontFamily, font.String(), B_FONT_FAMILY_LENGTH + 1);
+}
+
+void
+FontPlatformData::SetFallBackFixedFont(const BString& font)
+{
+    strncpy(m_FallbackFixedFontFamily, font.String(), B_FONT_FAMILY_LENGTH + 1);
+}
+
+void
+FontPlatformData::SetFallBackStandardFont(const BString& font)
+{
+    strncpy(m_FallbackStandardFontFamily, font.String(), B_FONT_FAMILY_LENGTH + 1);
+}
+
 } // namespace WebCore