diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 18:16:15 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 18:16:15 +0000 |
| commit | eafb5b7bf242e8ebd9c947012ca404dd904bc1bd (patch) | |
| tree | 697b1e9468e78b390233af5e8c696ff14f65fa72 /chrome/browser/gtk/bookmark_bar_gtk.cc | |
| parent | e28b0fbbcde1c08e4dfbff7d4bd8e1f292892b9c (diff) | |
| download | chromium_src-eafb5b7bf242e8ebd9c947012ca404dd904bc1bd.zip chromium_src-eafb5b7bf242e8ebd9c947012ca404dd904bc1bd.tar.gz chromium_src-eafb5b7bf242e8ebd9c947012ca404dd904bc1bd.tar.bz2 | |
Reapplies the GdkPixbuf -> cairo surface patch.
Only difference is explicitly calling a FreePerDisplaySurfaces() function from
~GtkThemeProvider() because vtables are set to base class during destructor
calling.
BUG=http://crbug.com/10499
Original Review URL: http://codereview.chromium.org/197046
Review URL: http://codereview.chromium.org/199077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_bar_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 9228adf..575925f 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -21,6 +21,7 @@ #include "chrome/browser/gtk/bookmark_tree_model.h" #include "chrome/browser/gtk/bookmark_utils_gtk.h" #include "chrome/browser/gtk/browser_window_gtk.h" +#include "chrome/browser/gtk/cairo_cached_surface.h" #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/gtk_chrome_button.h" #include "chrome/browser/gtk/gtk_theme_provider.h" @@ -907,10 +908,9 @@ gboolean BookmarkBarGtk::OnEventBoxExpose(GtkWidget* widget, bar->window_->tabstrip()->GetTabStripOriginForWidget(widget); GtkThemeProvider* theme_provider = bar->theme_provider_; - GdkPixbuf* toolbar_background = theme_provider->GetPixbufNamed( - IDR_THEME_TOOLBAR); - gdk_cairo_set_source_pixbuf(cr, toolbar_background, tabstrip_origin.x(), - tabstrip_origin.y()); + CairoCachedSurface* background = theme_provider->GetSurfaceNamed( + IDR_THEME_TOOLBAR, widget); + background->SetSource(cr, 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, |