[webkit-changes] cvs commit: WebKit/Misc.subproj WebIconDatabase.m

[Adele]

adele       05/08/23 17:24:37

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               Misc.subproj Tag: Safari-2-0-branch WebIconDatabase.m
  Log:
          Merged fix from TOT to Safari-2-0-branch
          <rdar://problem/4221431> avoid icon database thrash for 1% speedup on HTML iBench
  
      2005-08-14  Maciej Stachowiak  <mjs at apple.com>
  
          Reviewed by Darin.
  
  	- 1% speedup on HTML load speed iBench by avoiding icon database thrash
  	http://bugzilla.opendarwin.org/show_bug.cgi?id=4423
  
          * Misc.subproj/WebIconDatabase.m:
          (-[WebIconDatabase _setIconURL:forURL:]): Be more aggressive about returning early, because
  	updating the database does some expensive data structure copies.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3118.4.50 +16 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3118.4.49
  retrieving revision 1.3118.4.50
  diff -u -r1.3118.4.49 -r1.3118.4.50
  --- ChangeLog	23 Aug 2005 23:56:30 -0000	1.3118.4.49
  +++ ChangeLog	24 Aug 2005 00:24:30 -0000	1.3118.4.50
  @@ -1,6 +1,22 @@
   2005-08-23  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  +        <rdar://problem/4221431> avoid icon database thrash for 1% speedup on HTML iBench
  +
  +    2005-08-14  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Reviewed by Darin.
  +
  +	- 1% speedup on HTML load speed iBench by avoiding icon database thrash
  +	http://bugzilla.opendarwin.org/show_bug.cgi?id=4423
  +	
  +        * Misc.subproj/WebIconDatabase.m:
  +        (-[WebIconDatabase _setIconURL:forURL:]): Be more aggressive about returning early, because
  +	updating the database does some expensive data structure copies.
  +
  +2005-08-23  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
   
       2005-08-23  Mitz Pettel  <opendarwin.org at mitzpettel.com>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.53.10.1 +8 -2      WebKit/Misc.subproj/WebIconDatabase.m
  
  Index: WebIconDatabase.m
  ===================================================================
  RCS file: /cvs/root/WebKit/Misc.subproj/WebIconDatabase.m,v
  retrieving revision 1.53
  retrieving revision 1.53.10.1
  diff -u -r1.53 -r1.53.10.1
  --- WebIconDatabase.m	23 Nov 2004 18:50:15 -0000	1.53
  +++ WebIconDatabase.m	24 Aug 2005 00:24:36 -0000	1.53.10.1
  @@ -295,12 +295,18 @@
       ASSERT([self _isEnabled]);
       ASSERT([self _hasIconForIconURL:iconURL]);    
       
  -    if ([[_private->URLToIconURL objectForKey:URL] isEqualToString:iconURL] &&
  -        [_private->iconsOnDiskWithURLs containsObject:iconURL]) {
  +    if ([[_private->pageURLToIconURL objectForKey:URL] isEqualToString:iconURL]) {
           // Don't do any work if the icon URL is already bound to the site URL
           return;
       }
       
  +    if ([_private->iconURLsWithNoIcons containsObject:iconURL]) {
  +        // Don't do any work if the icon URL is in the negative cache, it's not
  +        // worth doing work just to record that this site is associated with
  +        // a nonexistent icon
  +        return;
  +    }
  +    
       [_private->URLToIconURL setObject:iconURL forKey:URL];
       [_private->iconURLToURLs _web_setObjectUsingSetIfNecessary:URL forKey:iconURL];