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

chrome/browser/ui/gtk/custom_button.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/custom_button.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
+#include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeService* theme_provider,
                                            int normal_id,
                                            int pressed_id,
                                            int hover_id,
                                            int disabled_id)
     : background_image_(NULL),
       paint_override_(-1),
       normal_id_(normal_id),
       pressed_id_(pressed_id),
       hover_id_(hover_id),
       disabled_id_(disabled_id),
       theme_service_(theme_provider),
       flipped_(false) {
   for (int i = 0; i < (GTK_STATE_INSENSITIVE + 1); ++i)
-    surfaces_[i].reset(new CairoCachedSurface);
-  background_image_.reset(new CairoCachedSurface);
+    surfaces_[i].reset(new gfx::CairoCachedSurface);
+  background_image_.reset(new gfx::CairoCachedSurface);
 
   if (theme_provider) {
     // Load images by pretending that we got a BROWSER_THEME_CHANGED
     // notification.
     theme_provider->InitThemesFor(this);
 
     registrar_.Add(this,
                    chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                    content::Source<ThemeService>(theme_provider));
   } else {
@@ skipping 27 matching lines @@
                                         gdouble hover_state) {
   int paint_state = paint_override_ >= 0 ?
                     paint_override_ : gtk_widget_get_state(widget);
 
   // If the paint state is PRELIGHT then set it to NORMAL (we will paint the
   // hover state according to |hover_state_|).
   if (paint_state == GTK_STATE_PRELIGHT)
     paint_state = GTK_STATE_NORMAL;
   bool animating_hover = hover_state > 0.0 &&
       paint_state == GTK_STATE_NORMAL;
-  CairoCachedSurface* pixbuf = PixbufForState(paint_state);
-  CairoCachedSurface* hover_pixbuf = PixbufForState(GTK_STATE_PRELIGHT);
+  gfx::CairoCachedSurface* pixbuf = PixbufForState(paint_state);
+  gfx::CairoCachedSurface* hover_pixbuf = PixbufForState(GTK_STATE_PRELIGHT);
 
   if (!pixbuf || !pixbuf->valid())
     return FALSE;
   if (animating_hover && (!hover_pixbuf || !hover_pixbuf->valid()))
     return FALSE;
 
   cairo_t* cairo_context = gdk_cairo_create(GDK_DRAWABLE(widget->window));
   cairo_translate(cairo_context, widget->allocation.x, widget->allocation.y);
 
   if (flipped_) {
     // Horizontally flip the image for non-LTR/RTL reasons.
     cairo_translate(cairo_context, widget->allocation.width, 0.0f);
     cairo_scale(cairo_context, -1.0f, 1.0f);
   }
 
   // The widget might be larger than the pixbuf. Paint the pixbuf flush with the
   // start of the widget (left for LTR, right for RTL) and its bottom.
   gfx::Rect bounds = gfx::Rect(0, 0, pixbuf->Width(), 0);
   int x = gtk_util::MirroredLeftPointForRect(widget, bounds);
   int y = widget->allocation.height - pixbuf->Height();
 
   if (background_image_->valid()) {
-    background_image_->SetSource(cairo_context, x, y);
+    background_image_->SetSource(cairo_context, widget, x, y);
     cairo_paint(cairo_context);
   }
 
-  pixbuf->SetSource(cairo_context, x, y);
+  pixbuf->SetSource(cairo_context, widget, x, y);
   cairo_paint(cairo_context);
 
   if (animating_hover) {
-    hover_pixbuf->SetSource(cairo_context, x, y);
+    hover_pixbuf->SetSource(cairo_context, widget, x, y);
     cairo_paint_with_alpha(cairo_context, hover_state);
   }
 
   cairo_destroy(cairo_context);
 
   GtkWidget* child = gtk_bin_get_child(GTK_BIN(widget));
   if (child)
     gtk_container_propagate_expose(GTK_CONTAINER(widget), child, e);
 
   return TRUE;
@@ skipping 25 matching lines @@
       theme_service_->GetRTLEnabledPixbufNamed(normal_id_) : NULL);
   surfaces_[GTK_STATE_ACTIVE]->UsePixbuf(pressed_id_ ?
       theme_service_->GetRTLEnabledPixbufNamed(pressed_id_) : NULL);
   surfaces_[GTK_STATE_PRELIGHT]->UsePixbuf(hover_id_ ?
       theme_service_->GetRTLEnabledPixbufNamed(hover_id_) : NULL);
   surfaces_[GTK_STATE_SELECTED]->UsePixbuf(NULL);
   surfaces_[GTK_STATE_INSENSITIVE]->UsePixbuf(disabled_id_ ?
       theme_service_->GetRTLEnabledPixbufNamed(disabled_id_) : NULL);
 }
 
-CairoCachedSurface* CustomDrawButtonBase::PixbufForState(int state) {
-  CairoCachedSurface* pixbuf = surfaces_[state].get();
+gfx::CairoCachedSurface* CustomDrawButtonBase::PixbufForState(int state) {
+  gfx::CairoCachedSurface* pixbuf = surfaces_[state].get();
 
   // Fall back to the default image if we don't have one for this state.
   if (!pixbuf || !pixbuf->valid())
     pixbuf = surfaces_[GTK_STATE_NORMAL].get();
 
   return pixbuf;
 }
 
 // CustomDrawHoverController ---------------------------------------------------
 
@@ skipping 183 matching lines @@
   }
 
   gtk_chrome_button_set_use_gtk_rendering(
       GTK_CHROME_BUTTON(widget()), UseGtkTheme());
 }
 
 bool CustomDrawButton::UseGtkTheme() {
   return !forcing_chrome_theme_ && theme_service_ &&
       theme_service_->UsingNativeTheme();
 }