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

content/renderer/disambiguation_popup_helper.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 "content/renderer/disambiguation_popup_helper.h"
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "ui/gfx/size_conversions.h"
 
 using WebKit::WebRect;
@@ skipping 48 matching lines @@
 
 // Ensure the disambiguation popup fits inside the screen,
 // clip the edges farthest to the touch point if needed.
 gfx::Rect CropZoomArea(const gfx::Rect& zoom_rect,
                        const gfx::Size& viewport_size,
                        const gfx::Point& touch_point,
                        float scale) {
   gfx::Size max_size = viewport_size;
   max_size.Enlarge(-2 * kDisambiguationPopupBoundsMargin,
                    -2 * kDisambiguationPopupBoundsMargin);
-  max_size = ToCeiledSize(max_size.Scale(1.0 / scale));
+  max_size = ToCeiledSize(ScaleSize(max_size, 1.0 / scale));
 
   int left = touch_point.x() - zoom_rect.x();
   int right = zoom_rect.right() - touch_point.x();
   int top = touch_point.y() - zoom_rect.y();
   int bottom = zoom_rect.bottom() - touch_point.y();
   TrimEdges(&left, &right, max_size.width());
   TrimEdges(&top, &bottom, max_size.height());
 
   return gfx::Rect(touch_point.x() - left,
                    touch_point.y() - top,
@@ skipping 17 matching lines @@
   zoom_rect->Intersect(gfx::Rect(viewport_size));
 
   float scale = FindOptimalScaleFactor(target_rects);
   *zoom_rect = CropZoomArea(
       *zoom_rect, viewport_size, tap_rect.CenterPoint(), scale);
 
   return scale;
 }
 
 } // namespace content