5 files changed, 11 insertions, 10 deletions
diff --git a/views/controls/combobox/native_combobox_views.cc b/views/controls/combobox/native_combobox_views.cc
index 5a1176e..724da9e 100644
--- a/views/controls/combobox/native_combobox_views.cc
+++ b/views/controls/combobox/native_combobox_views.cc
@@ -302,7 +302,7 @@ void NativeComboboxViews::PaintText(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
 
   canvas->Save();
-  canvas->ClipRectInt(GetContentsBounds());
+  canvas->ClipRect(GetContentsBounds());
 
   int x = insets.left();
   int y = insets.top();
diff --git a/views/controls/menu/menu_image_util.cc b/views/controls/menu/menu_image_util.cc
index e9b4b81..883ced58 100644
--- a/views/controls/menu/menu_image_util.cc
+++ b/views/controls/menu/menu_image_util.cc
@@ -9,6 +9,7 @@
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/point.h"
 
 namespace {
 
@@ -29,7 +30,7 @@ const SkColor kIndicatorStroke = SkColorSetRGB(0, 0, 0);
 SkBitmap* CreateRadioButtonImage(bool selected) {
   // + 2 (1px on each side) to cover rounding error.
   gfx::CanvasSkia canvas(kIndicatorSize + 2, kIndicatorSize + 2, false);
-  canvas.TranslateInt(1, 1);
+  canvas.Translate(gfx::Point(1, 1));
 
   SkPoint gradient_points[3];
   gradient_points[0].set(SkIntToScalar(0), SkIntToScalar(0));
diff --git a/views/painter.cc b/views/painter.cc
index f39317d..5b2fc12 100644
--- a/views/painter.cc
+++ b/views/painter.cc
@@ -11,6 +11,7 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/insets.h"
+#include "ui/gfx/point.h"
 
 namespace views {
 
@@ -149,7 +150,7 @@ void Painter::PaintPainterAt(int x, int y, int w, int h,
   if (w < 0 || h < 0)
     return;
   canvas->Save();
-  canvas->TranslateInt(x, y);
+  canvas->Translate(gfx::Point(x, y));
   painter->Paint(w, h, canvas);
   canvas->Restore();
 }
diff --git a/views/view.cc b/views/view.cc
index 4f04208..0a6fdd1 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -677,15 +677,14 @@ void View::Paint(gfx::Canvas* canvas) {
   // Note that the X (or left) position we pass to ClipRectInt takes into
   // consideration whether or not the view uses a right-to-left layout so that
   // we paint our view in its mirrored position if need be.
-  if (!canvas->ClipRectInt(gfx::Rect(GetMirroredX(), y(),
-                                     width() - static_cast<int>(clip_x_),
-                                     height() - static_cast<int>(clip_y_)))) {
+  if (!canvas->ClipRect(gfx::Rect(GetMirroredX(), y(),
+                                  width() - static_cast<int>(clip_x_),
+                                  height() - static_cast<int>(clip_y_)))) {
     return;
   }
   // Non-empty clip, translate the graphics such that 0,0 corresponds to
   // where this view is located (related to its parent).
-  canvas->TranslateInt(GetMirroredX(), y());
-
+  canvas->Translate(GetMirroredPosition());
   canvas->Transform(GetTransform());
 
   PaintCommon(canvas);
@@ -1464,7 +1463,7 @@ void View::PaintCommon(gfx::Canvas* canvas) {
     // request the canvas to be flipped.
     ScopedCanvas scoped(canvas);
     if (FlipCanvasOnPaintForRTLUI()) {
-      canvas->TranslateInt(width(), 0);
+      canvas->Translate(gfx::Point(width(), 0));
       canvas->ScaleInt(-1, 1);
     }
 
diff --git a/views/widget/native_widget_win.cc b/views/widget/native_widget_win.cc
index 554d0e62..aa4e8501 100644
--- a/views/widget/native_widget_win.cc
+++ b/views/widget/native_widget_win.cc
@@ -2320,7 +2320,7 @@ void NativeWidgetWin::RedrawLayeredWindowContents() {
 
   // We need to clip to the dirty rect ourselves.
   layered_window_contents_->sk_canvas()->save(SkCanvas::kClip_SaveFlag);
-  layered_window_contents_->ClipRectInt(invalid_rect_);
+  layered_window_contents_->ClipRect(invalid_rect_);
   GetWidget()->GetRootView()->Paint(layered_window_contents_.get());
   layered_window_contents_->sk_canvas()->restore();