stop using (deprecated) SkScalarDiv

BUG=

Review URL: https://codereview.chromium.org/1135263002

Cr-Commit-Position: refs/heads/master@{#329420}

ui/views/color_chooser/color_chooser_view.cc

@@ -144,7 +144,7 @@ ColorChooserView::HueView::HueView(ColorChooserView* chooser_view)
 void ColorChooserView::HueView::OnHueChanged(SkScalar hue) {
   SkScalar height = SkIntToScalar(kSaturationValueSize - 1);
   SkScalar hue_max = SkIntToScalar(360);
-  int level = SkScalarDiv(SkScalarMul(hue_max - hue, height), hue_max);
+  int level = (hue_max - hue) * height / hue_max;
   level += kBorderWidth;
   if (level_ != level) {
     level_ = level;
@@ -157,10 +157,8 @@ void ColorChooserView::HueView::ProcessEventAtLocation(
   level_ = std::max(kBorderWidth,
                     std::min(height() - 1 - kBorderWidth, point.y()));
   int base_height = kSaturationValueSize - 1;
-  chooser_view_->OnHueChosen(SkScalarDiv(
-      SkScalarMul(SkIntToScalar(360),
-                  SkIntToScalar(base_height - (level_ - kBorderWidth))),
-      SkIntToScalar(base_height)));
+  chooser_view_->OnHueChosen(360.f * (base_height - (level_ - kBorderWidth)) /
+                             base_height);
   SchedulePaint();
 }
 
@@ -181,10 +179,8 @@ void ColorChooserView::HueView::OnPaint(gfx::Canvas* canvas) {
                    SK_ColorGRAY);
   int base_left = kHueIndicatorSize + kBorderWidth;
   for (int y = 0; y < kSaturationValueSize; ++y) {
-    hsv[0] = SkScalarDiv(SkScalarMul(SkIntToScalar(360),
-                                     SkIntToScalar(
-                                         kSaturationValueSize - 1 - y)),
-                    SkIntToScalar(kSaturationValueSize - 1));
+    hsv[0] =
+        360.f * (kSaturationValueSize - 1 - y) / (kSaturationValueSize - 1);
     canvas->FillRect(gfx::Rect(base_left, y + kBorderWidth, kHueBarWidth, 1),
                      SkHSVToColor(hsv));
   }
@@ -282,10 +278,8 @@ void ColorChooserView::SaturationValueView::OnSaturationValueChanged(
 void ColorChooserView::SaturationValueView::ProcessEventAtLocation(
     const gfx::Point& point) {
   SkScalar scalar_size = SkIntToScalar(kSaturationValueSize - 1);
-  SkScalar saturation = SkScalarDiv(
-      SkIntToScalar(point.x() - kBorderWidth), scalar_size);
-  SkScalar value = SK_Scalar1 - SkScalarDiv(
-      SkIntToScalar(point.y() - kBorderWidth), scalar_size);
+  SkScalar saturation = (point.x() - kBorderWidth) / scalar_size;
+  SkScalar value = SK_Scalar1 - (point.y() - kBorderWidth) / scalar_size;
   saturation = SkScalarPin(saturation, 0, SK_Scalar1);
   value = SkScalarPin(value, 0, SK_Scalar1);
   OnSaturationValueChanged(saturation, value);

ui/views/controls/progress_bar.cc

@@ -239,9 +239,8 @@ void ProgressBar::OnPaint(gfx::Canvas* canvas) {
       };
       // We want a thin 1-pixel line for kBarTopColor.
       SkScalar scalar_height = SkIntToScalar(bar_height);
-      SkScalar highlight_width = SkScalarDiv(SK_Scalar1, scalar_height);
-      SkScalar border_width = SkScalarDiv(SkIntToScalar(kBorderWidth),
-                                          scalar_height);
+      SkScalar highlight_width = 1 / scalar_height;
+      SkScalar border_width = kBorderWidth / scalar_height;
       const SkScalar bar_points[] = {
         0,
         border_width,
@@ -284,9 +283,7 @@ void ProgressBar::OnPaint(gfx::Canvas* canvas) {
           kBarHighlightEnd,
         };
         const SkScalar highlight_points[] = {
-          0,
-          SK_Scalar1 - SkScalarDiv(SkIntToScalar(kBorderWidth), scalar_height),
-          SK_Scalar1,
+            0, SK_Scalar1 - kBorderWidth / scalar_height, SK_Scalar1,
         };
         SkPaint paint;
         paint.setStyle(SkPaint::kFill_Style);