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

[sullivan at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 87cdddddec4bb7c7312896706b519d3e92b7b49d
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 1 20:37:20 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=48774
    minimFontSize preference needs to be exposed in WebKit2
    
    Reviewed by Anders Carlsson.
    
    * UIProcess/WebPreferences.cpp:
    (WebKit::WebPreferences::setMinimumFontSize):
    New function, parallel to existing functions for other preferences.
    (WebKit::WebPreferences::minimumFontSize):
    Ditto.
    
    * UIProcess/WebPreferences.h:
    Declared new function.
    
    * UIProcess/API/C/WKPreferences.cpp:
    (WKPreferencesSetMinimumFontSize):
    New UI process wrapper for new function.
    (WKPreferencesGetMinimumFontSize):
    Ditto.
    
    * UIProcess/API/C/WKPreferences.h:
    Declared new functions.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71048 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f88dda9..0da0bad 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,28 @@
+2010-11-01  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48774
+        minimFontSize preference needs to be exposed in WebKit2
+
+        * UIProcess/WebPreferences.cpp:
+        (WebKit::WebPreferences::setMinimumFontSize):
+        New function, parallel to existing functions for other preferences.
+        (WebKit::WebPreferences::minimumFontSize):
+        Ditto.
+
+        * UIProcess/WebPreferences.h:
+        Declared new function.
+
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetMinimumFontSize):
+        New UI process wrapper for new function.
+        (WKPreferencesGetMinimumFontSize):
+        Ditto.
+
+        * UIProcess/API/C/WKPreferences.h:
+        Declared new functions.
+
 2010-11-01  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebKit2/UIProcess/API/C/WKPreferences.cpp b/WebKit2/UIProcess/API/C/WKPreferences.cpp
index 69e8e47..cfd021e 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.cpp
+++ b/WebKit2/UIProcess/API/C/WKPreferences.cpp
@@ -189,6 +189,16 @@ WKStringRef WKPreferencesCopyFantasyFontFamily(WKPreferencesRef preferencesRef)
     return toCopiedAPI(toImpl(preferencesRef)->fantasyFontFamily());
 }
 
+void WKPreferencesSetMinimumFontSize(WKPreferencesRef preferencesRef, uint32_t size)
+{
+    toImpl(preferencesRef)->setMinimumFontSize(size);
+}
+
+uint32_t WKPreferencesGetMinimumFontSize(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->minimumFontSize();
+}
+
 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 fb9f633..16f7742 100644
--- a/WebKit2/UIProcess/API/C/WKPreferences.h
+++ b/WebKit2/UIProcess/API/C/WKPreferences.h
@@ -91,6 +91,10 @@ WK_EXPORT WKStringRef WKPreferencesCopyCursiveFontFamily(WKPreferencesRef prefer
 WK_EXPORT void WKPreferencesSetFantasyFontFamily(WKPreferencesRef preferencesRef, WKStringRef family);
 WK_EXPORT WKStringRef WKPreferencesCopyFantasyFontFamily(WKPreferencesRef preferencesRef);
 
+// Defaults to 1, which means "no minimum".
+WK_EXPORT void WKPreferencesSetMinimumFontSize(WKPreferencesRef preferencesRef, uint32_t);
+WK_EXPORT uint32_t WKPreferencesGetMinimumFontSize(WKPreferencesRef preferencesRef);
+
 // Defaults to false.
 WK_EXPORT void WKPreferencesSetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef, bool enabled);
 WK_EXPORT bool WKPreferencesGetPrivateBrowsingEnabled(WKPreferencesRef preferencesRef);
diff --git a/WebKit2/UIProcess/WebPreferences.cpp b/WebKit2/UIProcess/WebPreferences.cpp
index 517e743..70edd8e 100644
--- a/WebKit2/UIProcess/WebPreferences.cpp
+++ b/WebKit2/UIProcess/WebPreferences.cpp
@@ -251,6 +251,17 @@ const String& WebPreferences::fantasyFontFamily() const
     return m_store.fantasyFontFamily;
 }
 
+void WebPreferences::setMinimumFontSize(uint32_t size)
+{
+    m_store.minimumFontSize = size;
+    update();
+}
+
+uint32_t WebPreferences::minimumFontSize() const
+{
+    return m_store.minimumFontSize;
+}
+
 void WebPreferences::setAcceleratedCompositingEnabled(bool flag)
 {
     m_store.acceleratedCompositingEnabled = flag;
diff --git a/WebKit2/UIProcess/WebPreferences.h b/WebKit2/UIProcess/WebPreferences.h
index 6668292..0dc9da1 100644
--- a/WebKit2/UIProcess/WebPreferences.h
+++ b/WebKit2/UIProcess/WebPreferences.h
@@ -103,6 +103,9 @@ public:
 
     void setFantasyFontFamily(const String&);
     const String& fantasyFontFamily() const;
+    
+    void setMinimumFontSize(uint32_t);
+    uint32_t minimumFontSize() const;
 
     void setAcceleratedCompositingEnabled(bool);
     bool acceleratedCompositingEnabled() const;

-- 
WebKit Debian packaging