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

ui/gfx/native_theme_chromeos.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/native_theme_chromeos.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "grit/gfx_resources.h"
-#include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkShader.h"
+#include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 namespace {
 
 // Color constants. See theme_draw for details.
 
@@ skipping 106 matching lines @@
 
 void GetGradientPaintForRect(const gfx::Rect& rect,
                              const SkColor* colors,
                              const SkScalar* stops,
                              int count,
                              SkPaint* paint) {
   paint->setStyle(SkPaint::kFill_Style);
   paint->setAntiAlias(true);
 
   SkPoint points[2];
-  points[0].set(SkIntToScalar(rect.x()), SkIntToScalar(rect.y()));
-  points[1].set(SkIntToScalar(rect.x()), SkIntToScalar(rect.bottom()));
+  points[0].iset(rect.x(), rect.y());
+  points[1].iset(rect.x(), rect.bottom());
 
   SkShader* shader = SkGradientShader::CreateLinear(points,
       colors, stops, count, SkShader::kClamp_TileMode);
 
   paint->setShader(shader);
   // Unref shader after paint takes ownership, otherwise never deleted.
   shader->unref();
 }
 
 void GetGradientPaintForRect(const gfx::Rect& rect,
@@ skipping 67 matching lines @@
     paint->setColor(kIndicatorStrokeColor);
 }
 
 void GetRadioIndicatorGradientPaint(const gfx::Rect bounds,
                                     gfx::NativeThemeBase::State state,
                                     SkPaint* paint) {
   paint->setStyle(SkPaint::kFill_Style);
   paint->setAntiAlias(true);
 
   SkPoint points[2];
-  points[0].set(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()));
-  points[1].set(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.bottom()));
+  points[0].iset(bounds.x(), bounds.y());
+  points[1].iset(bounds.x(), bounds.bottom());
 
   static const SkScalar kGradientPoints[2] = {
       SkIntToScalar(0),
       SkIntToScalar(1)
   };
 
   if (state == gfx::NativeThemeBase::kDisabled) {
     static const SkColor kGradientColors[2] = {
         kRadioIndicatorDisabledGradient0,
         kRadioIndicatorDisabledGradient1
@@ skipping 341 matching lines @@
         background_color
     };
 
     const SkScalar gradient_points[3] = {
         SkIntToScalar(0),
         SkDoubleToScalar(4.0 / rect.height()),
         SkIntToScalar(1)
     };
 
     SkPoint points[2];
-    points[0].set(SkIntToScalar(rect.x()), SkIntToScalar(rect.y()));
-    points[1].set(SkIntToScalar(rect.x()), SkIntToScalar(rect.bottom()));
+    points[0].iset(rect.x(), rect.y());
+    points[1].iset(rect.x(), rect.bottom());
 
-    GetGradientPaintForRect(rect,
-        gradient_colors, gradient_points, arraysize(gradient_points),
-        &fill_paint);
+    GetGradientPaintForRect(rect, gradient_colors, gradient_points,
+                            arraysize(gradient_points), &fill_paint);
   }
 
   SkPath border;
   GetRoundRectPath(rect, kBorderCornerRadius, &border);
   canvas->drawPath(border, fill_paint);
 
   SkPaint stroke_paint;
   GetStrokePaint(state, &stroke_paint);
   canvas->drawPath(border, stroke_paint);
 }
@@ skipping 45 matching lines @@
     State state,
     const gfx::Rect& rect,
     const InnerSpinButtonExtraParams& spin_button) const {
   // Adjust bounds to compensate the overridden "2px inset" parent border.
   gfx::Rect bounds = rect;
   bounds.Inset(0, -1, -1, -1);
 
   NativeThemeBase::PaintInnerSpinButton(canvas, state, bounds, spin_button);
 }
 
 void NativeThemeChromeos::PaintMenuPopupBackground(

[Peter Kasting, 2012/02/29 20:40:31]

Nit: It looks to me as if no implementers use |state| or |menu_list| at all, and
only this implementation uses |rect|, and then only for its size.  Maybe |rect|
should change to a gfx::Size and the other args should be dropped?

     SkCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const MenuListExtraParams& menu_list) const {
   static const SkColor kGradientColors[2] = {
       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(rect.height()));
+  points[0].iset(0, 0);
+  points[1].iset(0, rect.height());
 
   SkShader* shader = SkGradientShader::CreateLinear(points,
       kGradientColors, kGradientPoints, arraysize(kGradientPoints),
       SkShader::kRepeat_TileMode);
   DCHECK(shader);
 
   SkPaint paint;
   paint.setShader(shader);
   shader->unref();
 
   paint.setStyle(SkPaint::kFill_Style);
   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
 
   SkRect sk_rect;

[Peter Kasting, 2012/02/29 20:40:31]

Nit: Shorter:

  canvas->drawRect(gfx::RectToSkRect(gfx::Rect(rect.size())), paint);

[tfarina, 2012/02/29 22:42:14]

Done.

-  sk_rect.set(SkIntToScalar(0), SkIntToScalar(0),
-              SkIntToScalar(rect.width()), SkIntToScalar(rect.height()));
+  sk_rect.iset(0, 0, rect.width(), rect.height());
   canvas->drawRect(sk_rect, paint);
 }
 
 void NativeThemeChromeos::PaintProgressBar(SkCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const ProgressBarExtraParams& progress_bar) const {
   static const int kBorderWidth = 1;
   static const SkColor kBackgroundColors[] = {
     kProgressBarBackgroundGradient0,
@@ skipping 128 matching lines @@
 
   if (stroke_border) {
     SkPaint stroke_paint;
     GetStrokePaint(state, &stroke_paint);
     canvas->drawPath(border, stroke_paint);
   }
 }
 
 }  // namespace gfx