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

chrome/browser/gtk/toolbar_star_toggle_gtk.cc

Index: chrome/browser/gtk/toolbar_star_toggle_gtk.cc
diff --git a/chrome/browser/gtk/toolbar_star_toggle_gtk.cc b/chrome/browser/gtk/toolbar_star_toggle_gtk.cc
index 8723a4885ce3219e47c5ed5640e2b04be090021b..986e5537c92a4fc94dca95cfbf10d8986a8632a3 100644
--- a/chrome/browser/gtk/toolbar_star_toggle_gtk.cc
+++ b/chrome/browser/gtk/toolbar_star_toggle_gtk.cc
@@ -24,9 +24,8 @@ ToolbarStarToggleGtk::ToolbarStarToggleGtk(BrowserToolbarGtk* host)
       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(),
-                             gdk_pixbuf_get_width(unstarred_.pixbufs(0)),
-                             gdk_pixbuf_get_height(unstarred_.pixbufs(0)));
+  gtk_widget_set_size_request(widget_.get(), unstarred_.width(),
+                              unstarred_.height());
 
   gtk_widget_set_app_paintable(widget_.get(), TRUE);
   // We effectively double-buffer by virtue of having only one image...
@@ -131,9 +130,8 @@ void ToolbarStarToggleGtk::UpdateGTKButton() {
     gtk_widget_set_app_paintable(widget_.get(), FALSE);
     gtk_widget_set_double_buffered(widget_.get(), TRUE);
   } else {
-    gtk_widget_set_size_request(widget_.get(),
-                                gdk_pixbuf_get_width(unstarred_.pixbufs(0)),
-                                gdk_pixbuf_get_height(unstarred_.pixbufs(0)));
+    gtk_widget_set_size_request(widget_.get(), unstarred_.width(),
+                                unstarred_.height());
 
     gtk_widget_set_app_paintable(widget_.get(), TRUE);
     // We effectively double-buffer by virtue of having only one image...