[webkit-changes] cvs commit: WebKit/WebView.subproj WebFrame.m

[Maciej]

mjs         05/07/29 19:34:02

  Modified:    .        ChangeLog
               WebView.subproj WebFrame.m
  Log:
          Reviewed by Dave Hyatt.
  
  	- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4153
  
          * WebView.subproj/WebFrame.m:
          (-[WebFrame _purgePageCache]): Find the oldest candidate for
  	purging that is not a snapback item.
  
  Revision  Changes    Path
  1.3268    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3267
  retrieving revision 1.3268
  diff -u -r1.3267 -r1.3268
  --- ChangeLog	29 Jul 2005 23:40:22 -0000	1.3267
  +++ ChangeLog	30 Jul 2005 02:33:56 -0000	1.3268
  @@ -1,3 +1,13 @@
  +2005-07-26  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Reviewed by Dave Hyatt.
  +
  +	- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4153
  +	
  +        * WebView.subproj/WebFrame.m:
  +        (-[WebFrame _purgePageCache]): Find the oldest candidate for
  +	purging that is not a snapback item.
  +
   2005-07-29  David Harrison  <harrison at apple.com>
   
           Reviewed by Dave Hyatt (rendering) and Maciej (editing and performance improvements).
  @@ -26,6 +36,7 @@
           (ceilCurrentWidth):
           (widthForNextCharacter):
   
  +>>>>>>> 1.3267
   2005-07-29  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Dave Hyatt.
  
  
  
  1.247     +7 -7      WebKit/WebView.subproj/WebFrame.m
  
  Index: WebFrame.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebFrame.m,v
  retrieving revision 1.246
  retrieving revision 1.247
  diff -u -r1.246 -r1.247
  --- WebFrame.m	27 Jul 2005 21:36:43 -0000	1.246
  +++ WebFrame.m	30 Jul 2005 02:34:01 -0000	1.247
  @@ -923,22 +923,22 @@
       unsigned pagesCached = 0;
       WebBackForwardList *backForwardList = [[self webView] backForwardList];
       NSArray *backList = [backForwardList backListWithLimit: 999999];
  -    WebHistoryItem *oldestItem = nil;
  +    WebHistoryItem *oldestNonSnapbackItem = nil;
       
       unsigned i;
       for (i = 0; i < [backList count]; i++){
           WebHistoryItem *item = [backList objectAtIndex: i];
           if ([item hasPageCache]){
  -            if (oldestItem == nil)
  -                oldestItem = item;
  +            if (oldestNonSnapbackItem == nil && ![item alwaysAttemptToUsePageCache])
  +                oldestNonSnapbackItem = item;
               pagesCached++;
           }
       }
  -    
  +
       // Snapback items are never directly purged here.
  -    if (pagesCached >= sizeLimit && ![oldestItem alwaysAttemptToUsePageCache]){
  -        LOG(PageCache, "Purging back/forward cache, %@\n", [oldestItem URL]);
  -        [oldestItem setHasPageCache: NO];
  +    if (pagesCached >= sizeLimit) {
  +        LOG(PageCache, "Purging back/forward cache, %@\n", [oldestNonSnapbackItem URL]);
  +        [oldestNonSnapbackItem setHasPageCache:NO];
       }
   }