Changeset 31224 in webkit

Timestamp:

Mar 21, 2008 5:39:07 PM (16 years ago)

Author:

weinig@apple.com

Message:

WebCore:

2008-03-21 Sam Weinig <​sam@webkit.org>

Reviewed by Oliver Hunt.

Fix <rdar://problem/5788451>
toDataURL not implemented for Windows (need mapping of MIME type to UTI)

Hard code support for just PNG's on windows, the minimum the spec requires.

• platform/MIMETypeRegistry.cpp: (WebCore::initializeSupportedImageMIMETypesForEncoding):
• platform/graphics/cg/ImageBufferCG.cpp: (WebCore::utiFromMIMEType): (WebCore::ImageBuffer::toDataURL):

LayoutTests:

2008-03-21 Sam Weinig <​sam@webkit.org>

Reviewed by Oliver Hunt.

Enable tests for <rdar://problem/5788451>
toDataURL not implemented for Windows (need mapping of MIME type to UTI)

• platform/win/Skipped:
• platform/win/fast/canvas: Added.
• platform/win/fast/canvas/toDataURL-supportedTypes-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• LayoutTests/platform/win/fast/canvas (added)
• LayoutTests/platform/win/fast/canvas/toDataURL-supportedTypes-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/MIMETypeRegistry.cpp (modified) (2 diffs)
• WebCore/platform/graphics/cg/ImageBufferCG.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        Enable tests for <rdar://problem/5788451>
+        toDataURL not implemented for Windows (need mapping of MIME type to UTI)
+
+        * platform/win/Skipped:
+        * platform/win/fast/canvas: Added.
+        * platform/win/fast/canvas/toDataURL-supportedTypes-expected.txt: Added.
+
 2008-03-21  Dan Bernstein  <mitz@apple.com>
 

trunk/LayoutTests/platform/win/Skipped

@@ -326 +326 @@
 svg/custom/acid3-test-77.html
 
-# <rdar://problem/5788451> toDataURL broke Windows build
-fast/canvas/toDataURL-noData.html
-fast/canvas/toDataURL-supportedTypes.html
-
 ################################################################################
 ####################### No bugs filed about the below yet#######################

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        Fix <rdar://problem/5788451>
+        toDataURL not implemented for Windows (need mapping of MIME type to UTI)
+
+        Hard code support for just PNG's on windows, the minimum the spec requires.
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::initializeSupportedImageMIMETypesForEncoding):
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::utiFromMIMEType):
+        (WebCore::ImageBuffer::toDataURL):
+
 2008-03-21  Matt Lilek  <webkit@mattlilek.com>
 

trunk/WebCore/platform/MIMETypeRegistry.cpp

@@ -125 +125 @@
 
 #if PLATFORM(CG)
+#if PLATFORM(MAC)
     RetainPtr<CFArrayRef> supportedTypes(AdoptCF, CGImageDestinationCopyTypeIdentifiers());
     CFIndex count = CFArrayGetCount(supportedTypes.get());
@@ -133 +134 @@
             supportedImageMIMETypesForEncoding->add(mimeType);
     }
+#else
+    // FIXME: Add Windows support for all the supported UTI's when a way to convert from MIMEType to UTI reliably is found.
+    // For now, only support PNG, the minimum that the spec requires.
+    supportedImageMIMETypesForEncoding->add("image/png");
+#endif
 #elif PLATFORM(QT)
     QList<QByteArray> formats = QImageWriter::supportedImageFormats();

trunk/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -216 +216 @@
 }
 
+static CFStringRef utiFromMIMEType(const String& mimeType)
+{
+#if PLATFORM(MAC)
+    return UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, mimeType.createCFString(), 0);
+#else
+    // FIXME: Add Windows support for all the supported UTI's when a way to convert from MIMEType to UTI reliably is found.
+    // For now, only support PNG, the minimum that the spec requires.
+    ASSERT(equalIgnoringCase(mimeType, "image/png"));
+    static const CFStringRef kUTTypePNG = CFSTR("public.png");
+    return kUTTypePNG;
+#endif
+}
+
 String ImageBuffer::toDataURL(const String& mimeType) const
 {
-#if PLATFORM(MAC)
     ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
 
@@ -251 +263 @@
         return String("data:,");
 
-    RetainPtr<CFStringRef> imageUTI(AdoptCF, UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, mimeType.createCFString(), 0));
+    RetainPtr<CFStringRef> imageUTI(AdoptCF, utiFromMIMEType(mimeType));
     RetainPtr<CGImageDestinationRef> imageDestination(AdoptCF, CGImageDestinationCreateWithData(transformedImageData.get(), imageUTI.get(), 1, 0));
     if (!imageDestination)
@@ -267 +279 @@
 
     return String::format("data:%s;base64,%s", mimeType.utf8().data(), out.data());
-#else
-    return String();
-#endif
 }