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/effects/SkCornerPathEffect.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/effects/SkCornerPathEffect.cpp')
| -rw-r--r-- | src/effects/SkCornerPathEffect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/effects/SkCornerPathEffect.cpp b/src/effects/SkCornerPathEffect.cpp index 79d4c4cbd3..4b81f261fe 100644 --- a/src/effects/SkCornerPathEffect.cpp +++ b/src/effects/SkCornerPathEffect.cpp @@ -20,13 +20,12 @@ static bool ComputeStep(const SkPoint& a, const SkPoint& b, SkScalar radius, SkPoint* step) { SkScalar dist = SkPoint::Distance(a, b); - step->set(b.fX - a.fX, b.fY - a.fY); - + *step = b - a; if (dist <= radius * 2) { - step->scale(SK_ScalarHalf); + *step *= SK_ScalarHalf; return false; } else { - step->scale(SkScalarDiv(radius, dist)); + *step *= radius / dist; return true; } } @@ -47,6 +46,7 @@ bool SkCornerPathEffect::filterPath(SkPath* dst, const SkPath& src, bool prevIsValid = true; // to avoid warnings + step.set(0, 0); moveTo.set(0, 0); firstStep.set(0, 0); lastCorner.set(0, 0); |