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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 655d55370a0232d0e5ffcb041aa216d6b134ece0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 4 03:10:29 2002 +0000

            Added a preference to change the page cache size, i.e.:
            Alexander.app/Contents/MacOS/Alexander -WebKitPageCacheSizePreferenceKey 4
    
            Reviewed by: hyatt
    
            * History.subproj/WebBackForwardList.m:
            (+[WebBackForwardList setPageCacheSize:]):
            (+[WebBackForwardList pageCacheSize]):
            * WebView.subproj/WebPreferences.m:
            (+[WebPreferences load]):
            (-[WebPreferences _initialTimedLayoutSize]):
            (-[WebPreferences _pageCacheSize]):
            * WebView.subproj/WebPreferencesPrivate.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2919 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 780af8e..55e56e0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,21 @@
 2002-12-03  Richard Williamson   <rjw at apple.com>
 
+        Added a preference to change the page cache size, i.e.:
+        Alexander.app/Contents/MacOS/Alexander -WebKitPageCacheSizePreferenceKey 4
+        
+        Reviewed by: hyatt
+
+        * History.subproj/WebBackForwardList.m:
+        (+[WebBackForwardList setPageCacheSize:]):
+        (+[WebBackForwardList pageCacheSize]):
+        * WebView.subproj/WebPreferences.m:
+        (+[WebPreferences load]):
+        (-[WebPreferences _initialTimedLayoutSize]):
+        (-[WebPreferences _pageCacheSize]):
+        * WebView.subproj/WebPreferencesPrivate.h:
+
+2002-12-03  Richard Williamson   <rjw at apple.com>
+
         Fixed 3019986.  Use an array of font families instead of a single
         font family to support CSS family lists.
         r=hyatt
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 780af8e..55e56e0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,21 @@
 2002-12-03  Richard Williamson   <rjw at apple.com>
 
+        Added a preference to change the page cache size, i.e.:
+        Alexander.app/Contents/MacOS/Alexander -WebKitPageCacheSizePreferenceKey 4
+        
+        Reviewed by: hyatt
+
+        * History.subproj/WebBackForwardList.m:
+        (+[WebBackForwardList setPageCacheSize:]):
+        (+[WebBackForwardList pageCacheSize]):
+        * WebView.subproj/WebPreferences.m:
+        (+[WebPreferences load]):
+        (-[WebPreferences _initialTimedLayoutSize]):
+        (-[WebPreferences _pageCacheSize]):
+        * WebView.subproj/WebPreferencesPrivate.h:
+
+2002-12-03  Richard Williamson   <rjw at apple.com>
+
         Fixed 3019986.  Use an array of font families instead of a single
         font family to support CSS family lists.
         r=hyatt
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 3936aad..68a27ec 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -6,8 +6,10 @@
 //  Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
 //
 
-#import "WebBackForwardList.h"
-#import "WebHistoryItem.h"
+#import <WebKit/WebBackForwardList.h>
+#import <WebKit/WebHistoryItem.h>
+#import <WebKit/WebPreferencesPrivate.h>
+
 #import <WebFoundation/WebAssertions.h>
 
 @implementation WebBackForwardList
@@ -200,16 +202,20 @@ static BOOL usesPageCache = 0;
     return usesPageCache;
 }
 
+static BOOL pageCacheSizeModified = NO;
 static unsigned pageCacheSize = 10;
 
 + (void)setPageCacheSize: (unsigned)size
 {
+    pageCacheSizeModified = YES;
     pageCacheSize = size;
 }
 
 
 + (unsigned)pageCacheSize
 {
+    if (!pageCacheSizeModified)
+        return [[WebPreferences standardPreferences] _pageCacheSize];
     return pageCacheSize;
 }
 
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 049cfbc..fa93308 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -33,6 +33,7 @@
 #define WebKitAllowAnimatedImagesPreferenceKey @"WebKitAllowAnimatedImagesPreferenceKey"
 #define WebKitAllowAnimatedImageLoopingPreferenceKey @"WebKitAllowAnimatedImageLoopingPreferenceKey"
 #define WebKitDisplayImagesKey @"WebKitDisplayImagesKey"
+#define WebKitPageCacheSizePreferenceKey @"WebKitPageCacheSizePreferenceKey"
 
 @implementation WebPreferences
 
@@ -93,6 +94,7 @@
         @"1.00",                        WebKitInitialTimedLayoutDelayPreferenceKey,
         @"4096",                        WebKitInitialTimedLayoutSizePreferenceKey,
         @"1.00",                        WebKitResourceTimedLayoutDelayPreferenceKey,
+        @"10",                          WebKitPageCacheSizePreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitInitialTimedLayoutEnabledPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitResourceTimedLayoutEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitUserStyleSheetEnabledPreferenceKey,
@@ -304,6 +306,11 @@
     return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitInitialTimedLayoutDelayPreferenceKey];
 }
 
+- (int)_pageCacheSize
+{
+    return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitPageCacheSizePreferenceKey];
+}
+
 - (BOOL)_initialTimedLayoutEnabled
 {
     return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitInitialTimedLayoutEnabledPreferenceKey];
diff --git a/WebKit/WebView.subproj/WebPreferencesPrivate.h b/WebKit/WebView.subproj/WebPreferencesPrivate.h
index c15cf51..f74bdff 100644
--- a/WebKit/WebView.subproj/WebPreferencesPrivate.h
+++ b/WebKit/WebView.subproj/WebPreferencesPrivate.h
@@ -14,5 +14,6 @@
 - (BOOL)_initialTimedLayoutEnabled;
 - (BOOL)_resourceTimedLayoutEnabled;
 - (NSTimeInterval)_resourceTimedLayoutDelay;
+- (int)_pageCacheSize;
 
 @end

-- 
WebKit Debian packaging