From 59d5a0e3f560da40e0ae7036a01d7d58ce3718d8 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Mon, 23 Jan 2017 14:38:52 +0000 Subject: Revert "offset angle check edge in common" This reverts commit d2eb581ebc8f8009e80cccccd74d5b341ef5bd5b. Reason for revert: broke Google3 MSAN run of dm Original change's description: > offset angle check edge in common > > When curves cross, their intersection points may be nearby, but not exactly the same. > Sort the angles formed by the crossing curves when all angles don't have the same > origin. > > This sets up the framework to solve test case that currently fail (e.g., joel6) but > does not fix all related test cases (e.g., joel9). > > All older existing test cases, including extended tests, pass. > > Rework the test framework to better report when tests expected to produce failing > results now pass. > > Add new point and vector operations to support offset angles. > > TBR=reed@google.com > BUG=skia:6041 > > Change-Id: I67c651ded0a25e99ad93d55d6a35109b3ee3698e > Reviewed-on: https://skia-review.googlesource.com/6624 > Commit-Queue: Cary Clark > Reviewed-by: Cary Clark > TBR=caryclark@google.com,reviews@skia.org # Not skipping CQ checks because original CL landed > 1 day ago. BUG=skia:6041 Change-Id: I43db0808522ac44aceeb4f70e296167ea84a3663 Reviewed-on: https://skia-review.googlesource.com/7373 Commit-Queue: Cary Clark Reviewed-by: Cary Clark --- tests/PathOpsExtendedTest.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tests/PathOpsExtendedTest.h') diff --git a/tests/PathOpsExtendedTest.h b/tests/PathOpsExtendedTest.h index 7c8ceb1529..9f8b0aeaac 100644 --- a/tests/PathOpsExtendedTest.h +++ b/tests/PathOpsExtendedTest.h @@ -36,18 +36,17 @@ extern bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPa const SkPathOp , const char* testName); extern bool testPathOpCheck(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b, const SkPathOp , const char* testName, bool checkFail); +extern bool testPathOpFail(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b, + const SkPathOp, const char* testName); extern bool testPathOpFuzz(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b, const SkPathOp , const char* testName); -extern bool testPathOpTry(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b, - const SkPathOp , const char* testName); extern bool testSimplify(SkPath& path, bool useXor, SkPath& out, PathOpsThreadState& state, const char* pathStr); extern bool testSimplify(skiatest::Reporter* reporter, const SkPath& path, const char* filename); extern bool testSimplifyCheck(skiatest::Reporter* reporter, const SkPath& path, const char* filename, bool checkFail); extern bool testSimplifyFuzz(skiatest::Reporter* reporter, const SkPath& path, - const char* filename); -extern bool testSimplifyTry(skiatest::Reporter* reporter, const SkPath& path, const char* filename); + const char* filename); void initializeTests(skiatest::Reporter* reporter, const char* testName); -- cgit v1.2.3