diff options
author | reed <reed@google.com> | 2015-05-12 10:37:34 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-12 10:37:34 -0700 |
commit | 80ea19ca4bdd68c1493666a5fe7e4ce9d43ded8b (patch) | |
tree | 1ad73d17a3314363d114ddc95932e271ae1e828a /src/gpu/GrPathUtils.cpp | |
parent | 1ebf0d2edc48f886521e6f03af78ef5da24c7982 (diff) |
Revert of Revert of stop calling SkScalarDiv (patchset #1 id:1 of https://codereview.chromium.org/1138263002/)
Reason for revert:
android patched, blink has rolled
Original issue's description:
> Revert of stop calling SkScalarDiv (patchset #4 id:60001 of https://codereview.chromium.org/1135053002/)
>
> Reason for revert:
> need to wait for Blink roll (and patch android)
>
> Original issue's description:
> > stop calling SkScalarDiv
> >
> > BUG=skia:
> > TBR=
> >
> > Committed: https://skia.googlesource.com/skia/+/67d71c898249a7af3523b16c6a69895a63bfae0a
>
> TBR=
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/2629697933b5cc975e45d2a45c48f803fc6cbcec
TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1135693003
Diffstat (limited to 'src/gpu/GrPathUtils.cpp')
-rw-r--r-- | src/gpu/GrPathUtils.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gpu/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp index 2a906664f2..3e2c3bfe66 100644 --- a/src/gpu/GrPathUtils.cpp +++ b/src/gpu/GrPathUtils.cpp @@ -29,8 +29,7 @@ SkScalar GrPathUtils::scaleToleranceToSrc(SkScalar devTol, stretch = SkMaxScalar(stretch, mat.mapRadius(SK_Scalar1)); } } - srcTol = SkScalarDiv(srcTol, stretch); - return srcTol; + return srcTol / stretch; } static const int MAX_POINTS_PER_CURVE = 1 << 10; @@ -51,7 +50,7 @@ uint32_t GrPathUtils::quadraticPointCount(const SkPoint points[], // subdivide x = log4(d/tol) times. x subdivisions creates 2^(x) // points. // 2^(log4(x)) = sqrt(x); - SkScalar divSqrt = SkScalarSqrt(SkScalarDiv(d, tol)); + SkScalar divSqrt = SkScalarSqrt(d / tol); if (((SkScalar)SK_MaxS32) <= divSqrt) { return MAX_POINTS_PER_CURVE; } else { @@ -107,11 +106,11 @@ uint32_t GrPathUtils::cubicPointCount(const SkPoint points[], if (d <= tol) { return 1; } else { - SkScalar divSqrt = SkScalarSqrt(SkScalarDiv(d, tol)); + SkScalar divSqrt = SkScalarSqrt(d / tol); if (((SkScalar)SK_MaxS32) <= divSqrt) { return MAX_POINTS_PER_CURVE; } else { - int temp = SkScalarCeilToInt(SkScalarSqrt(SkScalarDiv(d, tol))); + int temp = SkScalarCeilToInt(SkScalarSqrt(d / tol)); int pow2 = GrNextPow2(temp); // Because of NaNs & INFs we can wind up with a degenerate temp // such that pow2 comes out negative. Also, our point generator |