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

chrome/browser/ui/gtk/gtk_theme_service.cc

 
 // 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.
 
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 
 #include <gtk/gtk.h>
 
 #include <set>
 #include <string>
 
 #include "base/environment.h"
 #include "base/nix/xdg_util.h"
 #include "base/stl_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/chrome_gtk_frame.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/hover_controller_gtk.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/gtk_util.h"
+#include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/skia_utils_gtk.h"
 
 namespace {
 
 // The size of the rendered toolbar image.
 const int kToolbarImageWidth = 64;
 const int kToolbarImageHeight = 128;
@@ skipping 500 matching lines @@
   if (theme_thumb_active)
     *thumb_active_color = *theme_thumb_active;
 
   if (theme_thumb_inactive)
     *thumb_inactive_color = *theme_thumb_inactive;
 
   if (theme_trough_color)
     *track_color = *theme_trough_color;
 }
 
-CairoCachedSurface* GtkThemeService::GetSurfaceNamed(
+gfx::CairoCachedSurface* GtkThemeService::GetSurfaceNamed(
     int id,
     GtkWidget* widget_on_display) {
   return GetSurfaceNamedImpl(
       id,
       &per_display_surfaces_,
       &GtkThemeService::GetPixbufNamed,
       widget_on_display);
 }
 
-CairoCachedSurface* GtkThemeService::GetRTLEnabledSurfaceNamed(
+gfx::CairoCachedSurface* GtkThemeService::GetRTLEnabledSurfaceNamed(
     int id,
     GtkWidget* widget_on_display) {
   // We flip the sign of |id| when passing it to GetSurfaceNamedImpl() for the
   // same reason that ThemeService::GetPixbufImpl() does: so that if one
   // location calls this function with a resource ID, and another place calls
   // GetSurfaceNamed() with the same ID, they'll correctly get different
   // surfaces in RTL mode.
   return GetSurfaceNamedImpl(
       -id,
       &per_display_surfaces_,
       &GtkThemeService::GetRTLEnabledPixbufNamedWrapper,
       widget_on_display);
 }
 
-CairoCachedSurface* GtkThemeService::GetUnthemedSurfaceNamed(
+gfx::CairoCachedSurface* GtkThemeService::GetUnthemedSurfaceNamed(
     int id,
     GtkWidget* widget_on_display) {
   return GetSurfaceNamedImpl(id,
       &per_display_unthemed_surfaces_,
       &GtkThemeService::GetUnthemedNativePixbuf,
       widget_on_display);
 }
 
-CairoCachedSurface* GtkThemeService::GetCairoIcon(
+gfx::CairoCachedSurface* GtkThemeService::GetCairoIcon(
     int id,
     GtkWidget* widget_on_display) {
   return GetSurfaceNamedImpl(id,
                              &per_display_icon_surfaces_,
                              &GtkThemeService::GetPixbufForIconId,
                              widget_on_display);
 }
 
 // static
 GdkPixbuf* GtkThemeService::GetFolderIcon(bool native) {
@@ skipping 513 matching lines @@
 void GtkThemeService::GetSelectedEntryForegroundHSL(
     color_utils::HSL* tint) const {
   // The simplest of all the tints. We just use the selected text in the entry
   // since the icons tinted this way will only be displayed against
   // base[GTK_STATE_SELECTED].
   GtkStyle* style = gtk_rc_get_style(fake_entry_.get());
   const GdkColor color = style->text[GTK_STATE_SELECTED];
   color_utils::SkColorToHSL(GdkToSkColor(&color), tint);
 }
 
-CairoCachedSurface* GtkThemeService::GetSurfaceNamedImpl(
+gfx::CairoCachedSurface* GtkThemeService::GetSurfaceNamedImpl(
     int id,
     PerDisplaySurfaceMap* display_surface_map,
     PixbufProvidingMethod provider,
     GtkWidget* widget_on_display) {
   GdkDisplay* display = gtk_widget_get_display(widget_on_display);
   CairoCachedSurfaceMap& surface_map = (*display_surface_map)[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;
 
-  CairoCachedSurface* surface = new CairoCachedSurface;
+  gfx::CairoCachedSurface* surface = new gfx::CairoCachedSurface;
   surface->UsePixbuf((this->*provider)(id));
 
   surface_map[id] = surface;
 
   return surface;
 }
 
 // PixbufProvidingMethod that undoes the negative sign on |id|.
 GdkPixbuf* GtkThemeService::GetRTLEnabledPixbufNamedWrapper(int id) const {
   return GetRTLEnabledPixbufNamed(-id);
@@ skipping 80 matching lines @@
   cairo_set_line_width(cr, 1.0);
   cairo_move_to(cr, start_x, widget->allocation.y);
   cairo_line_to(cr, start_x,
                 widget->allocation.y + widget->allocation.height);
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }