Reviewed by Maciej

        The way of detecting a failed icon load before was to try and construct
        an image from the icon and if that image construction failed, mark the icon
        as missing.
        A much more efficient way is to check for a 404 response.  We'll still
        check for invalid image data, but most servers will correctly return 404
        on a missing icon.

        * Misc/WebIconLoader.m:
        (-[WebIconLoader didFinishLoading]): Added check for 404 response

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15848 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 918a84a9ac0e6647ca73ab41de1d1a45eb591a2f..49fe32d4459743e02e53ad63540362e8c0a808ff 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2006-08-13  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Maciej
+
+        The way of detecting a failed icon load before was to try and construct
+        an image from the icon and if that image construction failed, mark the icon
+        as missing.  
+        A much more efficient way is to check for a 404 response.  We'll still
+        check for invalid image data, but most servers will correctly return 404 
+        on a missing icon.
+        
+        * Misc/WebIconLoader.m:
+        (-[WebIconLoader didFinishLoading]): Added check for 404 response
+
 2006-08-13  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin.

diff --git a/WebKit/Misc/WebIconLoader.m b/WebKit/Misc/WebIconLoader.m
index fe034d09ef58d9fffbb6037ff1b977f85743b448..a41b997a64c6fd0b9515200827283702c8ea79bd 100644 (file)
--- a/WebKit/Misc/WebIconLoader.m
+++ b/WebKit/Misc/WebIconLoader.m
@@ -88,42 +88,45 @@
 
 - (void)didFinishLoading
 {
-#ifndef ICONDEBUG
+#ifdef ICONDEBUG
+    NSData *data;
+        
+    id response = [self response];
+    if ([response isKindOfClass:[NSHTTPURLResponse class]] && ([response statusCode] < 200 || [response statusCode] > 299))
+        data = nil;
+    else
+        data = [self resourceData];
+    
+    if (data) {
+        [[WebIconDatabaseBridge sharedBridgeInstance] _setIconData:data forIconURL:[[self URL] _web_originalDataAsString]];
+        LOG(IconDatabase, "NewDB - Icon data set for URL %@", [[self URL] _web_originalDataAsString]);
+    } else {
+        [[WebIconDatabaseBridge sharedBridgeInstance] _setHaveNoIconForIconURL:[[self URL] _web_originalDataAsString]];
+        LOG(IconDatabase, "NewDB - No icon for URL %@", [[self URL] _web_originalDataAsString]);
+    }
+    [frameLoader _iconLoaderReceivedPageIcon:self];
+    [super didFinishLoading];
+#else
     NSImage *icon;
-#endif
-
+    
     NS_DURING
         NSData *data = [self resourceData];
-            
-#ifdef ICONDEBUG
-        if (data) {
-            [[WebIconDatabaseBridge sharedBridgeInstance] _setIconData:data forIconURL:[[self URL] _web_originalDataAsString]];
-            LOG(IconDatabase, "NewDB - Icon data set for URL %@", [[self URL] _web_originalDataAsString]);
-        }
-#else
         icon = [data length] > 0 ? [[NSImage alloc] initWithData:data] : nil;
-#endif
     NS_HANDLER
-#ifndef ICONDEBUG
         icon = nil;
-#endif
     NS_ENDHANDLER
     
-#ifndef ICONDEBUG
+
     if ([[icon representations] count] > 0) {
         [[WebIconDatabase sharedIconDatabase] _setIcon:icon forIconURL:[[self URL] _web_originalDataAsString]];
     } else {
         [[WebIconDatabase sharedIconDatabase] _setHaveNoIconForIconURL:[[self URL] _web_originalDataAsString]];
     }
-#endif
-    
+
     [frameLoader _iconLoaderReceivedPageIcon:self];    
-    
-#ifndef ICONDEBUG
     [icon release];
-#endif
-    
     [super didFinishLoading];
+#endif
 }
 
 - (NSURLRequest *)willSendRequest:(NSURLRequest *)newRequest redirectResponse:(NSURLResponse *)redirectResponse;