diff options
| author |  reed <reed@google.com> | 2015-05-12 10:28:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-12 10:28:06 -0700 |
| commit | 2629697933b5cc975e45d2a45c48f803fc6cbcec (patch) | |
| tree | 53730ca8354552773d93adfe7ade5f1e2bc18192 /src/core/SkPathMeasure.cpp | |
| parent | 39a9a5069b25aa8b9529118cfd0ece5f412fb56b (diff) | |
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:
Review URL: https://codereview.chromium.org/1138263002
Diffstat (limited to 'src/core/SkPathMeasure.cpp')
| -rw-r--r-- | src/core/SkPathMeasure.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/SkPathMeasure.cpp b/src/core/SkPathMeasure.cpp index a5dd84048c..c963e9cf35 100644 --- a/src/core/SkPathMeasure.cpp +++ b/src/core/SkPathMeasure.cpp @@ -341,7 +341,8 @@ static void seg_to(const SkPoint pts[], int segType, if (SK_Scalar1 == stopT) { dst->quadTo(tmp0[3], tmp0[4]); } else { - SkChopQuadAt(&tmp0[2], tmp1, (stopT - startT) / (1 - startT)); + SkChopQuadAt(&tmp0[2], tmp1, SkScalarDiv(stopT - startT, + SK_Scalar1 - startT)); dst->quadTo(tmp1[1], tmp1[2]); } } @@ -382,7 +383,8 @@ 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, (stopT - startT) / (1 - startT)); + SkChopCubicAt(&tmp0[3], tmp1, SkScalarDiv(stopT - startT, + SK_Scalar1 - startT)); dst->cubicTo(tmp1[1], tmp1[2], tmp1[3]); } } |