commit 8be952ad8c9deefe19cff36f9ad217563400f817
author Mike Reed <reed@google.com> Mon Feb 13 20:44:33 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 14 14:43:47 2017 +0000
tree 3879f25fb86ed01ffd3817b510bd8a63423f9e8d
parent 351549febad86d785aab6c985c9489d55a0bd2a4

SkScalarMul is deprecated

BUG=skia:

Change-Id: I88ecfe9d4c72506f6b1a0e0dfadd2a5c171a6cb6
Reviewed-on: https://skia-review.googlesource.com/8353
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

src/gpu/GrPathUtils.cpp

diff --git a/src/gpu/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp
index aac2838..867407d 100644
--- a/src/gpu/GrPathUtils.cpp
+++ b/src/gpu/GrPathUtils.cpp
@@ -441,8 +441,9 @@
                 detABSqd = SkScalarSquare(detABSqd);
                 SkScalar detDCSqd = dc.cross(da);
                 detDCSqd = SkScalarSquare(detDCSqd);
-                if (SkScalarMul(detABSqd, invDALengthSqd) < toleranceSqd &&
-                    SkScalarMul(detDCSqd, invDALengthSqd) < toleranceSqd) {
+                if (detABSqd * invDALengthSqd < toleranceSqd &&
+                    detDCSqd * invDALengthSqd < toleranceSqd)
+                {
                     doQuads = true;
                 }
             }
@@ -499,9 +500,9 @@
             SkScalar z0 = -ab.dot(p[0]);
             dc.setOrthog(dc);
             SkScalar z1 = -dc.dot(p[3]);
-            cAvg.fX = SkScalarMul(ab.fY, z1) - SkScalarMul(z0, dc.fY);
-            cAvg.fY = SkScalarMul(z0, dc.fX) - SkScalarMul(ab.fX, z1);
-            SkScalar z = SkScalarMul(ab.fX, dc.fY) - SkScalarMul(ab.fY, dc.fX);
+            cAvg.fX = ab.fY * z1 - z0 * dc.fY;
+            cAvg.fY = z0 * dc.fX - ab.fX * z1;
+            SkScalar z = ab.fX * dc.fY - ab.fY * dc.fX;
             z = SkScalarInvert(z);
             cAvg.fX *= z;
             cAvg.fY *= z;
@@ -512,7 +513,7 @@
                 // the distances and tolerance can't be negative.
                 // (d0 + d1)^2 > toleranceSqd
                 // d0Sqd + 2*d0*d1 + d1Sqd > toleranceSqd
-                SkScalar d0d1 = SkScalarSqrt(SkScalarMul(d0Sqd, d1Sqd));
+                SkScalar d0d1 = SkScalarSqrt(d0Sqd * d1Sqd);
                 subdivide = 2 * d0d1 + d0Sqd + d1Sqd > toleranceSqd;
             }
         }