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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 8829e5d8aa5f2c6b6c1e9739f65da9f508d62088
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 13 18:27:36 2002 +0000

    	Fixed: 3105486 - c|net news.com site seems to have lost its favicon again
    
            Reviewed by darin.
    
            * Misc.subproj/WebIconDatabase.m:
            (-[WebIconDatabase _updateFileDatabase]): Only save icons with a size of 16 x 16 since that's the only size we use.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3035 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2b1978a..e047097 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-12-13  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: 3105486 - c|net news.com site seems to have lost its favicon again
+
+        Reviewed by darin.
+
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _updateFileDatabase]): Only save icons with a size of 16 x 16 since that's the only size we use.
+
+2002-12-13  Chris Blumenberg  <cblu at apple.com>
+
 	Catch NULL status strings passed to NPN_Status.
 	
         Reviewed by darin.
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index be58c36..bcabdec 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -308,7 +308,14 @@ NSSize WebIconLargeSize = {128, 128};
     while ((iconURLString = [enumerator nextObject]) != nil) {
         NSMutableDictionary *icons = [_private->iconURLToIcons objectForKey:iconURLString];
         if(icons){
-            NSImage *icon = [self _largestIconFromDictionary:icons];
+            // Save the 16 x 16 size icons as this is the only size the Safari uses.
+            // If we ever use larger sizes, we should save the largest size so icons look better when scaling up.
+            // This also worksaround the problem with cnet's blank 32x32 icon (3105486).
+            NSImage *icon = [icons objectForKey:[NSValue valueWithSize:NSMakeSize(16,16)]];
+            if (!icon) {
+                // In case there is no 16 x 16 size.
+                icon = [self _largestIconFromDictionary:icons];
+            }
             NSData *iconData = [icon TIFFRepresentation];
             if(iconData){
                 //NSLog(@"Writing icon: %@", iconURLString);

-- 
WebKit Debian packaging