Reapplies the GdkPixbuf -> cairo surface patch.

chrome/browser/gtk/gtk_theme_provider.cc

Index: chrome/browser/gtk/gtk_theme_provider.cc
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc
index 6b37ed5410eeb5a415ffab64c8b5d2b5a1a8f393..b1c07d563d7e0ffb250154922860eb02ee795f70 100644
--- a/chrome/browser/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/gtk/gtk_theme_provider.cc
@@ -9,6 +9,7 @@
 #include "base/gfx/gtk_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/notification_details.h"
@@ -76,6 +77,8 @@ GtkThemeProvider::~GtkThemeProvider() {
   gtk_widget_destroy(fake_window_);
   fake_label_.Destroy();
 
+  FreePerDisplaySurfaces();
+
   // Disconnect from the destroy signal of any redisual widgets in
   // |chrome_buttons_|.
   for (std::vector<GtkWidget*>::iterator it = chrome_buttons_.begin();
@@ -163,6 +166,25 @@ GdkColor GtkThemeProvider::GetBorderColor() {
   return color;
 }
 
+CairoCachedSurface* GtkThemeProvider::GetSurfaceNamed(
+    int id, GtkWidget* widget_on_display) {
+  GdkDisplay* display = gtk_widget_get_display(widget_on_display);
+  CairoCachedSurfaceMap& surface_map = per_display_surfaces_[display];
+
+  // Check to see if we already have the pixbuf in the cache.
+  CairoCachedSurfaceMap::const_iterator found = surface_map.find(id);
+  if (found != surface_map.end())
+    return found->second;
+
+  GdkPixbuf* pixbuf = GetPixbufNamed(id);
+  CairoCachedSurface* surface = new CairoCachedSurface;
+  surface->UsePixbuf(pixbuf);
+
+  surface_map[id] = surface;
+
+  return surface;
+}
+
 void GtkThemeProvider::LoadThemePrefs() {
   if (use_gtk_) {
     LoadGtkValues();
@@ -208,6 +230,11 @@ void GtkThemeProvider::SaveThemeBitmap(const std::string resource_name,
   }
 }
 
+void GtkThemeProvider::FreePlatformCaches() {
+  BrowserThemeProvider::FreePlatformCaches();
+  FreePerDisplaySurfaces();
+}
+
 // static
 void GtkThemeProvider::OnStyleSet(GtkWidget* widget,
                                   GtkStyle* previous_style,
@@ -362,6 +389,17 @@ void GtkThemeProvider::SetThemeTintFromGtk(const char* id, GdkColor* color,
   SetTint(id, hsl);
 }
 
+void GtkThemeProvider::FreePerDisplaySurfaces() {
+  for (PerDisplaySurfaceMap::iterator it = per_display_surfaces_.begin();
+       it != per_display_surfaces_.end(); ++it) {
+    for (CairoCachedSurfaceMap::iterator jt = it->second.begin();
+         jt != it->second.end(); ++jt) {
+      delete jt->second;
+    }
+  }
+  per_display_surfaces_.clear();
+}
+
 void GtkThemeProvider::OnDestroyChromeButton(GtkWidget* button,
                                              GtkThemeProvider* provider) {
   std::vector<GtkWidget*>::iterator it =