Changeset 27223 in webkit

Timestamp:

Oct 29, 2007 3:31:09 AM (17 years ago)

Author:

ddkilzer

Message:

WebCore:

REGRESSION (r17701): Favicons should be viewable as image documents
<​http://bugs.webkit.org/show_bug.cgi?id=15640>

Reviewed by Darin.

On Tiger and Leopard, the image/x-icon MIME type is not returned from
CGImageSourceCopyTypeIdentifiers(), so opening a URL to a favicon caused
the icon to be downloaded instead being displayed in an image document.

Test: fast/images/favicon-as-image.html

• platform/MIMETypeRegistry.cpp: (WebCore::initialiseSupportedImageMIMETypes): Manually add image/x-icon to supportedImageMIMETypes and supportedImageResourceMIMETypes. Also fixed comment about the image/bmp MIME type since it applies to both Tiger and Leopard.

LayoutTests:

Test for: REGRESSION (r17701): Favicons should be viewable as image documents
<​http://bugs.webkit.org/show_bug.cgi?id=15640>

Reviewed by Darin.

• fast/images/favicon-as-image.html: Added.
• fast/images/resources/favicon.ico: Added.
• platform/mac/fast/images/favicon-as-image-expected.checksum: Added.
• platform/mac/fast/images/favicon-as-image-expected.png: Added.
• platform/mac/fast/images/favicon-as-image-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/favicon-as-image.html (added)
• LayoutTests/fast/images/resources/favicon.ico (added)
• LayoutTests/platform/mac/fast/images/favicon-as-image-expected.checksum (added)
• LayoutTests/platform/mac/fast/images/favicon-as-image-expected.png (added)
• LayoutTests/platform/mac/fast/images/favicon-as-image-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/MIMETypeRegistry.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-10-29  David Kilzer  <ddkilzer@webkit.org>
+
+        Test for:  REGRESSION (r17701): Favicons should be viewable as image documents
+        <http://bugs.webkit.org/show_bug.cgi?id=15640>
+
+        Reviewed by Darin.
+
+        * fast/images/favicon-as-image.html: Added.
+        * fast/images/resources/favicon.ico: Added.
+        * platform/mac/fast/images/favicon-as-image-expected.checksum: Added.
+        * platform/mac/fast/images/favicon-as-image-expected.png: Added.
+        * platform/mac/fast/images/favicon-as-image-expected.txt: Added.
+
 2007-10-28  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-29  David Kilzer  <ddkilzer@webkit.org>
+
+        REGRESSION (r17701): Favicons should be viewable as image documents
+        <http://bugs.webkit.org/show_bug.cgi?id=15640>
+
+        Reviewed by Darin.
+
+        On Tiger and Leopard, the image/x-icon MIME type is not returned from
+        CGImageSourceCopyTypeIdentifiers(), so opening a URL to a favicon caused
+        the icon to be downloaded instead being displayed in an image document.
+
+        Test: fast/images/favicon-as-image.html
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::initialiseSupportedImageMIMETypes): Manually add image/x-icon to
+        supportedImageMIMETypes and supportedImageResourceMIMETypes.  Also fixed
+        comment about the image/bmp MIME type since it applies to both Tiger and
+        Leopard.
+
 2007-10-29  Maciej Stachowiak  <mjs@apple.com>
 

trunk/WebCore/platform/MIMETypeRegistry.cpp

@@ -65 +65 @@
     }
     CFRelease(supportedTypes);
-    
-    // On Tiger, com.microsoft.bmp doesn't have a MIME type in the registry.
+
+    // On Tiger and Leopard, com.microsoft.bmp doesn't have a MIME type in the registry.
     supportedImageMIMETypes->add("image/bmp");
     supportedImageResourceMIMETypes->add("image/bmp");
-    
+
+    // Favicons don't have a MIME type in the registry either.
+    supportedImageMIMETypes->add("image/x-icon");
+    supportedImageResourceMIMETypes->add("image/x-icon");
+
     //  We only get one MIME type per UTI, hence our need to add these manually
     supportedImageMIMETypes->add("image/pjpeg");