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 /experimental | |
| 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 'experimental')
| -rw-r--r-- | experimental/StrokePathRenderer/GrStrokePathRenderer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp b/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp index e693c41a66..4b41dba5b1 100644 --- a/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp +++ b/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp @@ -39,8 +39,8 @@ static IntersectionType intersection(const SkPoint& p1, const SkPoint& p2, SkScalar pre = SkScalarMul(x1, y2) - SkScalarMul(y1, x2), post = SkScalarMul(x3, y4) - SkScalarMul(y3, x4); // Compute the point of intersection - res.set((SkScalarMul(pre, x3 - x4) - SkScalarMul(x1 - x2, post) / d, - (SkScalarMul(pre, y3 - y4) - SkScalarMul(y1 - y2, post) / d); + res.set(SkScalarDiv(SkScalarMul(pre, x3 - x4) - SkScalarMul(x1 - x2, post), d), + SkScalarDiv(SkScalarMul(pre, y3 - y4) - SkScalarMul(y1 - y2, post), d)); // Check if the x and y coordinates are within both lines return (res.x() < GrMin(x1, x2) || res.x() > GrMax(x1, x2) || @@ -184,7 +184,9 @@ bool GrStrokePathRenderer::onDrawPath(const SkPath& origPath, SkPoint miterPt1 = miterPt[0] - *pt1; SkScalar sqDist0 = miterPt0.dot(miterPt0); SkScalar sqDist1 = miterPt1.dot(miterPt1); - const SkScalar rSq = radius*radius / sinHalfAngleSq; + const SkScalar rSq = + SkScalarDiv(SkScalarMul(radius, radius), + sinHalfAngleSq); const SkScalar sqRLimit = SkScalarMul(sqMiterLimit, rSq); if (sqDist0 > sqRLimit || sqDist1 > sqRLimit) { |