Move GdkPixbufFromSkBitmap to gtk_util so it can easily be shared.

chrome/browser/gtk/menu_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/menu_gtk.h"
 
+#include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/common/l10n_util.h"
 #include "skia/include/SkBitmap.h"
 
 namespace {
 
 // GTK uses _ for accelerators.  Windows uses & with && as an escape for &.
 std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label) {
   std::string ret;
   ret.reserve(label.length());
   for (size_t i = 0; i < label.length(); ++i) {
     if ('&' == label[i]) {
       if (i + 1 < label.length() && '&' == label[i + 1]) {
         ret.push_back(label[i]);
         ++i;
       } else {
         ret.push_back('_');
       }
     } else {
       ret.push_back(label[i]);
     }
   }
 
   return ret;
 }
 
-void FreePixels(guchar* pixels, gpointer data) {
-  free(data);
-}
-
-// We have to copy the pixels and reverse their order manually.
-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));
-
-  // 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
 
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate,
                  const MenuCreateMaterial* menu_data,
                  GtkAccelGroup* accel_group)
     : delegate_(delegate),
       accel_group_(accel_group),
       menu_(gtk_menu_new()) {
   g_object_ref_sink(menu_);
   BuildMenuIn(menu_, menu_data);
@@ skipping 113 matching lines @@
   // Note that the menu IDs start at 1, not 0.
   for (int i = 1; i <= delegate_->GetItemCount(); ++i) {
     GtkWidget* menu_item = NULL;
 
     if (delegate_->IsItemSeparator(i)) {
       menu_item = gtk_separator_menu_item_new();
     } else if (delegate_->HasIcon(i)) {
       menu_item = gtk_image_menu_item_new_with_label(
           delegate_->GetLabel(i).c_str());
       const SkBitmap* icon = delegate_->GetIcon(i);
-      GdkPixbuf* pixbuf = GdkPixbufFromSkBitmap(icon);
+      GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(icon);
       GtkWidget* widget = gtk_image_new_from_pixbuf(pixbuf);
       gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), widget);
       g_object_unref(pixbuf);
     } else {
       menu_item = gtk_menu_item_new_with_label(delegate_->GetLabel(i).c_str());
     }
 
     g_object_set_data(G_OBJECT(menu_item), "menu-id",
                       reinterpret_cast<void*>(i));
 
@@ skipping 86 matching lines @@
           widget, menu->delegate_->IsCommandEnabled(data->id));
 
       GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
       if (submenu) {
         gtk_container_foreach(GTK_CONTAINER(submenu), &MenuGtk::SetMenuItemInfo,
                               raw_menu);
       }
     }
   }
 }