diff options
author | Cary Clark <caryclark@skia.org> | 2017-11-08 11:44:31 -0500 |
---|---|---|
committer | Ravi Mistry <rmistry@google.com> | 2017-11-08 18:25:17 +0000 |
commit | df429f3beac1c191289ba1e3bd918bf84df57bf5 (patch) | |
tree | 65f7f049b218ef8984d054524c05dd3fcea392a3 /src/gpu/GrTessellator.cpp | |
parent | 21ad53fd8839af82bcb11da6ab3e256ee7752f2b (diff) |
move parts of SkPoint to SkPointPriv
Move specialized SkPoint methods to SkPointPriv.
Use constexpr and inline initialization where possible.
R=reed@google.com,bsalomon@google.com
Bug: skia: 6898
Change-Id: I01ec5186f010f2dc80c068c70d9cc352f3221338
Reviewed-on: https://skia-review.googlesource.com/68700
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'src/gpu/GrTessellator.cpp')
-rw-r--r-- | src/gpu/GrTessellator.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/GrTessellator.cpp b/src/gpu/GrTessellator.cpp index a1ea284bab..a183439634 100644 --- a/src/gpu/GrTessellator.cpp +++ b/src/gpu/GrTessellator.cpp @@ -13,6 +13,7 @@ #include "SkArenaAlloc.h" #include "SkGeometry.h" #include "SkPath.h" +#include "SkPointPriv.h" #include <stdio.h> @@ -635,7 +636,7 @@ SkScalar quad_error_at(const SkPoint pts[3], SkScalar t, SkScalar u) { if (!p0.isFinite() || !mid.isFinite() || !p1.isFinite()) { return 0; } - return mid.distanceToLineSegmentBetweenSqd(p0, p1); + return SkPointPriv::DistanceToLineSegmentBetweenSqd(mid, p0, p1); } void append_quadratic_to_contour(const SkPoint pts[3], SkScalar toleranceSqd, VertexList* contour, @@ -669,8 +670,8 @@ void generate_cubic_points(const SkPoint& p0, VertexList* contour, int pointsLeft, SkArenaAlloc& alloc) { - SkScalar d1 = p1.distanceToLineSegmentBetweenSqd(p0, p3); - SkScalar d2 = p2.distanceToLineSegmentBetweenSqd(p0, p3); + SkScalar d1 = SkPointPriv::DistanceToLineSegmentBetweenSqd(p1, p0, p3); + SkScalar d2 = SkPointPriv::DistanceToLineSegmentBetweenSqd(p2, p0, p3); if (pointsLeft < 2 || (d1 < tolSqd && d2 < tolSqd) || !SkScalarIsFinite(d1) || !SkScalarIsFinite(d2)) { append_point_to_contour(p3, contour, alloc); |