Reverting 16124.

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

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

10 files changed, 26 insertions, 52 deletions

diff --git a/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc
index 6787338..033bc8ee 100644
--- a/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/bookmarks/bookmark_menu_controller_gtk.cc
@@ -6,6 +6,7 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index ebfe567..649c2c64 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/gtk/bookmark_bar_gtk.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ -95,7 +96,7 @@ void BookmarkBarGtk::Init(Profile* profile) {
   static GdkPixbuf* folder_icon = rb.GetPixbufNamed(IDR_BOOKMARK_BAR_FOLDER);
 
   bookmark_hbox_ = gtk_hbox_new(FALSE, 0);
-  container_.Own(gfx::CreateGtkBorderBin(bookmark_hbox_, &kBackgroundColor,
+  container_.Own(gtk_util::CreateGtkBorderBin(bookmark_hbox_, &kBackgroundColor,
       kBarPadding, kBarPadding, kBarPadding, kBarPadding));
 
   instructions_ =
@@ -273,7 +274,7 @@ void BookmarkBarGtk::SetInstructionState(BookmarkNode* boomarks_bar_node) {
 }
 
 void BookmarkBarGtk::RemoveAllBookmarkButtons() {
-  gfx::RemoveAllChildren(bookmark_toolbar_.get());
+  gtk_util::RemoveAllChildren(bookmark_toolbar_.get());
 }
 
 int BookmarkBarGtk::GetBookmarkButtonCount() {
diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc
index 30720d2..2a2c27d 100644
--- a/chrome/browser/gtk/find_bar_gtk.cc
+++ b/chrome/browser/gtk/find_bar_gtk.cc
@@ -99,7 +99,7 @@ void FindBarGtk::InitWidgets() {
   // lateral position. We put that fixed in a SlideAnimatorGtk in order to get
   // the slide effect.
   GtkWidget* hbox = gtk_hbox_new(false, 0);
-  container_ = gfx::CreateGtkBorderBin(hbox, NULL,
+  container_ = gtk_util::CreateGtkBorderBin(hbox, NULL,
       kBarPaddingTopBottom, kBarPaddingTopBottom,
       kEntryPaddingLeft, kBarPaddingRight);
   gtk_widget_set_app_paintable(container_, TRUE);
@@ -162,12 +162,12 @@ void FindBarGtk::InitWidgets() {
   gtk_box_pack_end(GTK_BOX(content_hbox), text_entry_, TRUE, TRUE, 0);
 
   // We fake anti-aliasing by having two borders.
-  GtkWidget* border_bin = gfx::CreateGtkBorderBin(content_hbox,
-                                                  &kTextBorderColor,
-                                                  1, 1, 1, 0);
-  GtkWidget* border_bin_aa = gfx::CreateGtkBorderBin(border_bin,
-                                                     &kTextBorderColorAA,
-                                                     1, 1, 1, 0);
+  GtkWidget* border_bin = gtk_util::CreateGtkBorderBin(content_hbox,
+                                                       &kTextBorderColor,
+                                                      1, 1, 1, 0);
+  GtkWidget* border_bin_aa = gtk_util::CreateGtkBorderBin(border_bin,
+                                                          &kTextBorderColorAA,
+                                                          1, 1, 1, 0);
   GtkWidget* centering_vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(centering_vbox), border_bin_aa, TRUE, FALSE, 0);
   gtk_box_pack_end(GTK_BOX(hbox), centering_vbox, FALSE, FALSE, 0);
diff --git a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
index 682ab0d..2ca6699 100644
--- a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
+++ b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
@@ -6,11 +6,11 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/process_util.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/common/gtk_util.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/result_codes.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/gtk/infobar_container_gtk.cc b/chrome/browser/gtk/infobar_container_gtk.cc
index f560ca1..3623497 100644
--- a/chrome/browser/gtk/infobar_container_gtk.cc
+++ b/chrome/browser/gtk/infobar_container_gtk.cc
@@ -65,7 +65,7 @@ void InfoBarContainerGtk::ChangeTabContents(TabContents* contents) {
         Source<TabContents>(tab_contents_));
   }
 
-  gfx::RemoveAllChildren(container_.get());
+  gtk_util::RemoveAllChildren(container_.get());
 
   tab_contents_ = contents;
   if (tab_contents_) {
diff --git a/chrome/browser/gtk/infobar_gtk.cc b/chrome/browser/gtk/infobar_gtk.cc
index fcee318..e129fa9 100644
--- a/chrome/browser/gtk/infobar_gtk.cc
+++ b/chrome/browser/gtk/infobar_gtk.cc
@@ -6,6 +6,7 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/gtk/custom_button.h"
@@ -49,8 +50,8 @@ InfoBar::InfoBar(InfoBarDelegate* delegate)
 
   // Set the top border and background color.
   gtk_widget_modify_bg(bg_box, GTK_STATE_NORMAL, &kBackgroundColor);
-  border_bin_.Own(gfx::CreateGtkBorderBin(bg_box, &kBorderColor,
-                                          0, 1, 0, 0));
+  border_bin_.Own(gtk_util::CreateGtkBorderBin(bg_box, &kBorderColor,
+                                               0, 1, 0, 0));
   gtk_widget_set_size_request(border_bin_.get(), -1, kInfoBarHeight);
 
   // Add the icon on the left, if any.
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index 5ffac91..6279b28 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/browser/gtk/menu_gtk.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "chrome/common/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate,
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 8ca0259..db5ff38 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -188,6 +188,8 @@
         '../app/gfx/color_utils.cc',
         '../app/gfx/color_utils.h',
         '../app/gfx/favicon_size.h',
+        '../app/gfx/gtk_util.cc',
+        '../app/gfx/gtk_util.h',
         '../app/gfx/icon_util.cc',
         '../app/gfx/icon_util.h',
         '../app/gfx/insets.h',
@@ -335,8 +337,6 @@
         'common/gfx/emf.cc',
         'common/gfx/emf.h',
         'common/gfx/utils.h',
-        'common/gtk_util.cc',
-        'common/gtk_util.h',
         'common/net/cookie_monster_sqlite.cc',
         'common/net/cookie_monster_sqlite.h',
         'common/net/dns.h',
@@ -387,6 +387,8 @@
         'common/file_descriptor_set_posix.h',
         'common/filter_policy.h',
         'common/gears_api.h',
+        'common/gtk_util.cc',
+        'common/gtk_util.h',
         'common/important_file_writer.cc',
         'common/important_file_writer.h',
         'common/ipc_channel.h',
diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc
index d246ccc..f0d5ea1 100644
--- a/chrome/common/gtk_util.cc
+++ b/chrome/common/gtk_util.cc
@@ -16,10 +16,6 @@ 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 {
@@ -37,28 +33,7 @@ WindowOpenDisposition DispositionFromEventFlags(guint event_flags) {
 
 }  // namespace event_utils
 
-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;
-}
+namespace gtk_util {
 
 GtkWidget* CreateGtkBorderBin(GtkWidget* child, const GdkColor* color,
                               int top, int bottom, int left, int right) {
@@ -79,4 +54,4 @@ void RemoveAllChildren(GtkWidget* container) {
   gtk_container_foreach(GTK_CONTAINER(container), RemoveWidget, container);
 }
 
-}  // namespace gfx
+}  // namespace gtk_util
diff --git a/chrome/common/gtk_util.h b/chrome/common/gtk_util.h
index ff3dc5c..9a94182 100644
--- a/chrome/common/gtk_util.h
+++ b/chrome/common/gtk_util.h
@@ -9,9 +9,7 @@
 
 #include "webkit/glue/window_open_disposition.h"
 
-typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GtkWidget GtkWidget;
-class SkBitmap;
 
 namespace event_utils {
 
@@ -22,13 +20,9 @@ WindowOpenDisposition DispositionFromEventFlags(guint state);
 
 }  // namespace event_utils
 
-namespace gfx {
+namespace gtk_util {
 
-// 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
+  // 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);
@@ -36,6 +30,6 @@ GtkWidget* CreateGtkBorderBin(GtkWidget* child, const GdkColor* color,
 // Remove all children from this container.
 void RemoveAllChildren(GtkWidget* container);
 
-}  // namespace gfx
+}  // namespace gtk_util
 
 #endif  // CHROME_COMMON_GTK_UTIL_H_