From dac1d17027dcaa5596885a9f333979418b35001c Mon Sep 17 00:00:00 2001 From: caryclark Date: Tue, 17 Jun 2014 05:15:38 -0700 Subject: Enabling the canvas bit to turn the clip stack into a flat replace exposed around 100 failures when testing the 800K skp set generated from the top 1M web sites. This fixes all but one of those failures. Major changes include: - Replace angle indices with angle pointers. This was motivated by the need to add angles later but not renumber existing angles. - Aggressive segment chase. When the winding is known on a segment, more aggressively passing that winding to adjacent segments allows fragmented data sets to succeed. - Line segments with ends nearly the same are treated as coincident first. - Transfer partial coincidence by observing that if segment A is partially coincident to B and C then B and C may be partially coincident. TBR=reed Author: caryclark@google.com Review URL: https://codereview.chromium.org/272153002 --- tests/PathOpsAngleTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/PathOpsAngleTest.cpp') diff --git a/tests/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp index 1aae27a847..faf61584e6 100644 --- a/tests/PathOpsAngleTest.cpp +++ b/tests/PathOpsAngleTest.cpp @@ -264,7 +264,7 @@ DEF_TEST(PathOpsAngleCircle, reporter) { break; } } - PathOpsAngleTester::Orderable(segment[0].angle(0), segment[1].angle(0)); + PathOpsAngleTester::Orderable(*segment[0].debugLastAngle(), *segment[1].debugLastAngle()); } struct IntersectData { @@ -438,9 +438,9 @@ DEF_TEST(PathOpsAngleAfter, reporter) { } break; } } - SkOpAngle& angle1 = const_cast(segment[0].angle(0)); - SkOpAngle& angle2 = const_cast(segment[1].angle(0)); - SkOpAngle& angle3 = const_cast(segment[2].angle(0)); + SkOpAngle& angle1 = *const_cast(segment[0].debugLastAngle()); + SkOpAngle& angle2 = *const_cast(segment[1].debugLastAngle()); + SkOpAngle& angle3 = *const_cast(segment[2].debugLastAngle()); PathOpsAngleTester::SetNext(angle1, angle3); // These data sets are seeded when the set itself fails, so likely the dataset does not // match the expected result. The tests above return 1 when first added, but -- cgit v1.2.3