[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit cd4bea61227863dce4e0df5b39b2ca825d7800e9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 31 19:54:29 2003 +0000

    	Fix for 3466542, add a real minimum font size setting.
    
            Reviewed by john
    
            * WebView.subproj/WebPreferences.h:
            * WebView.subproj/WebPreferences.m:
            (+[WebPreferences initialize]):
            (-[WebPreferences setMinimumFontSize:]):
            (-[WebPreferences minimumLogicalFontSize]):
            (-[WebPreferences setMinimumLogicalFontSize:]):
            * WebView.subproj/WebView.m:
            (-[WebView _updateWebCoreSettingsFromPreferences:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5342 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 94053bf..05b0cb5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-10-31  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3466542, add a real minimum font size setting.
+	
+        Reviewed by john
+
+        * WebView.subproj/WebPreferences.h:
+        * WebView.subproj/WebPreferences.m:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences setMinimumFontSize:]):
+        (-[WebPreferences minimumLogicalFontSize]):
+        (-[WebPreferences setMinimumLogicalFontSize:]):
+        * WebView.subproj/WebView.m:
+        (-[WebView _updateWebCoreSettingsFromPreferences:]):
+
 2003-10-31  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index b2143c4..3f5f18e 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -142,6 +142,17 @@ extern NSString *WebPreferencesChangedNotification;
 - (void)setMinimumFontSize:(int)size;
 
 /*!
+    @method minimumLogicalFontSize
+*/
+- (int)minimumLogicalFontSize;
+
+/*!
+    @method setMinimumLogicalFontSize:
+    @param size
+*/
+- (void)setMinimumLogicalFontSize:(int)size;
+
+/*!
     @method defaultTextEncodingName
 */
 - (NSString *)defaultTextEncodingName;
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 449cf90..c262eb3 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -23,6 +23,7 @@
 #define WebKitCursiveFontPreferenceKey @"WebKitCursiveFont"
 #define WebKitFantasyFontPreferenceKey @"WebKitFantasyFont"
 #define WebKitMinimumFontSizePreferenceKey @"WebKitMinimumFontSize"
+#define WebKitMinimumLogicalFontSizePreferenceKey @"WebKitMinimumLogicalFontSize"
 #define WebKitDefaultFontSizePreferenceKey @"WebKitDefaultFontSize"
 #define WebKitDefaultFixedFontSizePreferenceKey @"WebKitDefaultFixedFontSize"
 #define WebKitDefaultTextEncodingNamePreferenceKey @"WebKitDefaultTextEncodingName"
@@ -202,7 +203,8 @@ NS_ENDHANDLER
         @"Helvetica",                   WebKitSansSerifFontPreferenceKey,
         @"Apple Chancery",              WebKitCursiveFontPreferenceKey,
         @"Papyrus",                     WebKitFantasyFontPreferenceKey,
-        @"9",                           WebKitMinimumFontSizePreferenceKey,
+        @"1",                           WebKitMinimumFontSizePreferenceKey,
+	@"9",                           WebKitMinimumLogicalFontSizePreferenceKey, 
         @"16",                          WebKitDefaultFontSizePreferenceKey,
         @"13",                          WebKitDefaultFixedFontSizePreferenceKey,
         @"ISO-8859-1",                  WebKitDefaultTextEncodingNamePreferenceKey,
@@ -399,6 +401,16 @@ NS_ENDHANDLER
     [self _setIntegerValue: size forKey: WebKitMinimumFontSizePreferenceKey];
 }
 
+- (int)minimumLogicalFontSize
+{
+  return [self _integerValueForKey: WebKitMinimumLogicalFontSizePreferenceKey];
+}
+
+- (void)setMinimumLogicalFontSize:(int)size
+{
+  [self _setIntegerValue: size forKey: WebKitMinimumLogicalFontSizePreferenceKey];
+}
+
 - (NSString *)defaultTextEncodingName
 {
     return [self _stringValueForKey: WebKitDefaultTextEncodingNamePreferenceKey];
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index af40071..31fce88 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -554,6 +554,7 @@ NSString *_WebMainFrameURLKey =         @"mainFrameURL";
     [_private->settings setJavaScriptEnabled:[preferences isJavaScriptEnabled]];
     [_private->settings setJavaScriptCanOpenWindowsAutomatically:[preferences javaScriptCanOpenWindowsAutomatically]];
     [_private->settings setMinimumFontSize:[preferences minimumFontSize]];
+    [_private->settings setMinimumLogicalFontSize:[preferences minimumLogicalFontSize]];
     [_private->settings setPluginsEnabled:[preferences arePlugInsEnabled]];
     [_private->settings setSansSerifFontFamily:[preferences sansSerifFontFamily]];
     [_private->settings setSerifFontFamily:[preferences serifFontFamily]];

-- 
WebKit Debian packaging