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

chrome/browser/gtk/find_bar_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/find_bar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "app/l10n_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/slide_animator_gtk.h"
 #include "chrome/browser/gtk/tab_contents_container_gtk.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/gtk/view_id_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_service.h"
@@ skipping 729 matching lines @@
       bar->container_width_ = widget->allocation.width;
       bar->container_height_ = widget->allocation.height;
     }
 
     // Draw the background theme image.
     cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
     cairo_rectangle(cr, e->area.x, e->area.y, e->area.width, e->area.height);
     cairo_clip(cr);
     gfx::Point tabstrip_origin =
         bar->window_->tabstrip()->GetTabStripOriginForWidget(widget);
-    CairoCachedSurface* background = bar->theme_provider_->GetSurfaceNamed(
-        IDR_THEME_TOOLBAR, widget);
-    background->SetSource(cr, tabstrip_origin.x(), tabstrip_origin.y());
+    GdkPixbuf* background = bar->browser_->profile()->GetThemeProvider()->
+        GetPixbufNamed(IDR_THEME_TOOLBAR);
+    gdk_cairo_set_source_pixbuf(cr, background,
+                                tabstrip_origin.x(), tabstrip_origin.y());
     cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
     cairo_rectangle(cr, tabstrip_origin.x(), tabstrip_origin.y(),
                         e->area.x + e->area.width - tabstrip_origin.x(),
-                        background->Height());
+                        gdk_pixbuf_get_height(background));
     cairo_fill(cr);
     cairo_destroy(cr);
 
     // Draw the border.
     GetDialogBorder()->RenderToWidget(widget);
   }
 
   // Propagate to the container's child.
   GtkWidget* child = gtk_bin_get_child(GTK_BIN(widget));
   if (child)
@@ skipping 11 matching lines @@
 }
 
 // static
 gboolean FindBarGtk::OnButtonPress(GtkWidget* text_entry, GdkEventButton* e,
                                    FindBarGtk* find_bar) {
   find_bar->StoreOutsideFocus();
 
   // Continue propagating the event.
   return FALSE;
 }