Reverting 16122.

Review URL: http://codereview.chromium.org/113427

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16124 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 36 insertions, 5 deletions

diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc
index f0d5ea1..d246ccc 100644
--- a/chrome/common/gtk_util.cc
+++ b/chrome/common/gtk_util.cc
@@ -16,6 +16,10 @@ void RemoveWidget(GtkWidget* widget, gpointer container) {
   gtk_container_remove(GTK_CONTAINER(container), widget);
 }
 
+void FreePixels(guchar* pixels, gpointer data) {
+  free(data);
+}
+
 }  // namespace
 
 namespace event_utils {
@@ -33,7 +37,28 @@ WindowOpenDisposition DispositionFromEventFlags(guint event_flags) {
 
 }  // namespace event_utils
 
-namespace gtk_util {
+namespace gfx {
+
+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 = base::BGRAToRGBA(orig_data, width, height, stride);
+
+  // 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);
+
+  bitmap->unlockPixels();
+  return pixbuf;
+}
 
 GtkWidget* CreateGtkBorderBin(GtkWidget* child, const GdkColor* color,
                               int top, int bottom, int left, int right) {
@@ -54,4 +79,4 @@ void RemoveAllChildren(GtkWidget* container) {
   gtk_container_foreach(GTK_CONTAINER(container), RemoveWidget, container);
 }
 
-}  // namespace gtk_util
+}  // namespace gfx
diff --git a/chrome/common/gtk_util.h b/chrome/common/gtk_util.h
index 9a94182..ff3dc5c 100644
--- a/chrome/common/gtk_util.h
+++ b/chrome/common/gtk_util.h
@@ -9,7 +9,9 @@
 
 #include "webkit/glue/window_open_disposition.h"
 
+typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GtkWidget GtkWidget;
+class SkBitmap;
 
 namespace event_utils {
 
@@ -20,9 +22,13 @@ WindowOpenDisposition DispositionFromEventFlags(guint state);
 
 }  // namespace event_utils
 
-namespace gtk_util {
+namespace gfx {
 
-  // Create a GtkBin with |child| as its child widget.  This bin will paint a
+// Convert and copy a SkBitmap to a GdkPixbuf. NOTE: this uses BGRAToRGBA, so
+// it is an expensive operation.
+GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap* bitmap);
+
+// Create a GtkBin with |child| as its child widget.  This bin will paint a
 // border of color |color| with the sizes specified in pixels.
 GtkWidget* CreateGtkBorderBin(GtkWidget* child, const GdkColor* color,
                               int top, int bottom, int left, int right);
@@ -30,6 +36,6 @@ GtkWidget* CreateGtkBorderBin(GtkWidget* child, const GdkColor* color,
 // Remove all children from this container.
 void RemoveAllChildren(GtkWidget* container);
 
-}  // namespace gtk_util
+}  // namespace gfx
 
 #endif  // CHROME_COMMON_GTK_UTIL_H_