stop using SkScalarMul

BUG=skia:

Change-Id: Ie41d8665a1c62ba8eddc93d8cfefaf64ddc52ff8
Reviewed-on: https://skia-review.googlesource.com/8411
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Reed <reed@google.com>

5 files changed, 12 insertions, 15 deletions

diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp
index 40ec64456b..54a04d2771 100644
--- a/bench/ColorFilterBench.cpp
+++ b/bench/ColorFilterBench.cpp
@@ -16,7 +16,7 @@
 #define FILTER_HEIGHT_LARGE SkIntToScalar(256)
 
 static sk_sp<SkImageFilter> make_brightness(float amount, sk_sp<SkImageFilter> input) {
-    SkScalar amount255 = SkScalarMul(amount, SkIntToScalar(255));
+    SkScalar amount255 = amount * 255;
     SkScalar matrix[20] = { 1, 0, 0, 0, amount255,
                             0, 1, 0, 0, amount255,
                             0, 0, 1, 0, amount255,
diff --git a/bench/FSRectBench.cpp b/bench/FSRectBench.cpp
index 2d5abc21cd..ba68ea1dfa 100644
--- a/bench/FSRectBench.cpp
+++ b/bench/FSRectBench.cpp
@@ -28,10 +28,10 @@ protected:
             static const SkScalar kMaxOffset = 100 * SK_Scalar1;
             static const SkScalar kOffsetRange = kMaxOffset - kMinOffset;
             for (int i = 0; i < N; ++i) {
-                fRects[i].fLeft = -kMinOffset - SkScalarMul(rand.nextUScalar1(), kOffsetRange);
-                fRects[i].fTop = -kMinOffset - SkScalarMul(rand.nextUScalar1(), kOffsetRange);
-                fRects[i].fRight = W + kMinOffset + SkScalarMul(rand.nextUScalar1(), kOffsetRange);
-                fRects[i].fBottom = H + kMinOffset + SkScalarMul(rand.nextUScalar1(), kOffsetRange);
+                fRects[i].fLeft = -kMinOffset - rand.nextUScalar1() * kOffsetRange;
+                fRects[i].fTop = -kMinOffset - rand.nextUScalar1() * kOffsetRange;
+                fRects[i].fRight = W + kMinOffset + rand.nextUScalar1() * kOffsetRange;
+                fRects[i].fBottom = H + kMinOffset + rand.nextUScalar1() * kOffsetRange;
                 fColors[i] = rand.nextU() | 0xFF000000;
             }
             fInit = true;
diff --git a/bench/ImageFilterCollapse.cpp b/bench/ImageFilterCollapse.cpp
index d85d1de330..ce27f06dd0 100644
--- a/bench/ImageFilterCollapse.cpp
+++ b/bench/ImageFilterCollapse.cpp
@@ -98,7 +98,7 @@ private:
 };
 
 static sk_sp<SkColorFilter> make_brightness(float amount) {
-    SkScalar amount255 = SkScalarMul(amount, SkIntToScalar(255));
+    SkScalar amount255 = amount * 255;
     SkScalar matrix[20] = { 1, 0, 0, 0, amount255,
                             0, 1, 0, 0, amount255,
                             0, 0, 1, 0, amount255,
diff --git a/bench/LightingBench.cpp b/bench/LightingBench.cpp
index bbe0af343c..a924f4a9ce 100644
--- a/bench/LightingBench.cpp
+++ b/bench/LightingBench.cpp
@@ -37,11 +37,10 @@ protected:
     static SkPoint3 GetDistantDirection() {
         static SkScalar azimuthRad = SkDegreesToRadians(SkIntToScalar(225));
         static SkScalar elevationRad = SkDegreesToRadians(SkIntToScalar(5));
-        static SkPoint3 distantDirection = SkPoint3::Make(SkScalarMul(SkScalarCos(azimuthRad),
-                                                                      SkScalarCos(elevationRad)),
-                                                          SkScalarMul(SkScalarSin(azimuthRad),
-                                                                      SkScalarCos(elevationRad)),
-                                                          SkScalarSin(elevationRad));
+        static SkPoint3 distantDirection = SkPoint3::Make(
+                                              SkScalarCos(azimuthRad) * SkScalarCos(elevationRad),
+                                              SkScalarSin(azimuthRad) * SkScalarCos(elevationRad),
+                                              SkScalarSin(elevationRad));
         return distantDirection;
     }
 
diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp
index 10cffc20c2..3a1410a32d 100644
--- a/bench/PathBench.cpp
+++ b/bench/PathBench.cpp
@@ -272,10 +272,8 @@ public:
         SkRandom rand (12);
         int i;
         for (i = 0; i < 100; i++) {
-            path->quadTo(SkScalarMul(rand.nextUScalar1(), SkIntToScalar(640)),
-                         SkScalarMul(rand.nextUScalar1(), SkIntToScalar(480)),
-                         SkScalarMul(rand.nextUScalar1(), SkIntToScalar(640)),
-                         SkScalarMul(rand.nextUScalar1(), SkIntToScalar(480)));
+            path->quadTo(rand.nextUScalar1() * 640, rand.nextUScalar1() * 480,
+                         rand.nextUScalar1() * 640, rand.nextUScalar1() * 480);
         }
         path->close();
     }