From 65f553182ab7069378ef863d30094d0327f178d0 Mon Sep 17 00:00:00 2001 From: caryclark Date: Thu, 13 Nov 2014 06:58:52 -0800 Subject: These tests stress pathops by describing the union of circle-like paths that have tiny line segments embedded and double back to create near-coincident conditions. The fixes include - detect when finding the active top loops between two possible answers - preflight chasing winding to ensure answer is consistent - binary search more often when quadratic intersection fails - add more failure paths when an intersect is missed While this fixes the chrome bug, reenabling path ops in svg should be deferred until additional fixes are landed. TBR= BUG=421132 Committed: https://skia.googlesource.com/skia/+/6f726addf3178b01949bb389ef83cf14a1d7b6b2 Review URL: https://codereview.chromium.org/633393002 --- tests/PathOpsExtendedTest.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/PathOpsExtendedTest.h') diff --git a/tests/PathOpsExtendedTest.h b/tests/PathOpsExtendedTest.h index 49ac80451c..5f7e972f49 100644 --- a/tests/PathOpsExtendedTest.h +++ b/tests/PathOpsExtendedTest.h @@ -30,11 +30,13 @@ extern int comparePaths(const SkPath& one, const SkPath& two, SkBitmap& bitmap); extern bool drawAsciiPaths(const SkPath& one, const SkPath& two, bool drawPaths); extern void showOp(const SkPathOp op); extern bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b, - const SkPathOp , const char* testName); + 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 testPathFailOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b, - const SkPathOp , const char* testName); + const SkPathOp , const char* testName); extern bool testThreadedPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b, - const SkPathOp , const char* testName); + 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); -- cgit v1.2.3