[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 1fe2de40a4e17b40d3ebcdb2b1b8e161624878c6
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 13 05:22:32 2003 +0000

    	Correct fix for 3288532 again.  This time will feeling!
    
            Reviewed by Gramps.
    
            * History.subproj/WebBackForwardList.m:
            (-[WebBackForwardList setCapacity:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4539 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a9efdb4..1c29db4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-12  Richard Williamson  <rjw at apple.com>
+
+	Correct fix for 3288532 again.  This time will feeling!
+
+        Reviewed by Gramps.
+
+        * History.subproj/WebBackForwardList.m:
+        (-[WebBackForwardList setCapacity:]):
+
 2003-06-12  Don Melton  <gramps at apple.com>
 
 	Since Richard didn't actually correct the fix for 3288532 in
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 931c5a5..b6c9a49 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -63,6 +63,9 @@
 
 - (void)addItem:(WebHistoryItem *)entry;
 {
+    if (_private->maximumSize == 0)
+        return;
+    
     // Toss anything in the forward list
     int currSize = [_private->entries count];
     if (_private->current != currSize-1 && _private->current != -1) {
@@ -181,6 +184,19 @@
 
 - (void)setCapacity:(int)size
 {
+    if (size < _private->maximumSize){
+        int currSize = [_private->entries count];
+        NSRange forwardRange = NSMakeRange(size, currSize-size);
+        NSArray *subarray;
+        subarray = [_private->entries subarrayWithRange:forwardRange];
+        unsigned i;
+        for (i = 0; i < [subarray count]; i++){
+            WebHistoryItem *item = [subarray objectAtIndex: i];
+            [item setHasPageCache: NO];
+        }
+        [_private->entries removeObjectsInRange: forwardRange];
+        currSize -= forwardRange.length;
+    }
     _private->maximumSize = size;
 }
 

-- 
WebKit Debian packaging