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

chrome/browser/gtk/browser_window_gtk.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/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include <string>
@@ skipping 23 matching lines @@
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/gtk/about_chrome_dialog.h"
 #include "chrome/browser/gtk/active_window_watcher.h"
 #include "chrome/browser/gtk/bookmark_bar_gtk.h"
 #include "chrome/browser/gtk/bookmark_manager_gtk.h"
 #include "chrome/browser/gtk/browser_titlebar.h"
 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
-#include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
 #include "chrome/browser/gtk/download_shelf_gtk.h"
 #include "chrome/browser/gtk/edit_search_engine_dialog.h"
 #include "chrome/browser/gtk/extension_shelf_gtk.h"
 #include "chrome/browser/gtk/find_bar_gtk.h"
 #include "chrome/browser/gtk/go_button_gtk.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/import_dialog_gtk.h"
 #include "chrome/browser/gtk/info_bubble_gtk.h"
 #include "chrome/browser/gtk/infobar_container_gtk.h"
@@ skipping 278 matching lines @@
                                   GdkEventExpose* e,
                                   BrowserWindowGtk* window) {
   cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
   cairo_rectangle(cr, e->area.x, e->area.y, e->area.width, e->area.height);
   cairo_clip(cr);
   // The toolbar is supposed to blend in with the active tab, so we have to pass
   // coordinates for the IDR_THEME_TOOLBAR bitmap relative to the top of the
   // tab strip.
   gfx::Point tabstrip_origin =
       window->tabstrip()->GetTabStripOriginForWidget(widget);
-  GtkThemeProvider* theme_provider = GtkThemeProvider::GetFrom(
-      window->browser()->profile());
-  CairoCachedSurface* background = theme_provider->GetSurfaceNamed(
-      IDR_THEME_TOOLBAR, widget);
-  background->SetSource(cr, tabstrip_origin.x(), tabstrip_origin.y());
+  ThemeProvider* theme_provider =
+      window->browser()->profile()->GetThemeProvider();
+  GdkPixbuf* toolbar_background = theme_provider->GetPixbufNamed(
+      IDR_THEME_TOOLBAR);
+  gdk_cairo_set_source_pixbuf(cr, toolbar_background, tabstrip_origin.x(),
+                              tabstrip_origin.y());
   // We tile the toolbar background in both directions.
   cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
   cairo_rectangle(cr,
       tabstrip_origin.x(),
       tabstrip_origin.y(),
       e->area.x + e->area.width - tabstrip_origin.x(),
       e->area.y + e->area.height - tabstrip_origin.y());
   cairo_fill(cr);
   cairo_destroy(cr);
 
@@ skipping 231 matching lines @@
   // gtk_window_activate_key() takes care of it automatically.
   if (!HandleCustomAccelerator(event->keyval, GdkModifierType(event->state),
                                browser_.get())) {
     gtk_window_activate_key(window_, event);
   }
 }
 
 gboolean BrowserWindowGtk::OnCustomFrameExpose(GtkWidget* widget,
                                                GdkEventExpose* event,
                                                BrowserWindowGtk* window) {
-  GtkThemeProvider* theme_provider = GtkThemeProvider::GetFrom(
-      window->browser()->profile());
+  ThemeProvider* theme_provider =
+      window->browser()->profile()->GetThemeProvider();
 
   // Draw the default background.
   cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
   cairo_rectangle(cr, event->area.x, event->area.y, event->area.width,
                   event->area.height);
   cairo_clip(cr);
 
   int image_name;
   if (window->IsActive()) {
     image_name = window->browser()->profile()->IsOffTheRecord() ?
                  IDR_THEME_FRAME_INCOGNITO : IDR_THEME_FRAME;
   } else {
     image_name = window->browser()->profile()->IsOffTheRecord() ?
                  IDR_THEME_FRAME_INCOGNITO_INACTIVE : IDR_THEME_FRAME_INACTIVE;
   }
-  CairoCachedSurface* surface = theme_provider->GetSurfaceNamed(
-      image_name, widget);
-  surface->SetSource(cr, 0, 0);
+  GdkPixbuf* pixbuf = theme_provider->GetPixbufNamed(image_name);
+  gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
   cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
   cairo_rectangle(cr, event->area.x, event->area.y,
                       event->area.width, event->area.height);
   cairo_fill(cr);
 
   if (theme_provider->HasCustomImage(IDR_THEME_FRAME_OVERLAY)) {
-    CairoCachedSurface* theme_overlay = theme_provider->GetSurfaceNamed(
+    GdkPixbuf* theme_overlay = theme_provider->GetPixbufNamed(
         window->IsActive() ? IDR_THEME_FRAME_OVERLAY
-                           : IDR_THEME_FRAME_OVERLAY_INACTIVE, widget);
-    theme_overlay->SetSource(cr, 0, 0);
+                           : IDR_THEME_FRAME_OVERLAY_INACTIVE);
+    gdk_cairo_set_source_pixbuf(cr, theme_overlay, 0, 0);
     cairo_paint(cr);
   }
 
   DrawContentShadow(cr, window);
 
   cairo_destroy(cr);
 
   if (window->UseCustomFrame() && !window->IsMaximized()) {
     static NineBox custom_frame_border(
         IDR_WINDOW_TOP_LEFT_CORNER,
         IDR_WINDOW_TOP_CENTER,
         IDR_WINDOW_TOP_RIGHT_CORNER,
         IDR_WINDOW_LEFT_SIDE,
         NULL,
         IDR_WINDOW_RIGHT_SIDE,
         IDR_WINDOW_BOTTOM_LEFT_CORNER,
         IDR_WINDOW_BOTTOM_CENTER,
         IDR_WINDOW_BOTTOM_RIGHT_CORNER);
 
     custom_frame_border.RenderToWidget(widget);
   }
 
   return FALSE;  // Allow subwidgets to paint.
 }
 
 // static
 void BrowserWindowGtk::DrawContentShadow(cairo_t* cr,
                                          BrowserWindowGtk* window) {
   // Draw the shadow above the toolbar. Tabs on the tabstrip will draw over us.
-  GtkThemeProvider* theme_provider = GtkThemeProvider::GetFrom(
-      window->browser()->profile());
+  ThemeProvider* theme_provider =
+      window->browser()->profile()->GetThemeProvider();
   int left_x, top_y;
   gtk_widget_translate_coordinates(window->content_vbox_,
       GTK_WIDGET(window->window_), 0, 0, &left_x,
       &top_y);
   int width = window->content_vbox_->allocation.width;
 
-  CairoCachedSurface* top_center = theme_provider->GetSurfaceNamed(
-      IDR_CONTENT_TOP_CENTER, window->content_vbox_);
-  top_center->SetSource(cr, left_x, top_y - kContentShadowThickness);
+  GdkPixbuf* top_center =
+      theme_provider->GetPixbufNamed(IDR_CONTENT_TOP_CENTER);
+  gdk_cairo_set_source_pixbuf(cr, top_center,
+                              left_x, top_y - kContentShadowThickness);
   cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
   cairo_rectangle(cr, left_x, top_y - kContentShadowThickness, width,
-                  top_center->Height());
+                  gdk_pixbuf_get_height(top_center));
   cairo_fill(cr);
 
   // Only draw the rest of the shadow if the user has the custom frame enabled.
   if (!window->UseCustomFrame())
     return;
 
   // The top left corner has a width of 3 pixels. On Windows, the last column
   // of pixels overlap the toolbar. We just crop it off on Linux.  The top
   // corners extend to the base of the toolbar (one pixel above the dividing
   // line).
   int right_x = left_x + width;
