Changeset 36508 in webkit

Timestamp:

Sep 16, 2008 9:59:18 AM (16 years ago)

Author:

alp@webkit.org

Message:

2008-09-16 Dirk Schulze <​vbs85@gmx.de>

Reviewed by Oliver Hunt and Alp Toker.

Implemented toDataURL in Cairo. Only PNG support
at the moment.

Qt, Cairo and wx require toDataURL implementations
​https://bugs.webkit.org/show_bug.cgi?id=17719

• platform/MIMETypeRegistry.cpp: (WebCore::initializeSupportedImageMIMETypesForEncoding):
• platform/graphics/cairo/ImageBufferCairo.cpp: (WebCore::ImageBuffer::ImageBuffer): (WebCore::writeFunction): (WebCore::ImageBuffer::toDataURL):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/MIMETypeRegistry.cpp (modified) (1 diff)
• platform/graphics/cairo/ImageBufferCairo.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-09-16  Dirk Schulze  <vbs85@gmx.de>
+
+        Reviewed by Oliver Hunt and Alp Toker.
+
+        Implemented toDataURL in Cairo. Only PNG support
+        at the moment.
+
+        Qt, Cairo and wx require toDataURL implementations
+        https://bugs.webkit.org/show_bug.cgi?id=17719
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::initializeSupportedImageMIMETypesForEncoding):
+        * platform/graphics/cairo/ImageBufferCairo.cpp:
+        (WebCore::ImageBuffer::ImageBuffer):
+        (WebCore::writeFunction):
+        (WebCore::ImageBuffer::toDataURL):
+
 2008-09-16  Tor Arne Vestbø  <tavestbo@trolltech.com>
 

trunk/WebCore/platform/MIMETypeRegistry.cpp

@@ -148 +148 @@
         supportedImageMIMETypesForEncoding->add(mimeType);
     }
+#elif PLATFORM(CAIRO)
+    supportedImageMIMETypesForEncoding->add("image/png");
 #endif
 }

trunk/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

@@ -28 +28 @@
 #include "ImageBuffer.h"
 
+#include "Base64.h"
 #include "BitmapImage.h"
 #include "GraphicsContext.h"
 #include "ImageData.h"
+#include "MIMETypeRegistry.h"
 #include "NotImplemented.h"
 #include "Pattern.h"
+#include "PlatformString.h"
 
 #include <cairo.h>
+#include <wtf/Vector.h>
 
 using namespace std;
@@ -50 +54 @@
 }
 
-ImageBuffer::ImageBuffer(_cairo_surface* surface)
+ImageBuffer::ImageBuffer(cairo_surface_t* surface)
     : m_surface(surface)
 {
@@ -95 +99 @@
 }
 
-String ImageBuffer::toDataURL(const String&) const
+static cairo_status_t writeFunction(void* closure, const unsigned char* data, unsigned int length)
 {
-    notImplemented();
-    return String();
+    Vector<char>* in = reinterpret_cast<Vector<char>*>(closure);
+    in->append(data, length);
+    return CAIRO_STATUS_SUCCESS;
+}
+
+String ImageBuffer::toDataURL(const String& mimeType) const
+{
+    cairo_surface_t* image = cairo_get_target(context()->platformContext());
+    if (!image)
+        return "data:,";
+
+    String actualMimeType("image/png");
+    if (MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType))
+        actualMimeType = mimeType;
+
+    Vector<char> in;
+    // Only PNG output is supported for now.
+    cairo_surface_write_to_png_stream(image, writeFunction, &in);
+
+    Vector<char> out;
+    base64Encode(in, out);
+
+    return "data:" + actualMimeType + ";base64," + String(out.data(), out.size());
 }