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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit c6ac3030cc24ccb9ddad6f45373383eb2ac78fcc
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 13 04:29:27 2003 +0000

    	Since Richard didn't actually correct the fix for 3288532 in
    	WebBackForwardList.m, I've backed out out his original fix entirely.
    
            * History.subproj/WebBackForwardList.m:
            (-[WebBackForwardList setCapacity:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4538 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3881fa7..a9efdb4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-12  Don Melton  <gramps at apple.com>
+
+	Since Richard didn't actually correct the fix for 3288532 in
+	WebBackForwardList.m, I've backed out out his original fix entirely.
+
+        * History.subproj/WebBackForwardList.m:
+        (-[WebBackForwardList setCapacity:]):
+
 2003-06-12  Richard Williamson   <rjw at apple.com>
 
 	Correct fix for 3288532.
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index 4bd3acb..931c5a5 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -65,9 +65,6 @@
 {
     // 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;
@@ -184,19 +181,6 @@
 
 - (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