[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[kbalazs at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit d24de784d4374e8ec35288ba235c25c533af4949
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 14:56:14 2011 +0000

    2011-01-27  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt][WK2] Lots of layout test failures due to wrong font type
            https://bugs.webkit.org/show_bug.cgi?id=53233
    
            * Shared/WebPreferencesStore.h:
            Specialize default font families for Qt.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76797 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index ce48def..9bd9ddf 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-27  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt][WK2] Lots of layout test failures due to wrong font type
+        https://bugs.webkit.org/show_bug.cgi?id=53233
+
+        * Shared/WebPreferencesStore.h:
+        Specialize default font families for Qt.
+
 2011-01-26  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/Source/WebKit2/Shared/WebPreferencesStore.h b/Source/WebKit2/Shared/WebPreferencesStore.h
index 1826d88..a1e9f15 100644
--- a/Source/WebKit2/Shared/WebPreferencesStore.h
+++ b/Source/WebKit2/Shared/WebPreferencesStore.h
@@ -92,7 +92,7 @@ namespace WebKit {
     macro(SerifFontFamily, serifFontFamily, String, String, "Times New Roman") \
     \
 
-#else
+#elif PLATFORM(MAC)
 
 #define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
     macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
@@ -103,6 +103,17 @@ namespace WebKit {
     macro(SerifFontFamily, serifFontFamily, String, String, "Times") \
     \
 
+#elif PLATFORM(QT)
+
+#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
+    macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
+    macro(CursiveFontFamily, cursiveFontFamily, String, String, "Comic Sans MS") \
+    macro(FantasyFontFamily, fantasyFontFamily, String, String, "Impact") \
+    macro(FixedFontFamily, fixedFontFamily, String, String, "Courier New") \
+    macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Helvetica") \
+    macro(SerifFontFamily, serifFontFamily, String, String, "Times") \
+    \
+
 #endif
 
 #define FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \

-- 
WebKit Debian packaging