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

chrome/browser/gtk/toolbar_star_toggle_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/toolbar_star_toggle_gtk.h"
 
 #include "app/gtk_dnd_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/rect.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/bookmark_bubble_gtk.h"
 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "grit/theme_resources.h"
 
 ToolbarStarToggleGtk::ToolbarStarToggleGtk(BrowserToolbarGtk* host)
     : host_(host),
       widget_(gtk_chrome_button_new()),
       is_starred_(false),
       theme_provider_(GtkThemeProvider::GetFrom(host->profile())),
       unstarred_(theme_provider_, IDR_STAR, IDR_STAR_P, IDR_STAR_H, IDR_STAR_D),
       starred_(theme_provider_, IDR_STARRED, IDR_STARRED_P, IDR_STARRED_H, 0) {
-  gtk_widget_set_size_request(widget_.get(), unstarred_.Width(),
-                              unstarred_.Height());
+  gtk_widget_set_size_request(widget_.get(),
+                             gdk_pixbuf_get_width(unstarred_.pixbufs(0)),
+                             gdk_pixbuf_get_height(unstarred_.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(), "expose-event",
                    G_CALLBACK(OnExpose), this);
   GTK_WIDGET_UNSET_FLAGS(widget_.get(), GTK_CAN_FOCUS);
 
   gtk_drag_source_set(widget(), GDK_BUTTON1_MASK,
@@ skipping 84 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(), unstarred_.Width(),
-                                unstarred_.Height());
+    gtk_widget_set_size_request(widget_.get(),
+                                gdk_pixbuf_get_width(unstarred_.pixbufs(0)),
+                                gdk_pixbuf_get_height(unstarred_.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);
 }