summaryrefslogtreecommitdiffstats
path: root/ui/base
diff options
context:
space:
mode:
Diffstat (limited to 'ui/base')
-rw-r--r--ui/base/dragdrop/drag_utils.cc2
-rw-r--r--ui/base/native_theme/native_theme_android.cc12
-rw-r--r--ui/base/native_theme/native_theme_android.h20
-rw-r--r--ui/base/native_theme/native_theme_base.cc16
-rw-r--r--ui/base/native_theme/native_theme_base.h6
5 files changed, 28 insertions, 28 deletions
diff --git a/ui/base/dragdrop/drag_utils.cc b/ui/base/dragdrop/drag_utils.cc
index 9e1bad51..8aee787 100644
--- a/ui/base/dragdrop/drag_utils.cc
+++ b/ui/base/dragdrop/drag_utils.cc
@@ -41,7 +41,7 @@ void CreateDragImageForFile(const FilePath& file_name,
gfx::Canvas canvas(gfx::Size(width, height), false /* translucent */);
// Paint the icon.
- canvas.DrawBitmapInt(*icon, (width - icon->width()) / 2, 0);
+ canvas.DrawImageInt(*icon, (width - icon->width()) / 2, 0);
string16 name = file_name.BaseName().LossyDisplayName();
const int flags = gfx::Canvas::TEXT_ALIGN_CENTER;
diff --git a/ui/base/native_theme/native_theme_android.cc b/ui/base/native_theme/native_theme_android.cc
index 7025e8f..354bd0f 100644
--- a/ui/base/native_theme/native_theme_android.cc
+++ b/ui/base/native_theme/native_theme_android.cc
@@ -295,7 +295,7 @@ void NativeThemeAndroid::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());
}
@@ -316,7 +316,7 @@ void NativeThemeAndroid::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());
}
@@ -631,14 +631,14 @@ void NativeThemeAndroid::PaintProgressBar(
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(),
+ 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());
}
@@ -654,7 +654,7 @@ bool NativeThemeAndroid::IntersectsClipRectInt(SkCanvas* canvas,
SkIntToScalar(y + h));
}
-void NativeThemeAndroid::DrawBitmapInt(SkCanvas* canvas,
+void NativeThemeAndroid::DrawImageInt(SkCanvas* canvas,
const gfx::ImageSkia& image,
int src_x,
int src_y,
@@ -664,7 +664,7 @@ void NativeThemeAndroid::DrawBitmapInt(SkCanvas* canvas,
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);
}
diff --git a/ui/base/native_theme/native_theme_android.h b/ui/base/native_theme/native_theme_android.h
index 04c7be3..8320f51 100644
--- a/ui/base/native_theme/native_theme_android.h
+++ b/ui/base/native_theme/native_theme_android.h
@@ -115,16 +115,16 @@ class NativeThemeAndroid : public NativeTheme {
// Draw the dest rectangle with the given image which might be scaled if its
// size is not same as target rectangle.
- void DrawBitmapInt(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;
+ void 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;
// Draw the target rectangle with the |bitmap| accroding the given
// |tile_scale_x| and |tile_scale_y|
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);
}
diff --git a/ui/base/native_theme/native_theme_base.h b/ui/base/native_theme/native_theme_base.h
index 5e6096e..92991b5 100644
--- a/ui/base/native_theme/native_theme_base.h
+++ b/ui/base/native_theme/native_theme_base.h
@@ -128,9 +128,9 @@ class NativeThemeBase : public NativeTheme {
bool IntersectsClipRectInt(SkCanvas* canvas,
int x, int y, int w, int h) const;
- void DrawBitmapInt(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;
+ void 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;
void DrawTiledImage(SkCanvas* canvas,
const gfx::ImageSkia& image,
generated by cgit v1.1 at 2025-01-23 09:53:45 +0000