diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 20:54:19 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 20:54:19 +0000 |
| commit | 61e3009b9f5b3134fa3697befba4bc69c6be1e35 (patch) | |
| tree | 81e35d5ca6efe019c1c888b7d7edbcdd0cf4fc7d /chrome/browser/ui/gtk/gtk_util.cc | |
| parent | 716b7785e16a2049525e406b17d75776cc1911ee (diff) | |
| download | chromium_src-61e3009b9f5b3134fa3697befba4bc69c6be1e35.zip chromium_src-61e3009b9f5b3134fa3697befba4bc69c6be1e35.tar.gz chromium_src-61e3009b9f5b3134fa3697befba4bc69c6be1e35.tar.bz2 | |
GTK: Move CairoCachedSurface from being owned by GtkThemeService to gfx::Image.
CairoCachedSurfaces are representations of a GdkPixbuf that live on the display
server instead of in process. GtkThemeService currently returns a
CairoCachedSurface for a (IDR#, Display). Instead, make gfx::Image keep
CairoCachedSurfaces as a representation and make CairoCachedSurface work on any
display, keeping the mapping to display server resources as an implementation
detail.
This has the benefit of:
- You don't need to go through GtkThemeService to access all resources,
simplifying the code in some places and allowing sharing of static images
across profiles.
- This will let us (in the future) remove several image conversions in the GTK
port.
This is part 1. Part 2 will remove the custom CairoCachedSurface calls from
GtkThemeService.
BUG=106060
TEST=none
R=rsesek@chromium.org
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8769017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/gtk_util.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/gtk_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index 7c1c9e36..33855f9 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -24,7 +24,6 @@ #include "chrome/browser/profiles/profile.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/gtk_theme_service.h" #include "content/browser/disposition_utils.h" #include "content/browser/renderer_host/render_view_host.h" @@ -43,6 +42,7 @@ #include "ui/base/text/text_elider.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/gtk_util.h" +#include "ui/gfx/image/cairo_cached_surface.h" #include "ui/gfx/image/image.h" #if defined(OS_CHROMEOS) @@ -801,9 +801,9 @@ void DrawThemedToolbarBackground(GtkWidget* widget, // 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. - CairoCachedSurface* background = theme_service->GetSurfaceNamed( + gfx::CairoCachedSurface* background = theme_service->GetSurfaceNamed( IDR_THEME_TOOLBAR, widget); - background->SetSource(cr, tabstrip_origin.x(), tabstrip_origin.y()); + background->SetSource(cr, widget, 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, |