summaryrefslogtreecommitdiffstats
path: root/ash/desktop_background
diff options
context:
space:
mode:
authorpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 23:32:47 +0000
committerpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 23:32:47 +0000
commit553981ab338db3c606b13016f3fb236cf7d0924f (patch)
tree206f7c96ac6fd4ee74083b7b7d339c5eeee96ab2 /ash/desktop_background
parentf16a1c323c36110e8b52caf8e1566c48167dd13a (diff)
downloadchromium_src-553981ab338db3c606b13016f3fb236cf7d0924f.zip
chromium_src-553981ab338db3c606b13016f3fb236cf7d0924f.tar.gz
chromium_src-553981ab338db3c606b13016f3fb236cf7d0924f.tar.bz2
Revert 140877 - Rename DrawBitmapInt to DrawImageInt
Bug=None Test=Compiles Review URL: https://chromiumcodereview.appspot.com/10512021 TBR=pkotwicz@chromium.org Review URL: https://chromiumcodereview.appspot.com/10546037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
-rw-r--r--ash/desktop_background/desktop_background_view.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc
index c3028fc..8dcc4a3 100644
--- a/ash/desktop_background/desktop_background_view.cc
+++ b/ash/desktop_background/desktop_background_view.cc
@@ -103,7 +103,7 @@ void DesktopBackgroundView::OnPaint(gfx::Canvas* canvas) {
}
gfx::Rect wallpaper_cropped_rect = wallpaper_rect.Center(cropped_size);
- canvas->DrawImageInt(wallpaper_,
+ canvas->DrawBitmapInt(wallpaper_,
wallpaper_cropped_rect.x(), wallpaper_cropped_rect.y(),
wallpaper_cropped_rect.width(), wallpaper_cropped_rect.height(),
0, 0, width(), height(),
@@ -112,11 +112,11 @@ void DesktopBackgroundView::OnPaint(gfx::Canvas* canvas) {
canvas->TileImageInt(wallpaper_, 0, 0, width(), height());
} else if (wallpaper_layout_ == ash::STRETCH) {
// This is generally not recommended as it may show artifacts.
- canvas->DrawImageInt(wallpaper_, 0, 0, wallpaper_.width(),
+ canvas->DrawBitmapInt(wallpaper_, 0, 0, wallpaper_.width(),
wallpaper_.height(), 0, 0, width(), height(), true);
} else {
// All other are simply centered, and not scaled (but may be clipped).
- canvas->DrawImageInt(wallpaper_, (width() - wallpaper_.width()) / 2,
+ canvas->DrawBitmapInt(wallpaper_, (width() - wallpaper_.width()) / 2,
(height() - wallpaper_.height()) / 2);
}
}