2008-03-07 Stephanie Lewis <slewis@apple.com>
authorslewis@apple.com <slewis@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 8 Mar 2008 08:09:42 +0000 (08:09 +0000)
committerslewis@apple.com <slewis@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 8 Mar 2008 08:09:42 +0000 (08:09 +0000)
         Reviewed by Oliver.

         Fix Windows build.

         * platform/graphics/cg/ImageBufferCG.cpp:
         (WebCore::ImageBuffer::toDataURL):

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

LayoutTests/ChangeLog
LayoutTests/platform/win/Skipped
WebCore/ChangeLog
WebCore/platform/graphics/cg/ImageBufferCG.cpp

index fe5da4c..c51a9dc 100644 (file)
@@ -1,3 +1,11 @@
+2008-03-07  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Oliver.
+
+        Add toDataURL tests to skipped list
+
+        * platform/win/Skipped:
+
 2008-03-07  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin.
index 0cbf7d0..e0017bc 100644 (file)
@@ -325,6 +325,10 @@ fast/loader/xmlhttprequest-missing-file-exception.html
 # <rdar://problem/5787793> REGRESSION: svg/custom/acid3-test-77.html fails on windows 
 svg/custom/acid3-test-77.html
 
+# <rdar://problem/5788451>s toDataURL broke Windows build
+fast/canvas/toDataURL-noData.html
+fast/canvas/toDataURL-supportedTypes.htmls
+
 ################################################################################
 ####################### No bugs filed about the below yet#######################
 ################################################################################
index aa110bc..17b0397 100644 (file)
@@ -1,3 +1,12 @@
+2008-03-07  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Oliver.
+
+        Fix Windows build.
+
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::ImageBuffer::toDataURL):
+
 2008-03-07  David D. Kilzer  <ddkilzer@apple.com>
 
         Unify concept of enabling Netscape Plug-in API (NPAPI).
index 84e0e92..2a4ef5d 100644 (file)
@@ -217,6 +217,7 @@ void ImageBuffer::putImageData(ImageData* source, const IntRect& sourceRect, con
 
 String ImageBuffer::toDataURL(const String& mimeType) const
 {
+#if PLATFORM(MAC)
     ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
 
     RetainPtr<CGImageRef> image(AdoptCF, CGBitmapContextCreateImage(context()->platformContext()));
@@ -264,6 +265,9 @@ String ImageBuffer::toDataURL(const String& mimeType) const
     out.append('\0');
 
     return String::format("data:%s;base64,%s", mimeType.utf8().data(), out.data());
+#else
+    return String();
+#endif
 }
 
 } // namespace WebCore