-  CairoCachedSurface* top_left = theme_provider->GetSurfaceNamed(
-      IDR_CONTENT_TOP_LEFT_CORNER, window->content_vbox_);
-  top_left->SetSource(
-      cr, left_x - kContentShadowThickness, top_y - kContentShadowThickness);
+  GdkPixbuf* top_left =
+      theme_provider->GetPixbufNamed(IDR_CONTENT_TOP_LEFT_CORNER);
+  gdk_cairo_set_source_pixbuf(cr, top_left,
+      left_x - kContentShadowThickness, top_y - kContentShadowThickness);
   // The toolbar is shorter in location bar only mode so clip the image to the
   // height of the toolbar + the amount of shadow above the toolbar.
   int top_corner_height =
       window->toolbar_->widget()->allocation.height + kContentShadowThickness;
   cairo_rectangle(cr,
       left_x - kContentShadowThickness,
       top_y - kContentShadowThickness,
       kContentShadowThickness,
       top_corner_height);
   cairo_fill(cr);
 
   // Likewise, we crop off the left column of pixels for the top right corner.
-  CairoCachedSurface* top_right = theme_provider->GetSurfaceNamed(
-      IDR_CONTENT_TOP_RIGHT_CORNER, window->content_vbox_);
-  top_right->SetSource(cr, right_x - 1, top_y - kContentShadowThickness);
+  GdkPixbuf* top_right =
+      theme_provider->GetPixbufNamed(IDR_CONTENT_TOP_RIGHT_CORNER);
+  gdk_cairo_set_source_pixbuf(cr, top_right,
+                              right_x - 1, top_y - kContentShadowThickness);
   cairo_rectangle(cr,
       right_x,
       top_y - kContentShadowThickness,
       kContentShadowThickness,
       top_corner_height);
   cairo_fill(cr);
 
   // Fill in the sides.  As above, we only draw 2 of the 3 columns on Linux.
   int height = window->content_vbox_->allocation.height;
   int bottom_y = top_y + height;
   // |side_y| is where to start drawing the side shadows.  The top corners draw
   // the sides down to the bottom of the toolbar.
   int side_y = top_y - kContentShadowThickness + top_corner_height;
   // |side_height| is how many pixels to draw for the side borders.  We do one
   // pixel before the bottom of the web contents because that extra pixel is
   // drawn by the bottom corners.
   int side_height = bottom_y - side_y - 1;
   if (side_height > 0) {
-    CairoCachedSurface* left = theme_provider->GetSurfaceNamed(
-        IDR_CONTENT_LEFT_SIDE, window->content_vbox_);
-    left->SetSource(cr, left_x - kContentShadowThickness, side_y);
+    GdkPixbuf* left = theme_provider->GetPixbufNamed(IDR_CONTENT_LEFT_SIDE);
+    gdk_cairo_set_source_pixbuf(cr, left,
+                                left_x - kContentShadowThickness, side_y);
     cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
     cairo_rectangle(cr,
         left_x - kContentShadowThickness,
         side_y,
         kContentShadowThickness,
         side_height);
     cairo_fill(cr);
 
-    CairoCachedSurface* right = theme_provider->GetSurfaceNamed(
-        IDR_CONTENT_RIGHT_SIDE, window->content_vbox_);
-    right->SetSource(cr, right_x - 1, side_y);
+    GdkPixbuf* right = theme_provider->GetPixbufNamed(IDR_CONTENT_RIGHT_SIDE);
+    gdk_cairo_set_source_pixbuf(cr, right, right_x - 1, side_y);
     cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
     cairo_rectangle(cr,
         right_x,
         side_y,
         kContentShadowThickness,
         side_height);
     cairo_fill(cr);
   }
 
   // Draw the bottom corners.  The bottom corners also draw the bottom row of
   // pixels of the side shadows.
