From 24289e05d55ccdc04ef239c7972d2b52e402ad0f Mon Sep 17 00:00:00 2001 From: Stephen White Date: Fri, 29 Jun 2018 17:02:21 -0400 Subject: GrTessellator: handle three consecutive collinear edges. In some cases, splitting may produce three consecutive edges which are collinear. The first one was being merged out, causing the third one to be missed. The fix is to switch the arguments to merge_edges_*, ensuring that the second parameter (the destination edge) is never merged out. Bug: 851409 Change-Id: I65be2e8222846c99f7bc8d17ea61ddead617cc31 Reviewed-on: https://skia-review.googlesource.com/138700 Reviewed-by: Robert Phillips Commit-Queue: Stephen White --- tests/TessellatingPathRendererTests.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'tests/TessellatingPathRendererTests.cpp') diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp index a9913769df..0c7a5ca4c5 100644 --- a/tests/TessellatingPathRendererTests.cpp +++ b/tests/TessellatingPathRendererTests.cpp @@ -560,7 +560,7 @@ static SkPath create_path_38() { return path; } -// Reduction from crbug.com/851409. +// Reduction from crbug.com/851409. Exercises collinear last vertex. static SkPath create_path_39() { SkPath path; path.moveTo(2072553216, 0); @@ -571,6 +571,18 @@ static SkPath create_path_39() { return path; } +// Another reduction from crbug.com/851409. Exercises two sequential collinear edges. +static SkPath create_path_40() { + SkPath path; + path.moveTo(2072553216, 0); + path.lineTo(2072553216, 1); + path.lineTo(2072553472, -13); + path.lineTo(2072553216, 0); + path.lineTo(2072553472, -6); + path.lineTo(2072553472, -13); + return path; +} + static std::unique_ptr create_linear_gradient_processor(GrContext* ctx) { SkPoint pts[2] = { {0, 0}, {1, 1} }; @@ -670,4 +682,5 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(TessellatingPathRendererTests, reporter, ctxInfo) { test_path(ctx, rtc.get(), create_path_37()); test_path(ctx, rtc.get(), create_path_38(), SkMatrix(), GrAAType::kCoverage); test_path(ctx, rtc.get(), create_path_39()); + test_path(ctx, rtc.get(), create_path_40()); } -- cgit v1.2.3