summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/ui/views/download/download_item_view.cc2
-rw-r--r--chrome/browser/ui/views/find_bar_view.cc2
-rw-r--r--chrome/browser/ui/views/tabs/dragged_tab_controller.cc2
-rw-r--r--ui/gfx/canvas.h3
-rw-r--r--ui/gfx/canvas_direct2d.cc6
-rw-r--r--ui/gfx/canvas_direct2d.h2
-rw-r--r--ui/gfx/canvas_direct2d_unittest.cc2
-rw-r--r--ui/gfx/canvas_skia.cc4
-rw-r--r--ui/gfx/canvas_skia.h2
-rw-r--r--views/controls/menu/menu_image_util.cc2
-rw-r--r--views/view.cc2
11 files changed, 14 insertions, 15 deletions
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index d54c0b4..b98ca17 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -744,7 +744,7 @@ void DownloadItemView::OnPaint(gfx::Canvas* canvas) {
// for RTL UI, we flip the canvas to draw those images mirrored.
// Consequently, we do not need to mirror the x-axis of those images.
canvas->Translate(gfx::Point(width(), 0));
- canvas->ScaleInt(-1, 1);
+ canvas->Scale(-1, 1);
}
PaintBitmaps(canvas,
body_image_set->top_left, body_image_set->left,
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index 4d354bf..3793d59 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -228,7 +228,7 @@ void FindBarView::OnPaint(gfx::Canvas* canvas) {
canvas->Save();
if (base::i18n::IsRTL()) {
canvas->Translate(gfx::Point(width(), 0));
- canvas->ScaleInt(-1, 1);
+ canvas->Scale(-1, 1);
}
PaintDialogBorder(canvas, bounds);
diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
index 7938c41..91204d8 100644
--- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
@@ -94,7 +94,7 @@ class DockView : public views::View {
if (rtl_ui) {
// Flip canvas to draw the mirrored tab images for RTL UI.
canvas->Translate(gfx::Point(width(), 0));
- canvas->ScaleInt(-1, 1);
+ canvas->Scale(-1, 1);
}
int x_of_active_tab = width() / 2 + kTabSpacing / 2;
int x_of_inactive_tab = width() / 2 - high_icon->width() - kTabSpacing / 2;
diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
index 189aeb4..2887b30 100644
--- a/ui/gfx/canvas.h
+++ b/ui/gfx/canvas.h
@@ -103,8 +103,7 @@ class UI_EXPORT Canvas {
virtual void Translate(const gfx::Point& point) = 0;
- // Wrapper function that takes integer arguments.
- virtual void ScaleInt(int x, int y) = 0;
+ virtual void Scale(int x_scale, int y_scale) = 0;
// Fills the specified region with the specified color using a transfer
// mode of SkXfermode::kSrcOver_Mode.
diff --git a/ui/gfx/canvas_direct2d.cc b/ui/gfx/canvas_direct2d.cc
index a1b3a9f..08005f4 100644
--- a/ui/gfx/canvas_direct2d.cc
+++ b/ui/gfx/canvas_direct2d.cc
@@ -192,13 +192,13 @@ void CanvasDirect2D::Translate(const gfx::Point& point) {
rt_->SetTransform(transform);
}
-void CanvasDirect2D::ScaleInt(int x, int y) {
+void CanvasDirect2D::Scale(int x_scale, int y_scale) {
D2D1_MATRIX_3X2_F raw;
rt_->GetTransform(&raw);
D2D1::Matrix3x2F transform(raw._11, raw._12, raw._21, raw._22, raw._31,
raw._32);
- transform = D2D1::Matrix3x2F::Scale(static_cast<float>(x),
- static_cast<float>(y)) * transform;
+ transform = D2D1::Matrix3x2F::Scale(static_cast<float>(x_scale),
+ static_cast<float>(y_scale)) * transform;
rt_->SetTransform(transform);
}
diff --git a/ui/gfx/canvas_direct2d.h b/ui/gfx/canvas_direct2d.h
index 75c424c..dc3cc8d 100644
--- a/ui/gfx/canvas_direct2d.h
+++ b/ui/gfx/canvas_direct2d.h
@@ -33,7 +33,7 @@ class UI_EXPORT CanvasDirect2D : public Canvas {
virtual void Restore() OVERRIDE;
virtual bool ClipRect(const gfx::Rect& rect) OVERRIDE;
virtual void Translate(const gfx::Point& point) OVERRIDE;
- virtual void ScaleInt(int x, int y) OVERRIDE;
+ virtual void Scale(int x_scale, int y_scale) OVERRIDE;
virtual void FillRectInt(const SkColor& color,
int x, int y, int w, int h) OVERRIDE;
virtual void FillRectInt(const SkColor& color,
diff --git a/ui/gfx/canvas_direct2d_unittest.cc b/ui/gfx/canvas_direct2d_unittest.cc
index db57990..8a6dcec 100644
--- a/ui/gfx/canvas_direct2d_unittest.cc
+++ b/ui/gfx/canvas_direct2d_unittest.cc
@@ -262,7 +262,7 @@ TEST(CanvasDirect2D, ClipRectWithScale) {
// origin.
canvas.Save();
canvas.Translate(gfx::Point(150, 150));
- canvas.ScaleInt(2, 2);
+ canvas.Scale(2, 2);
canvas.ClipRect(gfx::Rect(10, 10, 110, 110));
canvas.FillRectInt(SK_ColorRED, 0, 0, 500, 500);
canvas.Restore();
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc
index 6550073..2f822e5 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.cc
@@ -118,8 +118,8 @@ void CanvasSkia::Translate(const gfx::Point& point) {
canvas_->translate(SkIntToScalar(point.x()), SkIntToScalar(point.y()));
}
-void CanvasSkia::ScaleInt(int x, int y) {
- canvas_->scale(SkIntToScalar(x), SkIntToScalar(y));
+void CanvasSkia::Scale(int x_scale, int y_scale) {
+ canvas_->scale(SkIntToScalar(x_scale), SkIntToScalar(y_scale));
}
void CanvasSkia::FillRectInt(const SkColor& color, int x, int y, int w, int h) {
diff --git a/ui/gfx/canvas_skia.h b/ui/gfx/canvas_skia.h
index 5bf2318..045192f 100644
--- a/ui/gfx/canvas_skia.h
+++ b/ui/gfx/canvas_skia.h
@@ -102,7 +102,7 @@ class UI_EXPORT CanvasSkia : public Canvas {
virtual void Restore() OVERRIDE;
virtual bool ClipRect(const gfx::Rect& rect) OVERRIDE;
virtual void Translate(const gfx::Point& point) OVERRIDE;
- virtual void ScaleInt(int x, int y) OVERRIDE;
+ virtual void Scale(int x_scale, int y_scale) OVERRIDE;
virtual void FillRectInt(const SkColor& color,
int x, int y, int w, int h) OVERRIDE;
virtual void FillRectInt(const SkColor& color,
diff --git a/views/controls/menu/menu_image_util.cc b/views/controls/menu/menu_image_util.cc
index 883ced58..2c3aaa2 100644
--- a/views/controls/menu/menu_image_util.cc
+++ b/views/controls/menu/menu_image_util.cc
@@ -89,7 +89,7 @@ SkBitmap* GetRtlSubmenuArrowImage() {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
SkBitmap* r = rb.GetBitmapNamed(IDR_MENU_ARROW);
gfx::CanvasSkia canvas(r->width(), r->height(), false);
- canvas.ScaleInt(-1, 1);
+ canvas.Scale(-1, 1);
canvas.DrawBitmapInt(*r, - r->width(), 0);
kRtlArrow = new SkBitmap(canvas.ExtractBitmap());
}
diff --git a/views/view.cc b/views/view.cc
index 0a6fdd1..060eb15 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -1464,7 +1464,7 @@ void View::PaintCommon(gfx::Canvas* canvas) {
ScopedCanvas scoped(canvas);
if (FlipCanvasOnPaintForRTLUI()) {
canvas->Translate(gfx::Point(width(), 0));
- canvas->ScaleInt(-1, 1);
+ canvas->Scale(-1, 1);
}
OnPaint(canvas);
generated by cgit v1.1 at 2025-03-06 16:22:16 +0000