Reapplies the GdkPixbuf -> cairo surface patch.

chrome/browser/gtk/gtk_theme_provider.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/gtk_theme_provider.h"
 
 #include <gtk/gtk.h>
 
 #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"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_gtk.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 47 matching lines @@
   // broadcast new theme images and colors.
   gtk_widget_realize(fake_window_);
   g_signal_connect(fake_window_, "style-set", G_CALLBACK(&OnStyleSet), this);
 }
 
 GtkThemeProvider::~GtkThemeProvider() {
   profile()->GetPrefs()->RemovePrefObserver(prefs::kUsesSystemTheme, this);
   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();
        it != chrome_buttons_.end(); ++it) {
     gtk_signal_disconnect_by_data(GTK_OBJECT(*it), this);
   }
 }
 
 void GtkThemeProvider::Init(Profile* profile) {
   profile->GetPrefs()->AddPrefObserver(prefs::kUsesSystemTheme, this);
@@ skipping 67 matching lines @@
   color.green = (style->text[GTK_STATE_NORMAL].green +
                  (style->bg[GTK_STATE_NORMAL].green * kBgWeight)) /
                 (1 + kBgWeight);
   color.blue = (style->text[GTK_STATE_NORMAL].blue +
                 (style->bg[GTK_STATE_NORMAL].blue * kBgWeight)) /
                (1 + kBgWeight);
 
   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();
   } else {
     BrowserThemeProvider::LoadThemePrefs();
   }
 }
 
 void GtkThemeProvider::NotifyThemeChanged() {
   BrowserThemeProvider::NotifyThemeChanged();
@@ skipping 25 matching lines @@
                                        int id) {
   if (!use_gtk_) {
     // Prevent us from writing out our mostly unused resources in gtk theme
     // mode. Simply preventing us from writing this data out in gtk mode isn't
     // the best design, but this would probably be a very invasive change on
     // all three platforms otherwise.
     BrowserThemeProvider::SaveThemeBitmap(resource_name, id);
   }
 }
 
+void GtkThemeProvider::FreePlatformCaches() {
+  BrowserThemeProvider::FreePlatformCaches();
+  FreePerDisplaySurfaces();
+}
+
 // static
 void GtkThemeProvider::OnStyleSet(GtkWidget* widget,
                                   GtkStyle* previous_style,
                                   GtkThemeProvider* provider) {
   if (provider->profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme)) {
     provider->ClearAllThemeData();
     provider->LoadGtkValues();
     provider->NotifyThemeChanged();
   }
 }
@@ skipping 134 matching lines @@
   skia::SkColorToHSL(GdkToSkColor(color), hsl);
 
   if (default_tint.s != -1)
     hsl.s = default_tint.s;
 
   if (default_tint.l != -1)
     hsl.l = default_tint.l;
   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 =
       find(provider->chrome_buttons_.begin(), provider->chrome_buttons_.end(),
            button);
   if (it != provider->chrome_buttons_.end())
     provider->chrome_buttons_.erase(it);
 }