ui: Let skia do the conversion work for us by using the integer version of set() function.

ui/views/touchui/touch_selection_controller_impl.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/views/touchui/touch_selection_controller_impl.h"
 
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
-#include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_config.h"
@@ skipping 39 matching lines @@
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
   return widget;
 }
 
 void PaintCircle(const Circle& circle, gfx::Canvas* canvas) {
   SkPaint paint;
   paint.setAntiAlias(true);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(circle.color);
-  gfx::Path path;
+  SkPath path;
   gfx::Rect bounds(circle.center.x() - circle.radius,
                    circle.center.y() - circle.radius,
                    circle.radius * 2,
                    circle.radius * 2);
-  SkRect rect;
-  rect.set(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()),
-           SkIntToScalar(bounds.right()), SkIntToScalar(bounds.bottom()));
   SkScalar radius = SkIntToScalar(circle.radius);
-  path.addRoundRect(rect, radius, radius);
+  path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius);
   canvas->GetSkCanvas()->drawPath(path, paint);
 }
 
 // The points may not match exactly, since the selection range computation may
 // introduce some floating point errors. So check for a minimum size to decide
 // whether or not there is any selection.
 bool IsEmptySelection(const gfx::Point& p1, const gfx::Point& p2) {
   int delta_x = p2.x() - p1.x();
   int delta_y = p2.y() - p1.y();
   return (abs(delta_x) < kMinSelectionSize && abs(delta_y) < kMinSelectionSize);
@@ skipping 160 matching lines @@
         SK_ColorWHITE,
         SkColorSetRGB(0xF0, 0xF0, 0xF0)
     };
 
     static const SkScalar kGradientPoints[2] = {
         SkIntToScalar(0),
         SkIntToScalar(1)
     };
 
     SkPoint points[2];
-    points[0].set(SkIntToScalar(0), SkIntToScalar(0));
-    points[1].set(SkIntToScalar(0), SkIntToScalar(height()));
+    points[0].iset(0, 0);
+    points[1].iset(0, height());
 
     SkShader* shader = SkGradientShader::CreateLinear(points,
         kGradientColors, kGradientPoints, arraysize(kGradientPoints),
         SkShader::kRepeat_TileMode);
     DCHECK(shader);
 
     SkPaint paint;
     paint.setShader(shader);
     shader->unref();
 
@@ skipping 223 matching lines @@
 bool TouchSelectionControllerImpl::IsSelectionHandle2Visible() {
   return selection_handle_2_->visible();
 }
 
 TouchSelectionController* TouchSelectionController::create(
     TouchSelectionClientView* client_view) {
   return new TouchSelectionControllerImpl(client_view);
 }
 
 }  // namespace views