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

[sullivan at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4e69d7702806bb678fa81306d2e9eba6185866ef
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 6 16:45:46 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=50504
    Expose some more WebCore settings in WebKit2 preferences
    
    Reviewed by Adam Roben.
    
    * Shared/WebPreferencesStore.h:
    Changed name of existing FOR_EACH_WEBKIT_STRING_PREFERENCE macro to
    FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE since it was all about platform-specific
    font families, and I'm now introducing a non-platform-spacific string, and
    I didn't want to put the new preference in two platform-specific lists. Then
    added a new FOR_EACH_WEBKIT_STRING_PREFERENCE to hold the new preference. Note
    that the other preferences exposed in this patch were already declared here.
    
    * UIProcess/API/C/WKPreferences.cpp:
    (WKPreferencesSetDefaultFontSize):
    New wrapper.
    (WKPreferencesGetDefaultFontSize):
    Ditto.
    (WKPreferencesSetDefaultFixedFontSize):
    Ditto.
    (WKPreferencesGetDefaultFixedFontSize):
    Ditto.
    (WKPreferencesSetDefaultTextEncodingName):
    Ditto.
    (WKPreferencesCopyDefaultTextEncodingName):
    Ditto.
    
    * UIProcess/API/C/WKPreferences.h:
    Declare new wrappers.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73370 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0c2c4c7..97d633e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,35 @@
+2010-12-03  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Adam Roben.
+
+        https://bugs.webkit.org/show_bug.cgi?id=50504
+        Expose some more WebCore settings in WebKit2 preferences
+
+        * Shared/WebPreferencesStore.h:
+        Changed name of existing FOR_EACH_WEBKIT_STRING_PREFERENCE macro to
+        FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE since it was all about platform-specific
+        font families, and I'm now introducing a non-platform-spacific string, and
+        I didn't want to put the new preference in two platform-specific lists. Then
+        added a new FOR_EACH_WEBKIT_STRING_PREFERENCE to hold the new preference. Note
+        that the other preferences exposed in this patch were already declared here.
+        
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetDefaultFontSize):
+        New wrapper.
+        (WKPreferencesGetDefaultFontSize):
+        Ditto.
+        (WKPreferencesSetDefaultFixedFontSize):
+        Ditto.
+        (WKPreferencesGetDefaultFixedFontSize):
+        Ditto.
+        (WKPreferencesSetDefaultTextEncodingName):
+        Ditto.
+        (WKPreferencesCopyDefaultTextEncodingName):
+        Ditto.
+        
+        * UIProcess/API/C/WKPreferences.h:
+        Declare new wrappers.
+
 2010-12-05  Adam Roben  <aroben at apple.com>
 
         Windows production build fix
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index 3ebc4bc..7a634b9 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -64,9 +64,13 @@ namespace WebKit {
     macro(DefaultFixedFontSize, defaultFixedFontSize, UInt32, uint32_t, 13) \
     \
 
+#define FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
+    macro(DefaultTextEncodingName, defaultTextEncodingName, String, String, "ISO-8859-1") \
+    \
+
 #if PLATFORM(WIN)
 
-#define FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
+#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
     macro(StandardFontFamily, standardFontFamily, String, String, "Times New Roman") \
     macro(CursiveFontFamily, cursiveFontFamily, String, String, "Comic Sans MS") \
     macro(FantasyFontFamily, fantasyFontFamily, String, String, "Comic Sans MS") \
@@ -77,7 +81,7 @@ namespace WebKit {
 
 #else
 
-#define FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
+#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
     macro(StandardFontFamily, standardFontFamily, String, String, "Times") \
     macro(CursiveFontFamily, cursiveFontFamily, String, String, "Apple Chancery") \
     macro(FantasyFontFamily, fantasyFontFamily, String, String, "Papyrus") \
@@ -92,6 +96,7 @@ namespace WebKit {
     FOR_EACH_WEBKIT_BOOL_PREFERENCE(macro) \
     FOR_EACH_WEBKIT_UINT32_PREFERENCE(macro) \
     FOR_EACH_WEBKIT_STRING_PREFERENCE(macro) \
+    FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \
     \
 
 namespace WebPreferencesKey {
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index 7789215..ce579af 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -210,6 +210,26 @@ WKStringRef WKPreferencesCopyFantasyFontFamily(WKPreferencesRef preferencesRef)
     return toCopiedAPI(toImpl(preferencesRef)->fantasyFontFamily());
 }
 
+void WKPreferencesSetDefaultFontSize(WKPreferencesRef preferencesRef, uint32_t size)
+{
+    toImpl(preferencesRef)->setDefaultFontSize(size);
+}
+
+uint32_t WKPreferencesGetDefaultFontSize(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->defaultFontSize();
+}
+
+void WKPreferencesSetDefaultFixedFontSize(WKPreferencesRef preferencesRef, uint32_t size)
+{
+    toImpl(preferencesRef)->setDefaultFixedFontSize(size);
+}
+
+uint32_t WKPreferencesGetDefaultFixedFontSize(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->defaultFixedFontSize();
+}
+
 void WKPreferencesSetMinimumFontSize(WKPreferencesRef preferencesRef, uint32_t size)
 {
     toImpl(preferencesRef)->setMinimumFontSize(size);
@@ -220,6 +240,16 @@ uint32_t WKPreferencesGetMinimumFontSize(WKPreferencesRef preferencesRef)
     return toImpl(preferencesRef)->minimumFontSize();
 }
 
+void WKPreferencesSetDefaultTextEncodingName(WKPreferencesRef preferencesRef, WKStringRef name)
+{
+    toImpl(preferencesRef)->setDefaultTextEncodingName(toWTFString(name));
+}
+
+WKStringRef WKPreferencesCopyDefaultTextEncodingName(WKPreferencesRef preferencesRef)
+{
+    return toCopiedAPI(toImpl(preferencesRef)->defaultTextEncodingName());
+}
+
 void WKPreferencesSetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef, bool enabled)
 {
     toImpl(preferencesRef)->setPrivateBrowsingEnabled(enabled);
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.h b/WebKit2/UIProcess/API/C/WKPreferences.h
index cd8ec50..8a44527 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.h
+++ b/WebKit2/UIProcess/API/C/WKPreferences.h
@@ -99,10 +99,21 @@ WK_EXPORT WKStringRef WKPreferencesCopyCursiveFontFamily(WKPreferencesRef prefer
 WK_EXPORT void WKPreferencesSetFantasyFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
 WK_EXPORT WKStringRef WKPreferencesCopyFantasyFontFamily(WKPreferencesRef preferencesRef);
 
+// Defaults to 16.
+WK_EXPORT void WKPreferencesSetDefaultFontSize(WKPreferencesRef preferencesRef, uint32_t);
+WK_EXPORT uint32_t WKPreferencesGetDefaultFontSize(WKPreferencesRef preferencesRef);
+
+// Defaults to 13.
+WK_EXPORT void WKPreferencesSetDefaultFixedFontSize(WKPreferencesRef preferencesRef, uint32_t);
+WK_EXPORT uint32_t WKPreferencesGetDefaultFixedFontSize(WKPreferencesRef preferencesRef);
+
 // Defaults to 0.
 WK_EXPORT void WKPreferencesSetMinimumFontSize(WKPreferencesRef preferencesRef, uint32_t);
 WK_EXPORT uint32_t WKPreferencesGetMinimumFontSize(WKPreferencesRef preferencesRef);
 
+WK_EXPORT void WKPreferencesSetDefaultTextEncodingName(WKPreferencesRef preferencesRef, WKStringRef name);
+WK_EXPORT WKStringRef WKPreferencesCopyDefaultTextEncodingName(WKPreferencesRef preferencesRef);
+
 // Defaults to false.
 WK_EXPORT void WKPreferencesSetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef, bool enabled);
 WK_EXPORT bool WKPreferencesGetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef);

-- 
WebKit Debian packaging