Revert of stop calling SkScalarDiv

src/animator/SkDrawColor.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDrawColor.h"
@@ skipping 12 matching lines @@
 
 static SkScalar RGB_to_HSV(SkColor color, HSV_Choice choice) {
     SkScalar red = SkIntToScalar(SkColorGetR(color));
     SkScalar green = SkIntToScalar(SkColorGetG(color));
     SkScalar blue = SkIntToScalar(SkColorGetB(color));
     SkScalar min = SkMinScalar(SkMinScalar(red, green), blue);
     SkScalar value = SkMaxScalar(SkMaxScalar(red, green), blue);
     if (choice == kGetValue)
         return value/255;
     SkScalar delta = value - min;
-    SkScalar saturation = value == 0 ? 0 : delta / value;
+    SkScalar saturation = value == 0 ? 0 : SkScalarDiv(delta, value);
     if (choice == kGetSaturation)
         return saturation;
     SkScalar hue;
     if (saturation == 0)
         hue = 0;
     else {
-        SkScalar part60 = 60 / delta;
+        SkScalar part60 = SkScalarDiv(60 * SK_Scalar1, delta);
         if (red == value) {
             hue = SkScalarMul(green - blue, part60);
             if (hue < 0)
                 hue += 360 * SK_Scalar1;
         }
         else if (green == value)
             hue = 120 * SK_Scalar1 + SkScalarMul(blue - red, part60);
         else  // blue == value
             hue = 240 * SK_Scalar1 + SkScalarMul(red - green, part60);
     }
@@ skipping 205 matching lines @@
         case SK_PROPERTY(value):
             fValue = scalar;//RGB_to_HSV(color, kGetValue);
             fDirty = true;
             break;
         default:
             SkASSERT(0);
             return false;
     }
     return true;
 }