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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 4d0e79c15efea425ad321b5153bca8240acbcfde
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 8 19:22:02 2003 +0000

            Reviewed by Richard.
    
    	- fixed 3242414 -- REGRESSION: PLT times reported 10% slower after emptying cache with B/F cache enabled
            - made it only compute the page cache size once
    
            * History.subproj/WebBackForwardList.m:
            (-[WebBackForwardList init]): Set initial page cache size to special value, COMPUTE_DEFAULT_PAGE_CACHE_SIZE.
            (-[WebBackForwardList setPageCacheSize:]): Remove code to set pageCacheSizeModified and call to
            _setUsesPageCache:, not needed any more.
            (-[WebBackForwardList pageCacheSize]): If cache size is COMPUTE_DEFAULT_PAGE_CACHE_SIZE, then compute it.
            The old code would compute the cache size each time this method was called until pageCacheSizeModified was set.
            (-[WebBackForwardList _usesPageCache]): Just check pageCacheSize for 0 to see if we use a page cache.
            No need for a separate boolean any more.
    
            * History.subproj/WebHistoryItemPrivate.h: Remove _setUsesPageCache (gone altogether) and _clearPageCache
            (now only used internally).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8fbe1e4..ef18653 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2003-05-08  Darin Adler  <darin at apple.com>
+
+        Reviewed by Richard.
+
+	- fixed 3242414 -- REGRESSION: PLT times reported 10% slower after emptying cache with B/F cache enabled
+        - made it only compute the page cache size once
+
+        * History.subproj/WebBackForwardList.m:
+        (-[WebBackForwardList init]): Set initial page cache size to special value, COMPUTE_DEFAULT_PAGE_CACHE_SIZE.
+        (-[WebBackForwardList setPageCacheSize:]): Remove code to set pageCacheSizeModified and call to
+        _setUsesPageCache:, not needed any more.
+        (-[WebBackForwardList pageCacheSize]): If cache size is COMPUTE_DEFAULT_PAGE_CACHE_SIZE, then compute it.
+        The old code would compute the cache size each time this method was called until pageCacheSizeModified was set.
+        (-[WebBackForwardList _usesPageCache]): Just check pageCacheSize for 0 to see if we use a page cache.
+        No need for a separate boolean any more.
+        
+        * History.subproj/WebHistoryItemPrivate.h: Remove _setUsesPageCache (gone altogether) and _clearPageCache
+        (now only used internally).
+
 === Safari-78 ===
 
 2003-05-07  Darin Adler  <darin at apple.com>
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index ed8d2fa..048b125 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -10,14 +10,14 @@
 #import <WebFoundation/WebAssertions.h>
 #import <WebFoundation/WebSystemBits.h>
 
+#define COMPUTE_DEFAULT_PAGE_CACHE_SIZE UINT_MAX
+
 @interface WebBackForwardListPrivate : NSObject
 {
 @public
     NSMutableArray *entries;
     int current;
     int maximumSize;
-    BOOL usesPageCache;
-    BOOL pageCacheSizeModified;
     unsigned pageCacheSize;
 }
 @end
@@ -46,9 +46,7 @@
     _private->current = -1;
     _private->maximumSize = 100;		// typically set by browser app
 
-    _private->usesPageCache = YES;
-    _private->pageCacheSizeModified = NO;
-    _private->pageCacheSize = 4;
+    _private->pageCacheSize = COMPUTE_DEFAULT_PAGE_CACHE_SIZE;
     
     return self;
 }
@@ -233,11 +231,9 @@
 
 - (void)setPageCacheSize: (unsigned)size
 {
-    _private->pageCacheSizeModified = YES;
     _private->pageCacheSize = size;
-    if (size == 0){
+    if (size == 0) {
         [self _clearPageCache];
-        [self _setUsesPageCache: NO];
     }
 }
 
@@ -247,7 +243,7 @@ static BOOL loggedPageCacheSize = NO;
 
 - (unsigned)pageCacheSize
 {
-    if (!_private->pageCacheSizeModified){
+    if (_private->pageCacheSize == COMPUTE_DEFAULT_PAGE_CACHE_SIZE) {
         unsigned s;
         vm_size_t memSize = WebSystemMainMemory();
         unsigned multiplier = 1;
@@ -265,23 +261,15 @@ static BOOL loggedPageCacheSize = NO;
         }
 #endif
 
-        return s * multiplier;
+        _private->pageCacheSize = s * multiplier;
     }
+    
     return _private->pageCacheSize;
 }
 
-// On be default for now.
-
-- (void)_setUsesPageCache: (BOOL)f
-{
-    _private->usesPageCache = f ? YES : NO;
-}
-
 - (BOOL)_usesPageCache
 {
-    if ([self pageCacheSize] == 0)
-        return NO;
-    return _private->usesPageCache;
+    return _private->pageCacheSize != 0;
 }
 
 - (int)backListCount
diff --git a/WebKit/History.subproj/WebHistoryItemPrivate.h b/WebKit/History.subproj/WebHistoryItemPrivate.h
index d0a92f7..2a30c20 100644
--- a/WebKit/History.subproj/WebHistoryItemPrivate.h
+++ b/WebKit/History.subproj/WebHistoryItemPrivate.h
@@ -62,8 +62,6 @@
 @end
 
 @interface WebBackForwardList (WebPrivate)
-- (void)_clearPageCache;
-- (void)_setUsesPageCache:(BOOL)f;
 - (BOOL)_usesPageCache;
 @end
 

-- 
WebKit Debian packaging