-  CairoCachedSurface* bottom_left = theme_provider->GetSurfaceNamed(
-      IDR_CONTENT_BOTTOM_LEFT_CORNER, window->content_vbox_);
-  bottom_left->SetSource(cr, left_x - kContentShadowThickness, bottom_y - 1);
+  GdkPixbuf* bottom_left =
+      theme_provider->GetPixbufNamed(IDR_CONTENT_BOTTOM_LEFT_CORNER);
+  gdk_cairo_set_source_pixbuf(cr, bottom_left,
+                              left_x - kContentShadowThickness, bottom_y - 1);
   cairo_paint(cr);
 
-  CairoCachedSurface* bottom_right = theme_provider->GetSurfaceNamed(
-      IDR_CONTENT_BOTTOM_RIGHT_CORNER, window->content_vbox_);
-  bottom_right->SetSource(cr, right_x - 1, bottom_y - 1);
+  GdkPixbuf* bottom_right =
+      theme_provider->GetPixbufNamed(IDR_CONTENT_BOTTOM_RIGHT_CORNER);
+  gdk_cairo_set_source_pixbuf(cr, bottom_right,
+                              right_x - 1, bottom_y - 1);
   cairo_paint(cr);
 
   // Finally, draw the bottom row. Since we don't overlap the contents, we clip
   // the top row of pixels.
-  CairoCachedSurface* bottom = theme_provider->GetSurfaceNamed(
-      IDR_CONTENT_BOTTOM_CENTER, window->content_vbox_);
-  bottom->SetSource(cr, left_x + 1, bottom_y - 1);
+  GdkPixbuf* bottom =
+      theme_provider->GetPixbufNamed(IDR_CONTENT_BOTTOM_CENTER);
+  gdk_cairo_set_source_pixbuf(cr, bottom,
+                              left_x + 1, bottom_y - 1);
   cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
   cairo_rectangle(cr,
       left_x + 1,
       bottom_y,
       width - 2,
       kContentShadowThickness);
   cairo_fill(cr);
 }
 
 void BrowserWindowGtk::Show() {
@@ skipping 1383 matching lines @@
   // special-case the ones where the custom frame should be used.  These names
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "KWin" ||
           wm_name == "Metacity" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }