[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jhoneycutt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 2c10da32d426d5efe9be5a8c1be417eb0dab9eb4
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 23:17:39 2010 +0000

    WebKit2 on Windows should use Windows fonts for the various standard
    font families
    https://bugs.webkit.org/show_bug.cgi?id=43499
    <rdar://problem/8272758>
    
    Reviewed by Adam Roben.
    
    WebKit2:
    
    * Shared/WebPreferencesStore.cpp:
    (WebKit::WebPreferencesStore::WebPreferencesStore):
    Use Windows fonts on Windows.
    
    WebKitTools:
    
    * WebKitTestRunner/TestController.cpp:
    (WTR::TestController::resetStateToConsistentValues):
    Use the Mac fonts for running tests. This matches DRT behavior.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68849 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1a98ef8..d777e5f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-29  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        WebKit2 on Windows should use Windows fonts for the various standard
+        font families
+        https://bugs.webkit.org/show_bug.cgi?id=43499
+        <rdar://problem/8272758>
+
+        Reviewed by Adam Roben.
+
+        * Shared/WebPreferencesStore.cpp:
+        (WebKit::WebPreferencesStore::WebPreferencesStore):
+        Use Windows fonts on Windows.
+
 2010-09-30  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/Shared/WebPreferencesStore.cpp b/WebKit2/Shared/WebPreferencesStore.cpp
index f2a6c67..7f814f5 100644
--- a/WebKit2/Shared/WebPreferencesStore.cpp
+++ b/WebKit2/Shared/WebPreferencesStore.cpp
@@ -45,12 +45,21 @@ WebPreferencesStore::WebPreferencesStore()
     , minimumLogicalFontSize(9)
     , defaultFontSize(16)
     , defaultFixedFontSize(13)
+#if PLATFORM(WIN)
+    , standardFontFamily("Times New Roman")
+    , cursiveFontFamily("Comic Sans MS")
+    , fantasyFontFamily("Comic Sans MS")
+    , fixedFontFamily("Courier New")
+    , sansSerifFontFamily("Arial")
+    , serifFontFamily("Times New Roman")
+#else
     , standardFontFamily("Times")
     , cursiveFontFamily("Apple Chancery")
     , fantasyFontFamily("Papyrus")
     , fixedFontFamily("Courier")
     , sansSerifFontFamily("Helvetica")
     , serifFontFamily("Times")
+#endif
 {
 }
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index efb0d0c..8bc2086 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-29  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        WebKit2 on Windows should use Windows fonts for the various standard
+        font families
+        https://bugs.webkit.org/show_bug.cgi?id=43499
+        <rdar://problem/8272758>
+
+        Reviewed by Adam Roben.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::resetStateToConsistentValues):
+        Use the Mac fonts for running tests. This matches DRT behavior.
+
 2010-09-30  Adam Barth  <abarth at webkit.org>
 
         Third attempt.  We need a better integration test environment.
diff --git a/WebKitTools/WebKitTestRunner/TestController.cpp b/WebKitTools/WebKitTestRunner/TestController.cpp
index fc2e28d..efd893d 100644
--- a/WebKitTools/WebKitTestRunner/TestController.cpp
+++ b/WebKitTools/WebKitTestRunner/TestController.cpp
@@ -208,6 +208,20 @@ void TestController::resetStateToConsistentValues()
     WKPreferencesSetFontSmoothingLevel(preferences, kWKFontSmoothingLevelNoSubpixelAntiAliasing);
     WKPreferencesSetXSSAuditorEnabled(preferences, false);
 
+    static WKStringRef standardFontFamily = WKStringCreateWithCFString(CFSTR("Times"));
+    static WKStringRef cursiveFontFamily = WKStringCreateWithCFString(CFSTR("Apple Chancery"));
+    static WKStringRef fantasyFontFamily = WKStringCreateWithCFString(CFSTR("Papyrus"));
+    static WKStringRef fixedFontFamily = WKStringCreateWithCFString(CFSTR("Courier"));
+    static WKStringRef sansSerifFontFamily = WKStringCreateWithCFString(CFSTR("Helvetica"));
+    static WKStringRef serifFontFamily = WKStringCreateWithCFString(CFSTR("Times"));
+
+    WKPreferencesSetStandardFontFamily(preferences, standardFontFamily);
+    WKPreferencesSetCursiveFontFamily(preferences, cursiveFontFamily);
+    WKPreferencesSetFantasyFontFamily(preferences, fantasyFontFamily);
+    WKPreferencesSetFixedFontFamily(preferences, fixedFontFamily);
+    WKPreferencesSetSansSerifFontFamily(preferences, sansSerifFontFamily);
+    WKPreferencesSetSerifFontFamily(preferences, serifFontFamily);
+
     m_mainWebView->focus();
 
     // Reset main page back to about:blank

-- 
WebKit Debian packaging