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/core/SkPathMeasure.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/core/SkPathMeasure.cpp')
| -rw-r--r-- | src/core/SkPathMeasure.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/SkPathMeasure.cpp b/src/core/SkPathMeasure.cpp index c963e9cf35..a5dd84048c 100644 --- a/src/core/SkPathMeasure.cpp +++ b/src/core/SkPathMeasure.cpp @@ -341,8 +341,7 @@ static void seg_to(const SkPoint pts[], int segType, if (SK_Scalar1 == stopT) { dst->quadTo(tmp0[3], tmp0[4]); } else { - SkChopQuadAt(&tmp0[2], tmp1, SkScalarDiv(stopT - startT, - SK_Scalar1 - startT)); + SkChopQuadAt(&tmp0[2], tmp1, (stopT - startT) / (1 - startT)); dst->quadTo(tmp1[1], tmp1[2]); } } @@ -383,8 +382,7 @@ static void seg_to(const SkPoint pts[], int segType, if (SK_Scalar1 == stopT) { dst->cubicTo(tmp0[4], tmp0[5], tmp0[6]); } else { - SkChopCubicAt(&tmp0[3], tmp1, SkScalarDiv(stopT - startT, - SK_Scalar1 - startT)); + SkChopCubicAt(&tmp0[3], tmp1, (stopT - startT) / (1 - startT)); dst->cubicTo(tmp1[1], tmp1[2], tmp1[3]); } } |