ui: Make gfx::Size::Scale() mutate the class. Add gfx::ScaleSize() similar to Rect/Point.

ui/gfx/canvas.cc

 // Copyright (c) 2012 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.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 #endif
 
 namespace gfx {
 
 Canvas::Canvas(const gfx::Size& size,
                ui::ScaleFactor scale_factor,
                bool is_opaque)
       : scale_factor_(scale_factor),
         owned_canvas_(NULL),
         canvas_(NULL) {
-  gfx::Size pixel_size = gfx::ToFlooredSize(size.Scale(
-      ui::GetScaleFactorScale(scale_factor)));
+  gfx::Size pixel_size = gfx::ToFlooredSize(
+      gfx::ScaleSize(size, ui::GetScaleFactorScale(scale_factor)));
   owned_canvas_.reset(new skia::PlatformCanvas(pixel_size.width(),
                                                pixel_size.height(),
                                                is_opaque));
   canvas_ = owned_canvas_.get();
 #if defined(OS_WIN) || defined(OS_MACOSX)
   // skia::PlatformCanvas instances are initialized to 0 by Cairo on Linux, but
   // uninitialized on Win and Mac.
   if (!is_opaque)
     owned_canvas_->clear(SkColorSetARGB(0, 0, 0, 0));
 #endif
@@ skipping 26 matching lines @@
 Canvas* Canvas::CreateCanvasWithoutScaling(SkCanvas* canvas,
                                            ui::ScaleFactor scale_factor) {
   return new Canvas(canvas, scale_factor);
 }
 
 void Canvas::RecreateBackingCanvas(const gfx::Size& size,
                                    ui::ScaleFactor scale_factor,
                                    bool is_opaque) {
   scale_factor_ = scale_factor;
   gfx::Size pixel_size = gfx::ToFlooredSize(
-      size.Scale(ui::GetScaleFactorScale(scale_factor)));
+      gfx::ScaleSize(size, ui::GetScaleFactorScale(scale_factor)));
   owned_canvas_.reset(new skia::PlatformCanvas(pixel_size.width(),
                                                pixel_size.height(),
                                                is_opaque));
   canvas_ = owned_canvas_.get();
   SkScalar scale = SkFloatToScalar(ui::GetScaleFactorScale(scale_factor_));
   canvas_->scale(scale, scale);
 }
 
 // static
 int Canvas::GetStringWidth(const string16& text, const gfx::Font& font) {
@@ skipping 441 matching lines @@
 
     float bitmap_scale = image_rep.GetScale();
     if (scale_x < bitmap_scale || scale_y < bitmap_scale)
       const_cast<SkBitmap&>(image_rep.sk_bitmap()).buildMipMap();
   }
 
   return image_rep;
 }
 
 }  // namespace gfx