Revert "Upload GdkPixbufs into cairo surfaces so they (hopefully) live on the X

chrome/browser/gtk/go_button_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/go_button_gtk.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 18 matching lines @@
       button_delay_(0),
       stop_timer_(this),
       intended_mode_(MODE_GO),
       visible_mode_(MODE_GO),
       state_(BS_NORMAL),
       theme_provider_(browser ?
                       GtkThemeProvider::GetFrom(browser->profile()) : NULL),
       go_(theme_provider_, IDR_GO, IDR_GO_P, IDR_GO_H, 0),
       stop_(theme_provider_, IDR_STOP, IDR_STOP_P, IDR_STOP_H, 0),
       widget_(gtk_chrome_button_new()) {
-  gtk_widget_set_size_request(widget_.get(), go_.Width(), go_.Height());
+  gtk_widget_set_size_request(widget_.get(),
+                              gdk_pixbuf_get_width(go_.pixbufs(0)),
+                              gdk_pixbuf_get_height(go_.pixbufs(0)));
 
   gtk_widget_set_app_paintable(widget_.get(), TRUE);
   // We effectively double-buffer by virtue of having only one image...
   gtk_widget_set_double_buffered(widget_.get(), FALSE);
 
   g_signal_connect(widget_.get(), "expose-event",
                    G_CALLBACK(OnExpose), this);
   g_signal_connect(widget_.get(), "enter",
                    G_CALLBACK(OnEnter), this);
   g_signal_connect(widget_.get(), "leave",
@@ skipping 186 matching lines @@
     }
 
     gtk_button_set_image(
         GTK_BUTTON(widget_.get()),
         gtk_image_new_from_pixbuf(pixbuf));
 
     gtk_widget_set_size_request(widget_.get(), -1, -1);
     gtk_widget_set_app_paintable(widget_.get(), FALSE);
     gtk_widget_set_double_buffered(widget_.get(), TRUE);
   } else {
-    gtk_widget_set_size_request(widget_.get(), go_.Width(), go_.Height());
+    gtk_widget_set_size_request(widget_.get(),
+                                gdk_pixbuf_get_width(go_.pixbufs(0)),
+                                gdk_pixbuf_get_height(go_.pixbufs(0)));
 
     gtk_widget_set_app_paintable(widget_.get(), TRUE);
     // We effectively double-buffer by virtue of having only one image...
     gtk_widget_set_double_buffered(widget_.get(), FALSE);
   }
 
   gtk_chrome_button_set_use_gtk_rendering(
       GTK_CHROME_BUTTON(widget_.get()), use_gtk);
 }