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

ui/gfx/native_theme_android.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_android.h"
 
 #include <limits>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "grit/gfx_resources.h"
@@ skipping 326 matching lines @@
     canvas->drawLine(rect.x() + 1, rect.y(), kRight - 1, rect.y(), paint);
     canvas->drawLine(kRight - 1, rect.y() + 1, kRight - 1, kBottom - 1, paint);
     canvas->drawLine(rect.x() + 1, kBottom - 1, kRight - 1, kBottom - 1, paint);
     canvas->drawLine(rect.x(), rect.y() + 1, rect.x(), kBottom - 1, paint);
   }
 
   paint.setColor(SK_ColorBLACK);
   int kLightEnd = state == PRESSED ? 1 : 0;
   int kDarkEnd = !kLightEnd;
   SkPoint gradient_bounds[2];
-  gradient_bounds[kLightEnd].set(SkIntToScalar(rect.x()),
-                                 SkIntToScalar(rect.y()));
-  gradient_bounds[kDarkEnd].set(SkIntToScalar(rect.x()),
-                                SkIntToScalar(kBottom - 1));
+  gradient_bounds[kLightEnd].iset(rect.x(), rect.y());
+  gradient_bounds[kDarkEnd].iset(rect.x(), kBottom - 1);
   SkColor colors[2];
   colors[0] = light_color;
   colors[1] = base_color;
 
   SkShader* shader = SkGradientShader::CreateLinear(
       gradient_bounds, colors, NULL, 2, SkShader::kClamp_TileMode, NULL);
   paint.setStyle(SkPaint::kFill_Style);
   paint.setShader(shader);
   shader->unref();
 
@@ skipping 245 matching lines @@
 
     DrawTiledImage(canvas, *value_image, 0, 0, tile_scale_x, tile_scale,
         progress_bar.value_rect_x,
         progress_bar.value_rect_y,
         progress_bar.value_rect_width,
         progress_bar.value_rect_height);
   }
 
   int dest_left_border_width = static_cast<int>(left_border_image->width() *
       tile_scale);
   SkRect dest_rect = {

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

Nit: Could probably use iset() here too

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

Done.

       SkIntToScalar(rect.x()),
       SkIntToScalar(rect.y()),
       SkIntToScalar(rect.x() + dest_left_border_width),
       SkIntToScalar(rect.bottom())
   };
   canvas->drawBitmapRect(*left_border_image, NULL, dest_rect);
 
   int dest_right_border_width = static_cast<int>(right_border_image->width() *
       tile_scale);
-  dest_rect.set(SkIntToScalar(rect.right() - dest_right_border_width),
-      SkIntToScalar(rect.y()),
-      SkIntToScalar(rect.right()),
-      SkIntToScalar(rect.bottom()));
+  dest_rect.iset(rect.right() - dest_right_border_width, rect.y(), rect.right(),
+                rect.bottom());
   canvas->drawBitmapRect(*right_border_image, NULL, dest_rect);
 }
 
 bool NativeThemeAndroid::IntersectsClipRectInt(SkCanvas* canvas,
                                                int x,
                                                int y,
                                                int w,
                                                int h) {
   SkRect clip;
   return canvas->getClipBounds(&clip) &&
@@ skipping 143 matching lines @@
   SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2, 0.28, 0.5);
   SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5);
 
   if (hsv1[2] + hsv2[2] > 1.0)
     diff = -diff;
 
   return SaturateAndBrighten(hsv2, -0.2, diff);
 }
 
 }  // namespace gfx