GTK: Move CairoCachedSurface from being owned by GtkThemeService to gfx::Image.

chrome/browser/ui/gtk/gtk_theme_service.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
 #define CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "ui/base/glib/glib_integers.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 #include "ui/gfx/color_utils.h"
 
+class Profile;
+
+namespace gfx {
 class CairoCachedSurface;
-class Profile;
+}
 
 namespace ui {
 class GtkSignalRegistrar;
 }
 
 typedef struct _GdkDisplay GdkDisplay;
 typedef struct _GdkEventExpose GdkEventExpose;
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GtkIconSet GtkIconSet;
 typedef struct _GtkStyle GtkStyle;
@@ skipping 75 matching lines @@
   void GetScrollbarColors(GdkColor* thumb_active_color,
                           GdkColor* thumb_inactive_color,
                           GdkColor* track_color);
 
   // Expose the inner label. Only used for testing.
   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);
+  gfx::CairoCachedSurface* GetSurfaceNamed(
+      int id, GtkWidget* widget_on_display);
 
   // Same as above, but auto-mirrors the underlying pixbuf in RTL mode.
-  CairoCachedSurface* GetRTLEnabledSurfaceNamed(int id,
-                                                GtkWidget* widget_on_display);
+  gfx::CairoCachedSurface* GetRTLEnabledSurfaceNamed(
+      int id, GtkWidget* widget_on_display);
 
   // Same as above, but gets the resource from the ResourceBundle instead of the
   // ThemeService.
   // NOTE: Never call this with resource IDs that are ever passed to the above
   // two functions!  Depending on which call comes first, all callers will
   // either get the themed or the unthemed version.
-  CairoCachedSurface* GetUnthemedSurfaceNamed(int id,
-                                              GtkWidget* widget_on_display);
+  gfx::CairoCachedSurface* GetUnthemedSurfaceNamed(
+      int id, GtkWidget* widget_on_display);
 
   // A way to get a cached cairo surface for the equivalent of GetFolderIcon()
   // or GetDefaultFavicon(). Uses the ids defined in CairoDefaultIcon.
-  CairoCachedSurface* GetCairoIcon(int id, GtkWidget* widget_on_display);
+  gfx::CairoCachedSurface* GetCairoIcon(int id, GtkWidget* widget_on_display);
 
   // Returns colors that we pass to webkit to match the system theme.
   const SkColor& get_focus_ring_color() const { return focus_ring_color_; }
   const SkColor& get_thumb_active_color() const { return thumb_active_color_; }
   const SkColor& get_thumb_inactive_color() const {
     return thumb_inactive_color_;
   }
   const SkColor& get_track_color() const { return track_color_; }
   const SkColor& get_active_selection_bg_color() const {
     return active_selection_bg_color_;
@@ skipping 14 matching lines @@
   static GdkPixbuf* GetDefaultFavicon(bool native);
 
   // Whether we use the GTK theme by default in the current desktop
   // environment. Returns true when we GTK defaults to on.
   static bool DefaultUsesSystemTheme();
 
  private:
   typedef std::map<int, SkColor> ColorMap;
   typedef std::map<int, color_utils::HSL> TintMap;
   typedef std::map<int, SkBitmap*> ImageCache;
-  typedef std::map<int, CairoCachedSurface*> CairoCachedSurfaceMap;
+  typedef std::map<int, gfx::CairoCachedSurface*> CairoCachedSurfaceMap;
   typedef std::map<GdkDisplay*, CairoCachedSurfaceMap> PerDisplaySurfaceMap;
 
   typedef GdkPixbuf*(GtkThemeService::*PixbufProvidingMethod)(int id) const;
 
   // Clears all the GTK color overrides.
   virtual void ClearAllThemeData() OVERRIDE;
 
   // Load theme data from preferences, possibly picking colors from GTK.
   virtual void LoadThemePrefs() OVERRIDE;
 
@@ skipping 63 matching lines @@
   void GetNormalButtonTintHSL(color_utils::HSL* tint) const;
 
   // Returns a tint that's the color of the current normal text in an entry.
   void GetNormalEntryForegroundHSL(color_utils::HSL* tint) const;
 
   // Returns a tint that's the color of the current highlighted text in an
   // entry.
   void GetSelectedEntryForegroundHSL(color_utils::HSL* tint) const;
 
   // Implements GetXXXSurfaceNamed(), given the appropriate pixbuf to use.
-  CairoCachedSurface* GetSurfaceNamedImpl(
+  gfx::CairoCachedSurface* GetSurfaceNamedImpl(
       int id,
       PerDisplaySurfaceMap* surface_map,
       PixbufProvidingMethod provider,
       GtkWidget* widget_on_display);
 
   // PixbufProvidingMethods passed to GetSurfaceNamedImpl from GetSurface*
   // methods. We don't want to always fetch the pixbuf and pass the pixbuf to
   // GetSurfaceNamedImpl which will throw away the result most of the time.
   //
   // Especially since GetUnthemedNativePixbuf always locks and
@@ skipping 78 matching lines @@
 
   // The default folder icon and default bookmark icon for the GTK theme.
   // These are static because the system can only have one theme at a time.
   // They are cached when they are requested the first time, and cleared when
   // the system theme changes.
   static GdkPixbuf* default_folder_icon_;
   static GdkPixbuf* default_bookmark_icon_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_