ui/gfx: Change Canvas::ScaleInt() to just Canvas::Scale().

ui/gfx/canvas_skia.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/canvas_skia.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 100 matching lines @@
 }
 
 bool CanvasSkia::ClipRect(const gfx::Rect& rect) {
   return canvas_->clipRect(gfx::RectToSkRect(rect));
 }
 
 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) {
   FillRectInt(color, x, y, w, h, SkXfermode::kSrcOver_Mode);
 }
 
 void CanvasSkia::FillRectInt(const SkColor& color,
                              int x, int y, int w, int h,
                              SkXfermode::Mode mode) {
   SkPaint paint;
@@ skipping 280 matching lines @@
 
 CanvasPaint* CanvasPaint::CreateCanvasPaint(gfx::NativeView view) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   return new CanvasPaintWin(view);
 #else
   return NULL;
 #endif
 }
 
 }  // namespace gfx