summaryrefslogtreecommitdiffstats
path: root/ui/base/native_theme/native_theme_base.cc
diff options
context:
space:
mode:
authorpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-07 13:29:20 +0000
committerpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-07 13:29:20 +0000
commit243cac7d0d9961ec15cea368168b98b7a4522f8d (patch)
tree42fadb8cda77fc9c48d9b40439ac9aafc33d4550 /ui/base/native_theme/native_theme_base.cc
parent3e03036a6033332a4611b1d28a2f85b42f13a7c9 (diff)
downloadchromium_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 'ui/base/native_theme/native_theme_base.cc')
-rw-r--r--ui/base/native_theme/native_theme_base.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/base/native_theme/native_theme_base.cc b/ui/base/native_theme/native_theme_base.cc
index 7a446fa..c2b9f5d 100644
--- a/ui/base/native_theme/native_theme_base.cc
+++ b/ui/base/native_theme/native_theme_base.cc
@@ -461,7 +461,7 @@ void NativeThemeBase::PaintCheckbox(SkCanvas* canvas,
}
gfx::Rect bounds = rect.Center(gfx::Size(image->width(), image->height()));
- DrawBitmapInt(canvas, *image, 0, 0, image->width(), image->height(),
+ DrawImageInt(canvas, *image, 0, 0, image->width(), image->height(),
bounds.x(), bounds.y(), bounds.width(), bounds.height());
}
@@ -482,7 +482,7 @@ void NativeThemeBase::PaintRadio(SkCanvas* canvas,
}
gfx::Rect bounds = rect.Center(gfx::Size(image->width(), image->height()));
- DrawBitmapInt(canvas, *image, 0, 0, image->width(), image->height(),
+ DrawImageInt(canvas, *image, 0, 0, image->width(), image->height(),
bounds.x(), bounds.y(), bounds.width(), bounds.height());
}
@@ -796,16 +796,16 @@ void NativeThemeBase::PaintProgressBar(SkCanvas* canvas,
int dest_left_border_width = static_cast<int>(left_border_image->width() *
tile_scale);
- DrawBitmapInt(canvas, *left_border_image, 0, 0, left_border_image->width(),
+ DrawImageInt(canvas, *left_border_image, 0, 0, left_border_image->width(),
left_border_image->height(), rect.x(), rect.y(), dest_left_border_width,
rect.height());
int dest_right_border_width = static_cast<int>(right_border_image->width() *
tile_scale);
int dest_x = rect.right() - dest_right_border_width;
- DrawBitmapInt(canvas, *right_border_image, 0, 0, right_border_image->width(),
- right_border_image->height(), dest_x, rect.y(),
- dest_right_border_width, rect.height());
+ DrawImageInt(canvas, *right_border_image, 0, 0, right_border_image->width(),
+ right_border_image->height(), dest_x, rect.y(),
+ dest_right_border_width, rect.height());
}
bool NativeThemeBase::IntersectsClipRectInt(SkCanvas* canvas,
@@ -816,11 +816,11 @@ bool NativeThemeBase::IntersectsClipRectInt(SkCanvas* canvas,
SkIntToScalar(y + h));
}
-void NativeThemeBase::DrawBitmapInt(
+void NativeThemeBase::DrawImageInt(
SkCanvas* canvas, const gfx::ImageSkia& image,
int src_x, int src_y, int src_w, int src_h,
int dest_x, int dest_y, int dest_w, int dest_h) const {
- gfx::Canvas(canvas).DrawBitmapInt(image, src_x, src_y, src_w, src_h,
+ gfx::Canvas(canvas).DrawImageInt(image, src_x, src_y, src_w, src_h,
dest_x, dest_y, dest_w, dest_h, true);
}