[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 baeefb185ee1459bf29b609f3ab37d91b6a9bb09
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 5 18:40:55 2002 +0000

    	* WebView.subproj/IFWebDataSource.mm: (+[IFWebDataSource initialize]):
    	Changed default font sizes to match scheme used in Alexander. There are
    	some serious wackinesses with KDE engine font size handling; if and when
    	we address those we might revisit these default sizes.
    
        Made font size preference in Alexander work.
    
    	* Defaults.plist: Added font size defaults that match those in WebKit (since
    	Alexander Preferences window may use these before WebKit is initialized)
    	* PreferenceKeys.h: Removed old single-size default; added key for size array.
    
    	* Preferences.subproj/TextPreferences.m:
    	(-[TextPreferences mediumFontSize]): New convenience method to get the size
    	that's displayed in the Preferences UI.
    	(-[TextPreferences setMediumFontSize:]): New method to convert the user's
    	chosen size into a size array, and store that array in user defaults.
    	(-[TextPreferences updateFontSampleField:]),
    	(-[TextPreferences changeFont:]): Use new API.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ac0f685..4b90d41 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-05  John Sullivan  <sullivan at apple.com>
+
+	* WebView.subproj/IFWebDataSource.mm: (+[IFWebDataSource initialize]):
+	Changed default font sizes to match scheme used in Alexander. There are
+	some serious wackinesses with KDE engine font size handling; if and when
+	we address those we might revisit these default sizes.
+
 2002-03-05  Maciej Stachowiak  <mjs at apple.com>
 
 	Removed references to IFAuthenticationHandler, since that protocol
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ac0f685..4b90d41 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-03-05  John Sullivan  <sullivan at apple.com>
+
+	* WebView.subproj/IFWebDataSource.mm: (+[IFWebDataSource initialize]):
+	Changed default font sizes to match scheme used in Alexander. There are
+	some serious wackinesses with KDE engine font size handling; if and when
+	we address those we might revisit these default sizes.
+
 2002-03-05  Maciej Stachowiak  <mjs at apple.com>
 
 	Removed references to IFAuthenticationHandler, since that protocol
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 717c9bf..4aba657 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -26,7 +26,7 @@ static id IFWebDataSourceMake(void *url)
 + (void)initialize {
 
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSArray *fontSizeArray = [NSArray arrayWithObjects:@"7", @"8", @"9", @"10", @"12", @"13", @"14", @"16", nil];
+    NSArray *fontSizeArray = [NSArray arrayWithObjects:@"6", @"8", @"10", @"12", @"14", @"18", @"30", nil];
     NSNumber *pluginsEnabled = [NSNumber numberWithBool:TRUE];
     NSNumber *javaEnabled = [NSNumber numberWithBool:FALSE];
     
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 717c9bf..4aba657 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -26,7 +26,7 @@ static id IFWebDataSourceMake(void *url)
 + (void)initialize {
 
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSArray *fontSizeArray = [NSArray arrayWithObjects:@"7", @"8", @"9", @"10", @"12", @"13", @"14", @"16", nil];
+    NSArray *fontSizeArray = [NSArray arrayWithObjects:@"6", @"8", @"10", @"12", @"14", @"18", @"30", nil];
     NSNumber *pluginsEnabled = [NSNumber numberWithBool:TRUE];
     NSNumber *javaEnabled = [NSNumber numberWithBool:FALSE];
     

-- 
WebKit Debian packaging