Changeset 42780 in webkit

Timestamp:

Apr 23, 2009 8:39:29 AM (15 years ago)

Author:

kov@webkit.org

Message:

2009-04-23 Zan Dobersek <​zandobersek@gmail.com>

Reviewed by Gustavo Noronha.

​https://bugs.webkit.org/show_bug.cgi?id=15654
GdkPixbuf support for ImageCairo

Add support for converting a Cairo surface to a GdkPixbuf.

• platform/graphics/BitmapImage.h:
• platform/graphics/Image.h: (WebCore::Image::getGdkPixbuf):
• platform/graphics/gtk/ImageGtk.cpp: (WebCore::BitmapImage::getGdkPixbuf):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.h (modified) (1 diff)
• platform/graphics/Image.h (modified) (2 diffs)
• platform/graphics/gtk/ImageGtk.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-04-23  Zan Dobersek  <zandobersek@gmail.com>
+
+        Reviewed by Gustavo Noronha.
+
+        https://bugs.webkit.org/show_bug.cgi?id=15654
+        GdkPixbuf support for ImageCairo
+
+        Add support for converting a Cairo surface to a GdkPixbuf.
+
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/Image.h:
+        (WebCore::Image::getGdkPixbuf):
+        * platform/graphics/gtk/ImageGtk.cpp:
+        (WebCore::BitmapImage::getGdkPixbuf):
+
 2009-04-23  Kenneth Rohde Christiansen  <kenneth.christiansen@openbossa.org>
 

trunk/WebCore/platform/graphics/BitmapImage.h

@@ -141 +141 @@
 #endif
 
+#if PLATFORM(GTK)
+    virtual GdkPixbuf* getGdkPixbuf();
+#endif
+
     virtual NativeImagePtr nativeImageForCurrentFrame() { return frameAtIndex(currentFrame()); }
 

trunk/WebCore/platform/graphics/Image.h

@@ -60 +60 @@
 #if PLATFORM(QT)
 #include <QPixmap>
+#endif
+
+#if PLATFORM(GTK)
+typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 
@@ -143 +147 @@
 #endif
 
+#if PLATFORM(GTK)
+    virtual GdkPixbuf* getGdkPixbuf() { return 0; }
+#endif
+
 protected:
     Image(ImageObserver* = 0);

trunk/WebCore/platform/graphics/gtk/ImageGtk.cpp

@@ -28 +28 @@
 #include "BitmapImage.h"
 
+#include <cairo.h>
+#include <gtk/gtk.h>
+
 // This function loads resources from WebKit
 Vector<char> loadResourceIntoArray(const char*);
@@ -50 +53 @@
 }
 
+GdkPixbuf* BitmapImage::getGdkPixbuf()
+{
+    int width = cairo_image_surface_get_width(frameAtIndex(currentFrame()));
+    int height = cairo_image_surface_get_height(frameAtIndex(currentFrame()));
+
+    GdkPixmap* pixmap = gdk_pixmap_new(0, width, height, 32);
+    cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(pixmap));
+    cairo_set_source_surface(cr, frameAtIndex(currentFrame()), 0, 0);
+    cairo_paint(cr);
+    cairo_destroy(cr);
+
+    GdkPixbuf* pixbuf = gdk_pixbuf_get_from_drawable(0, GDK_DRAWABLE(pixmap), 0, 0, 0, 0, 0, width, height);
+    g_object_unref(pixmap);
+
+    return pixbuf;
 }
+
+}