[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 361b126accb35308b8138f648cec54e01be17cff
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 6 00:46:11 2002 +0000

        Replaced mechanism for setting array of 7 font sizes from user's chosen
        font size with a far simpler one that gets better results.
    
    	* Preferences.subproj/TextPreferences.m:
    	(-[TextPreferences defaultFontSize]): Renamed from mediumFontSize
    	(-[TextPreferences setDefaultFontSize:]): Renamed from setMediumFontSize;
    	now does everything by computation, no table involved.
    	(-[TextPreferences updateFontSampleField:]), (-[TextPreferences changeFont:]):
    	updated for name changes.
    	* Defaults.plist: Tweak default sizes so they match what algorithm returns.
    
    	* WebView.subproj/IFWebDataSource.mm: (+[IFWebDataSource initialize]):
    	Tweak default font sizes so they match what algorithm used in Alexander
    	returns.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e0dd0f8..8e23c97 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-05  John Sullivan  <sullivan at apple.com>
+
+	* WebView.subproj/IFWebDataSource.mm: (+[IFWebDataSource initialize]):
+	Tweak default font sizes so they match what algorithm used in Alexander
+	returns.
+
 2002-03-05  Richard Williamson  <rjw at apple.com>
 
         Pass errors correctly to browser.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e0dd0f8..8e23c97 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-03-05  John Sullivan  <sullivan at apple.com>
+
+	* WebView.subproj/IFWebDataSource.mm: (+[IFWebDataSource initialize]):
+	Tweak default font sizes so they match what algorithm used in Alexander
+	returns.
+
 2002-03-05  Richard Williamson  <rjw at apple.com>
 
         Pass errors correctly to browser.
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 99094b0..7419132 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:@"6", @"8", @"10", @"12", @"14", @"18", @"30", nil];
+    NSArray *fontSizeArray = [NSArray arrayWithObjects:@"6", @"8", @"9", @"11", @"14", @"16", @"20", 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 99094b0..7419132 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:@"6", @"8", @"10", @"12", @"14", @"18", @"30", nil];
+    NSArray *fontSizeArray = [NSArray arrayWithObjects:@"6", @"8", @"9", @"11", @"14", @"16", @"20", nil];
     NSNumber *pluginsEnabled = [NSNumber numberWithBool:TRUE];
     NSNumber *javaEnabled = [NSNumber numberWithBool:FALSE];
     

-- 
WebKit Debian packaging