From 0dc4dd6dda9a7912f696b46d9c02155ec1d1ba5f Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 24 Mar 2015 13:55:33 -0700 Subject: Revert of pathops version two (patchset #16 id:150001 of https://codereview.chromium.org/1002693002/) Reason for revert: ASAN investigation Original issue's description: > pathops version two > > R=reed@google.com > > marked 'no commit' to attempt to get trybots to run > > TBR=reed@google.com > > Committed: https://skia.googlesource.com/skia/+/ccec0f958ffc71a9986d236bc2eb335cb2111119 TBR=caryclark@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1029993002 --- src/pathops/SkPathOpsTCubicSect.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/pathops/SkPathOpsTCubicSect.cpp') diff --git a/src/pathops/SkPathOpsTCubicSect.cpp b/src/pathops/SkPathOpsTCubicSect.cpp index 10a84a3843..0b3ddd7d0d 100644 --- a/src/pathops/SkPathOpsTCubicSect.cpp +++ b/src/pathops/SkPathOpsTCubicSect.cpp @@ -7,9 +7,9 @@ #include "SkPathOpsTSect.h" -int SkIntersections::intersect(const SkDCubic& cubic1, const SkDCubic& cubic2) { - SkTSect sect1(cubic1 PATH_OPS_DEBUG_T_SECT_PARAMS(1)); - SkTSect sect2(cubic2 PATH_OPS_DEBUG_T_SECT_PARAMS(2)); +int SkIntersections::intersectB(const SkDCubic& cubic1, const SkDCubic& cubic2) { + SkTSect sect1(cubic1 PATH_OPS_DEBUG_PARAMS(1)); + SkTSect sect2(cubic2 PATH_OPS_DEBUG_PARAMS(2)); SkTSect::BinarySearch(§1, §2, this); return used(); } -- cgit v1.2.3