From 0dc4dd6dda9a7912f696b46d9c02155ec1d1ba5f Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 24 Mar 2015 13:55:33 -0700 Subject: Revert of pathops version two (patchset #16 id:150001 of https://codereview.chromium.org/1002693002/) Reason for revert: ASAN investigation Original issue's description: > pathops version two > > R=reed@google.com > > marked 'no commit' to attempt to get trybots to run > > TBR=reed@google.com > > Committed: https://skia.googlesource.com/skia/+/ccec0f958ffc71a9986d236bc2eb335cb2111119 TBR=caryclark@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1029993002 --- tests/PathOpsBuilderTest.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'tests/PathOpsBuilderTest.cpp') diff --git a/tests/PathOpsBuilderTest.cpp b/tests/PathOpsBuilderTest.cpp index 5fdeb3e2b9..1eadebc550 100644 --- a/tests/PathOpsBuilderTest.cpp +++ b/tests/PathOpsBuilderTest.cpp @@ -4,10 +4,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - -#include "PathOpsExtendedTest.h" #include "PathOpsTestCommon.h" -#include "SkBitmap.h" #include "Test.h" DEF_TEST(PathOpsBuilder, reporter) { @@ -25,7 +22,6 @@ DEF_TEST(PathOpsBuilder, reporter) { REPORTER_ASSERT(reporter, result.isEmpty()); SkPath rectPath; - rectPath.setFillType(SkPath::kEvenOdd_FillType); rectPath.addRect(0, 1, 2, 3, SkPath::kCW_Direction); builder.add(rectPath, kUnion_PathOp); REPORTER_ASSERT(reporter, builder.resolve(&result)); @@ -37,14 +33,13 @@ DEF_TEST(PathOpsBuilder, reporter) { REPORTER_ASSERT(reporter, rectPath == result); rectPath.reset(); - rectPath.setFillType(SkPath::kEvenOdd_FillType); rectPath.addRect(0, 1, 2, 3, SkPath::kCCW_Direction); builder.add(rectPath, kUnion_PathOp); REPORTER_ASSERT(reporter, builder.resolve(&result)); REPORTER_ASSERT(reporter, result.isRect(NULL, &closed, &dir)); REPORTER_ASSERT(reporter, closed); REPORTER_ASSERT(reporter, dir == SkPath::kCCW_Direction); - REPORTER_ASSERT(reporter, rectPath == result); + REPORTER_ASSERT(reporter, rectPath == result); builder.add(rectPath, kDifference_PathOp); REPORTER_ASSERT(reporter, builder.resolve(&result)); @@ -74,7 +69,5 @@ DEF_TEST(PathOpsBuilder, reporter) { builder.add(circle2, kUnion_PathOp); builder.add(circle3, kDifference_PathOp); REPORTER_ASSERT(reporter, builder.resolve(&result)); - SkBitmap bitmap; - int pixelDiff = comparePaths(reporter, __FUNCTION__, opCompare, result, bitmap); - REPORTER_ASSERT(reporter, pixelDiff == 0); + REPORTER_ASSERT(reporter, opCompare == result); } -- cgit v1.2.3