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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit e281a77eac4e3ea95264f781ee81f68898b71e75
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 6 16:21:26 2002 +0000

    WebKit:
    
    	WebKit part of fix for 3017539 -- Replace Serif and Sans-serif
    	font preferences with Default preference; let fixed width font
    	size be independent.
    
    
            * WebView.subproj/WebPreferences.h:
            * WebView.subproj/WebPreferences.m:
            (+[WebPreferences load]): Add default value for fixed width size
            (-[WebPreferences fixedFontSize]),
            (-[WebPreferences setFixedFontSize:]): New methods.
    
    WebBrowser:
    
    	WebBrowser part of fix for 3017539 -- Replace Serif and Sans-serif
    	font preferences with Default preference; let fixed width font
    	size be independent.
    
            * Preferences.subproj/TextPreferences.h:
            * Preferences.subproj/TextPreferences.m:
            (-[TextPreferences updateFontSampleField:]):
            (-[TextPreferences updateFontSampleFields]):
            (-[TextPreferences chooseFont:]):
            (-[TextPreferences chooseStandardFont:]):
            (-[TextPreferences changeFont:]):
            (-[TextPreferences initializeFromDefaults]):
    	Removed serif and sans-serif code, replaced with standard font.
    	Made font sizes independent of each other.
    
            * Preferences.subproj/English.lproj/TextPreferences.nib:
    	Futzed with Interface Builder.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1748 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index df480c7..023db58 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-08-06  John Sullivan  <sullivan at apple.com>
+
+	WebKit part of fix for 3017539 -- Replace Serif and Sans-serif
+	font preferences with Default preference; let fixed width font
+	size be independent.
+
+
+        * WebView.subproj/WebPreferences.h:
+        * WebView.subproj/WebPreferences.m:
+        (+[WebPreferences load]): Add default value for fixed width size
+        (-[WebPreferences fixedFontSize]),
+        (-[WebPreferences setFixedFontSize:]): New methods.
+
 2002-08-06  Darin Adler  <darin at apple.com>
 
 	- fixed 3017536 -- Change default font to Lucida Grande 14 pt.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index df480c7..023db58 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-08-06  John Sullivan  <sullivan at apple.com>
+
+	WebKit part of fix for 3017539 -- Replace Serif and Sans-serif
+	font preferences with Default preference; let fixed width font
+	size be independent.
+
+
+        * WebView.subproj/WebPreferences.h:
+        * WebView.subproj/WebPreferences.m:
+        (+[WebPreferences load]): Add default value for fixed width size
+        (-[WebPreferences fixedFontSize]),
+        (-[WebPreferences setFixedFontSize:]): New methods.
+
 2002-08-06  Darin Adler  <darin at apple.com>
 
 	- fixed 3017536 -- Change default font to Lucida Grande 14 pt.
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index 7b84d36..75faee5 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -32,6 +32,9 @@
 - (int)defaultFontSize;
 - (void)setDefaultFontSize:(int)size;
 
+- (int)fixedFontSize;
+- (void)setFixedFontSize:(int)size;
+
 - (int)minimumFontSize;
 - (void)setMinimumFontSize:(int)size;
 
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index dd894e3..e8eab96 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -16,6 +16,7 @@
 #define        WebKitFantasyFontPreferenceKey                @"WebKitFantasyFont"
 #define        WebKitMinimumFontSizePreferenceKey        @"WebKitMinimumFontSize"
 #define        WebKitDefaultFontSizePreferenceKey        @"WebKitDefaultFontSize"
+#define	       WebKitFixedFontSizePreferenceKey		 @"WebKitFixedFontSize"
 #define        WebKitJavaEnabledPreferenceKey                @"WebKitJavaEnabled"
 #define        WebKitJavaScriptEnabledPreferenceKey        @"WebKitJavaScriptEnabled"
 #define        WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey        @"WebKitJavaScriptCanOpenWindowsAutomatically"
@@ -65,6 +66,7 @@ static WebPreferences *_standardPreferences = nil;
         @"Papyrus",                     WebKitFantasyFontPreferenceKey,
         @"6",                           WebKitMinimumFontSizePreferenceKey,
         @"14",                          WebKitDefaultFontSizePreferenceKey,
+        @"14", 				WebKitFixedFontSizePreferenceKey,
         @"1.85",                        WebKitInitialTimedLayoutDelayPreferenceKey,
         @"4096",                        WebKitInitialTimedLayoutSizePreferenceKey,
         @"1.85",                        WebKitResourceTimedLayoutDelayPreferenceKey,
@@ -153,6 +155,16 @@ static WebPreferences *_standardPreferences = nil;
     [[NSUserDefaults standardUserDefaults] setInteger:size forKey:WebKitDefaultFontSizePreferenceKey];
 }
 
+- (int)fixedFontSize
+{
+    return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitFixedFontSizePreferenceKey];
+}
+
+- (void)setFixedFontSize:(int)size
+{
+    [[NSUserDefaults standardUserDefaults] setInteger:size forKey:WebKitFixedFontSizePreferenceKey];
+}
+
 - (int)minimumFontSize
 {
     return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitMinimumFontSizePreferenceKey];

-- 
WebKit Debian packaging