From 1049f1246e7be4ccb68001361efceb8933e6f81c Mon Sep 17 00:00:00 2001 From: caryclark Date: Mon, 20 Apr 2015 08:31:59 -0700 Subject: Now, path ops natively intersect conics, quads, and cubics in any combination. There are still a class of cubic tests that fail and a handful of undiagnosed failures from skps and fuzz tests, but things are much better overall. Extended tests (150M+) run to completion in release in about 6 minutes; the standard test suite exceeds 100K and finishes in a few seconds on desktops. TBR=reed BUG=skia:3588 Review URL: https://codereview.chromium.org/1037953004 --- tests/PathOpsSkpTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/PathOpsSkpTest.cpp') diff --git a/tests/PathOpsSkpTest.cpp b/tests/PathOpsSkpTest.cpp index cd20fe5e7e..a86218da78 100755 --- a/tests/PathOpsSkpTest.cpp +++ b/tests/PathOpsSkpTest.cpp @@ -1061,7 +1061,7 @@ static void skpmlk_com326(skiatest::Reporter* reporter, const char* filename) { pathB.lineTo(149, 675); pathB.cubicTo(149, 672.790833f, 151.238571f, 671, 154, 671); pathB.close(); - testPathOpCheck(reporter, path, pathB, kIntersect_SkPathOp, filename, FLAGS_runFail); + testPathOp(reporter, path, pathB, kIntersect_SkPathOp, filename); } static void skpcyclist_friends_gr52(skiatest::Reporter* reporter, const char* filename) { @@ -1090,7 +1090,7 @@ static void skpcyclist_friends_gr52(skiatest::Reporter* reporter, const char* fi // FIXME: this generates quads and cubics that are (correctly) not coincident unlike the old code // however, somewhere the angles are sorted incorrectly and the winding is computed to be -1/-2 // but I can't find the error - testPathOp(reporter, path, pathB, kIntersect_SkPathOp, filename); + testPathOpCheck(reporter, path, pathB, kIntersect_SkPathOp, filename, FLAGS_runFail); } static void skpwww_fj_p_com_22(skiatest::Reporter* reporter, const char* filename) { @@ -3769,7 +3769,7 @@ pathB.cubicTo(980.018494f, 1481.22131f, 979.602478f, 1478.38831f, 984.546021f, 1 } static void (*skipTest)(skiatest::Reporter* , const char* filename) = 0; -static void (*firstTest)(skiatest::Reporter* , const char* filename) = 0; +static void (*firstTest)(skiatest::Reporter* , const char* filename) = skpwww_macrumors_com_131; static void (*stopTest)(skiatest::Reporter* , const char* filename) = 0; static struct TestDesc tests[] = { -- cgit v1.2.3