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

server and have better performance. In the presence of XRender, let cairo do
things smarter."

Valgrind problems.

This reverts commit 03871714c3e5b39ee0f8369ecc2313c02fe0ca08 (r25814).

Review URL: http://codereview.chromium.org/200071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25828 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 16 deletions

diff --git a/chrome/browser/gtk/gtk_theme_provider.h b/chrome/browser/gtk/gtk_theme_provider.h
index 526d245..e914d89 100644
--- a/chrome/browser/gtk/gtk_theme_provider.h
+++ b/chrome/browser/gtk/gtk_theme_provider.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_GTK_GTK_THEME_PROVIDER_H_
 #define CHROME_BROWSER_GTK_GTK_THEME_PROVIDER_H_
 
-#include <map>
 #include <string>
 #include <vector>
 
@@ -15,10 +14,8 @@
 
 #include "skia/ext/skia_utils.h"
 
-class CairoCachedSurface;
 class Profile;
 
-typedef struct _GdkDisplay GdkDisplay;
 typedef struct _GtkStyle GtkStyle;
 typedef struct _GtkWidget GtkWidget;
 
@@ -70,11 +67,6 @@ class GtkThemeProvider : public BrowserThemeProvider,
   GtkWidget* fake_window() { return fake_window_; }
   GtkWidget* fake_label() { return fake_label_.get(); }
 
-  // Returns a CairoCachedSurface for a particular Display. CairoCachedSurfaces
-  // (hopefully) live on the X server, instead of the client so we don't have
-  // to send the image to the server on each expose.
-  CairoCachedSurface* GetSurfaceNamed(int id, GtkWidget* widget_on_display);
-
  protected:
   // Possibly creates a theme specific version of theme_toolbar_default.
   // (minimally acceptable version right now, which is just a fill of the bg
@@ -93,9 +85,6 @@ class GtkThemeProvider : public BrowserThemeProvider,
   // the superclass.
   virtual void SaveThemeBitmap(const std::string resource_name, int id);
 
-  // Additionally frees the CairoCachedSurfaces.
-  virtual void FreePlatformCaches();
-
   // Handles signal from GTK that our theme has been changed.
   static void OnStyleSet(GtkWidget* widget,
                          GtkStyle* previous_style,
@@ -124,11 +113,6 @@ class GtkThemeProvider : public BrowserThemeProvider,
   // A list of all GtkChromeButton instances. We hold on to these to notify
   // them of theme changes.
   std::vector<GtkWidget*> chrome_buttons_;
-
-  // Cairo surfaces for each GdkDisplay.
-  typedef std::map<int, CairoCachedSurface*> CairoCachedSurfaceMap;
-  typedef std::map<GdkDisplay*, CairoCachedSurfaceMap> PerDisplaySurfaceMap;
-  PerDisplaySurfaceMap per_display_surfaces_;
 };
 
 #endif  // CHROME_BROWSER_GTK_GTK_THEME_PROVIDER_H_