Index: base/gfx/gtk_util.cc |
diff --git a/base/gfx/gtk_util.cc b/base/gfx/gtk_util.cc |
index 26601ca70c6ba2428765cd3482f95ae8d397b27c..e12bb6e0b34e4700a96f8dda700b4249c7498fc8 100755 |
--- a/base/gfx/gtk_util.cc |
+++ b/base/gfx/gtk_util.cc |
@@ -7,6 +7,7 @@ |
#include <gdk/gdk.h> |
#include "base/gfx/rect.h" |
+#include "skia/include/SkBitmap.h" |
namespace gfx { |
@@ -21,4 +22,42 @@ void SubtractRectanglesFromRegion(GdkRegion* region, |
} |
} |
+static void FreePixels(guchar* pixels, gpointer data) { |
+ free(data); |
+} |
+ |
+GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap* bitmap) { |
+ bitmap->lockPixels(); |
+ int width = bitmap->width(); |
+ int height = bitmap->height(); |
+ int stride = bitmap->rowBytes(); |
+ const guchar* orig_data = static_cast<guchar*>(bitmap->getPixels()); |
+ guchar* data = static_cast<guchar*>(malloc(height * stride)); |
+ |
+ // We have to copy the pixels and swap from BGRA to RGBA. |
+ for (int i = 0; i < height; ++i) { |
+ for (int j = 0; j < width; ++j) { |
+ int idx = i * stride + j * 4; |
+ data[idx] = orig_data[idx + 2]; |
+ data[idx + 1] = orig_data[idx + 1]; |
+ data[idx + 2] = orig_data[idx]; |
+ data[idx + 3] = orig_data[idx + 3]; |
+ } |
+ } |
+ |
+ // This pixbuf takes ownership of our malloc()ed data and will |
+ // free it for us when it is destroyed. |
+ GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( |
+ data, |
+ GDK_COLORSPACE_RGB, // The only colorspace gtk supports. |
+ true, // There is an alpha channel. |
+ 8, |
+ width, height, stride, &FreePixels, data); |
+ |
+ // Assume ownership of pixbuf. |
+ g_object_ref_sink(pixbuf); |
+ bitmap->unlockPixels(); |
+ return pixbuf; |
+} |
+ |
} // namespace gfx |