commit 4e1a4c9399b8bb0897218f3ec10c254d3bb97463
author caryclark <caryclark@google.com> Mon May 18 12:56:57 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon May 18 12:56:58 2015 -0700
tree 8d7dc01783988b530486faffd2317036eb41cfa6
parent 4e149c09bcf1f02e3f31cd8e7bbe794a00090948

fix builder winding again

Record the nesting level when finding the edge winding contribution
so that inner edges can be reversed as needed.

R=fmalita@chromium.org
BUG=skia:3838

Review URL: https://codereview.chromium.org/1140383002

tests/PathOpsBuilderTest.cpp

diff --git a/tests/PathOpsBuilderTest.cpp b/tests/PathOpsBuilderTest.cpp
index ea4c567..d36072f 100644
--- a/tests/PathOpsBuilderTest.cpp
+++ b/tests/PathOpsBuilderTest.cpp
@@ -34,8 +34,7 @@
     REPORTER_ASSERT(reporter, result.isRect(NULL, &closed, &dir));
     REPORTER_ASSERT(reporter, closed);
     REPORTER_ASSERT(reporter, dir == SkPath::kCCW_Direction);
-    SkBitmap bitmap;
-    int pixelDiff = comparePaths(reporter, __FUNCTION__, rectPath, result, bitmap);
+    int pixelDiff = comparePaths(reporter, __FUNCTION__, rectPath, result);
     REPORTER_ASSERT(reporter, pixelDiff == 0);
 
     rectPath.reset();
@@ -76,7 +75,7 @@
     builder.add(circle2, kUnion_SkPathOp);
     builder.add(circle3, kDifference_SkPathOp);
     REPORTER_ASSERT(reporter, builder.resolve(&result));
-    pixelDiff = comparePaths(reporter, __FUNCTION__, opCompare, result, bitmap);
+    pixelDiff = comparePaths(reporter, __FUNCTION__, opCompare, result);
     REPORTER_ASSERT(reporter, pixelDiff == 0);
 }
 
@@ -98,8 +97,7 @@
     SkOpBuilder builder;
     builder.add(path, kUnion_SkPathOp);
     builder.resolve(&path2);
-    SkBitmap bitmap;
-    int pixelDiff = comparePaths(reporter, __FUNCTION__, path, path2, bitmap);
+    int pixelDiff = comparePaths(reporter, __FUNCTION__, path, path2);
     REPORTER_ASSERT(reporter, pixelDiff == 0);
 }
 
@@ -112,8 +110,28 @@
     builder.add(path, kUnion_SkPathOp);
 
     SkPath result;
-    SkBitmap bitmap;
     builder.resolve(&result);
-    int pixelDiff = comparePaths(reporter, __FUNCTION__, path, result, bitmap);
+    int pixelDiff = comparePaths(reporter, __FUNCTION__, path, result);
+    REPORTER_ASSERT(reporter, pixelDiff == 0);
+}
+
+DEF_TEST(BuilderIssue3838_3, reporter) {
+    SkPath path;
+    path.moveTo(40, 10);
+    path.lineTo(60, 10);
+    path.lineTo(60, 30);
+    path.lineTo(40, 30);
+    path.lineTo(40, 10);
+    path.moveTo(41, 11);
+    path.lineTo(41, 29);
+    path.lineTo(59, 29);
+    path.lineTo(59, 11);
+    path.lineTo(41, 11);
+
+    SkOpBuilder builder;
+    builder.add(path, kUnion_SkPathOp);
+    SkPath result;
+    builder.resolve(&result);
+    int pixelDiff = comparePaths(reporter, __FUNCTION__, path, result);
     REPORTER_ASSERT(reporter, pixelDiff == 0);
 }