diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 13:29:20 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-07 13:29:20 +0000 |
| commit | 243cac7d0d9961ec15cea368168b98b7a4522f8d (patch) | |
| tree | 42fadb8cda77fc9c48d9b40439ac9aafc33d4550 /chrome/browser/ui/gtk | |
| parent | 3e03036a6033332a4611b1d28a2f85b42f13a7c9 (diff) | |
| download | chromium_src-243cac7d0d9961ec15cea368168b98b7a4522f8d.zip chromium_src-243cac7d0d9961ec15cea368168b98b7a4522f8d.tar.gz chromium_src-243cac7d0d9961ec15cea368168b98b7a4522f8d.tar.bz2 | |
Rename DrawBitmapInt to DrawImageInt
Bug=None
Test=Compiles
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=140877
Review URL: https://chromiumcodereview.appspot.com/10512021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk')
4 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc index ee1c26e..1a652cc 100644 --- a/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc +++ b/chrome/browser/ui/gtk/avatar_menu_item_gtk.cc @@ -216,7 +216,7 @@ void AvatarMenuItemGtk::Init(GtkThemeService* theme_service) { gfx::Rect check_rect(0, 0, check_image->width(), check_image->height()); int y = avatar_image->height() - check_image->height(); int x = avatar_image->width() - check_image->width() + kCheckMarkXOffset; - canvas.DrawBitmapInt(*check_image, x, y); + canvas.DrawImageInt(*check_image, x, y); SkBitmap final_image = canvas.ExtractBitmap(); avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(final_image); diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index 364a22d..2351096 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc @@ -686,9 +686,9 @@ gboolean BrowserToolbarGtk::OnWrenchMenuButtonExpose(GtkWidget* sender, gfx::CanvasSkiaPaint canvas(expose, false); int x_offset = base::i18n::IsRTL() ? 0 : allocation.width - badge->width(); int y_offset = 0; - canvas.DrawBitmapInt(*badge, - allocation.x + x_offset, - allocation.y + y_offset); + canvas.DrawImageInt(*badge, + allocation.x + x_offset, + allocation.y + y_offset); return FALSE; } diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc index 2c97f49..35118a2 100644 --- a/chrome/browser/ui/gtk/download/download_item_gtk.cc +++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc @@ -872,7 +872,7 @@ gboolean DownloadItemGtk::OnProgressAreaExpose(GtkWidget* widget, // there is no need to use the chromium-specific default download item icon. if (icon_small_) { const int offset = download_util::kSmallProgressIconOffset; - canvas.DrawBitmapInt(*icon_small_->ToSkBitmap(), + canvas.DrawImageInt(*icon_small_->ToSkBitmap(), allocation.x + offset, allocation.y + offset); } diff --git a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc index cdac8db..4e5ff10 100644 --- a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc @@ -86,10 +86,10 @@ void ExtensionInfoBarGtk::OnImageLoaded(const gfx::Image& image, scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas( gfx::Size(image_size + kDropArrowLeftMargin + drop_image->width(), image_size), false)); - canvas->DrawBitmapInt(*icon, 0, 0, icon->width(), icon->height(), 0, 0, - image_size, image_size, false); - canvas->DrawBitmapInt(*drop_image, image_size + kDropArrowLeftMargin, - image_size / 2); + canvas->DrawImageInt(*icon, 0, 0, icon->width(), icon->height(), 0, 0, + image_size, image_size, false); + canvas->DrawImageInt(*drop_image, image_size + kDropArrowLeftMargin, + image_size / 2); SkBitmap bitmap = canvas->ExtractBitmap(); GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap); |