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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f562f40f5213e106f5840e019ee69565f3253314
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 21:51:30 2010 +0000

    Fix failing API test. The default san serif font on the mac
    should be Helvetica, not Courier.
    
    Reviewed by Gavin Barraclough.
    
    * Shared/WebPreferencesStore.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73297 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4df071c..2b5f99f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-03  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Gavin Barraclough.
+
+        Fix failing API test. The default san serif font on the mac
+        should be Helvetica, not Courier.
+
+        * Shared/WebPreferencesStore.h:
+
 2010-12-03  Jia Pu  <jpu at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index 10adedf..d0d58b6 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -81,7 +81,7 @@ namespace WebKit {
     macro(CursiveFontFamily, cursiveFontFamily, String, String, "Apple Chancery") \
     macro(FantasyFontFamily, fantasyFontFamily, String, String, "Papyrus") \
     macro(FixedFontFamily, fixedFontFamily, String, String, "Courier") \
-    macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Courier") \
+    macro(SansSerifFontFamily, sansSerifFontFamily, String, String, "Helvetica") \
     macro(SerifFontFamily, serifFontFamily, String, String, "Times") \
     \
 

-- 
WebKit Debian packaging