diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 01:12:19 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 01:12:19 +0000 |
| commit | 6230e20618e551669580a27cb9e2cd1af7f83d46 (patch) | |
| tree | a1ce6bcef9a5421cf3c98a19038bfff88e306095 /chrome/browser/gtk/go_button_gtk.cc | |
| parent | 20515f1cf7b19b471740bd98fb7b9818f327cd8c (diff) | |
| download | chromium_src-6230e20618e551669580a27cb9e2cd1af7f83d46.zip chromium_src-6230e20618e551669580a27cb9e2cd1af7f83d46.tar.gz chromium_src-6230e20618e551669580a27cb9e2cd1af7f83d46.tar.bz2 | |
Revert "Upload GdkPixbufs into cairo surfaces so they (hopefully) live on the X
server and have better performance. In the presence of XRender, let cairo do
things smarter."
Valgrind problems.
This reverts commit 03871714c3e5b39ee0f8369ecc2313c02fe0ca08 (r25814).
Review URL: http://codereview.chromium.org/200071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/go_button_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/go_button_gtk.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/gtk/go_button_gtk.cc b/chrome/browser/gtk/go_button_gtk.cc index bd3bc23..e4606bb 100644 --- a/chrome/browser/gtk/go_button_gtk.cc +++ b/chrome/browser/gtk/go_button_gtk.cc @@ -36,7 +36,9 @@ GoButtonGtk::GoButtonGtk(LocationBarViewGtk* location_bar, Browser* browser) go_(theme_provider_, IDR_GO, IDR_GO_P, IDR_GO_H, 0), stop_(theme_provider_, IDR_STOP, IDR_STOP_P, IDR_STOP_H, 0), widget_(gtk_chrome_button_new()) { - gtk_widget_set_size_request(widget_.get(), go_.Width(), go_.Height()); + gtk_widget_set_size_request(widget_.get(), + gdk_pixbuf_get_width(go_.pixbufs(0)), + gdk_pixbuf_get_height(go_.pixbufs(0))); gtk_widget_set_app_paintable(widget_.get(), TRUE); // We effectively double-buffer by virtue of having only one image... @@ -243,7 +245,9 @@ void GoButtonGtk::UpdateThemeButtons() { gtk_widget_set_app_paintable(widget_.get(), FALSE); gtk_widget_set_double_buffered(widget_.get(), TRUE); } else { - gtk_widget_set_size_request(widget_.get(), go_.Width(), go_.Height()); + gtk_widget_set_size_request(widget_.get(), + gdk_pixbuf_get_width(go_.pixbufs(0)), + gdk_pixbuf_get_height(go_.pixbufs(0))); gtk_widget_set_app_paintable(widget_.get(), TRUE); // We effectively double-buffer by virtue of having only one image... |