[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 a8d885f55818b85593796b8aefdeff74af99150b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 13 01:25:51 2003 +0000

    	Fixed 3288532.  When setCapacity: shrinks capacity, trim
    	the back/forward list.  Setting to zero will effectively
    	flush the list.
    
            Reviewed by John.
    
            * History.subproj/WebBackForwardList.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4535 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3c1fd3f..5c77580 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2003-06-12  Richard Williamson   <rjw at apple.com>
 
+	Fixed 3288532.  When setCapacity: shrinks capacity, trim
+	the back/forward list.  Setting to zero will effectively
+	flush the list.
+
+        Reviewed by John.
+
+        * History.subproj/WebBackForwardList.m:
+
+2003-06-12  Richard Williamson   <rjw at apple.com>
+
 	Fixed 3221078.  Maintain a seperate width map
 	for substitute fonts to avoid collision of glyph
 	codes.
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 931c5a5..4bd3acb 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -65,6 +65,9 @@
 {
     // Toss anything in the forward list
     int currSize = [_private->entries count];
+    if (currSize == 0)
+        return;
+        
     if (_private->current != currSize-1 && _private->current != -1) {
         NSRange forwardRange = NSMakeRange(_private->current+1, currSize-(_private->current+1));
         NSArray *subarray;
@@ -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