2bec26a716
This fix is a tradeoff. It changes intersection to treat a case where one coincident run is intersected at one point and the other edge is not as continuing to be a span. The old code tried to treat this as a single point. The old code is probably right, but this change alone made the data structures inconsistent. Later, extending the coincident runs would fail by incorrectly discarding the single point intersection. As a result, this fixes the security test and one other, but makes a different test fail. Isolating the failure uncovered a reduced case that fails with and without the change, so there are more serious problems here. Those problems are addressed in a separate CL. Many of the test edits below remove ill-thought out debugging messaging that fire off global state, which isn't usable in a multi-threaded test environment. In the end, with this fix, all existing tests (modulo one new failure and one new non-failure) pass in debug and in the extended release test suites. TBR=reed@google.com BUG=614248 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2018513003 Review-Url: https://codereview.chromium.org/2018513003
67 lines
2.9 KiB
C
67 lines
2.9 KiB
C
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#ifndef PathOpsExtendedTest_DEFINED
|
|
#define PathOpsExtendedTest_DEFINED
|
|
|
|
#include "SkBitmap.h"
|
|
#include "SkCommandLineFlags.h"
|
|
#include "SkPath.h"
|
|
#include "SkPathOpsTypes.h"
|
|
#include "SkStream.h"
|
|
#include "Test.h"
|
|
|
|
DECLARE_bool(runFail);
|
|
DECLARE_bool(runBinary);
|
|
|
|
struct PathOpsThreadState;
|
|
|
|
struct TestDesc {
|
|
void (*fun)(skiatest::Reporter*, const char* filename);
|
|
const char* str;
|
|
};
|
|
|
|
//extern int comparePaths(const SkPath& one, const SkPath& two);
|
|
extern int comparePaths(skiatest::Reporter* reporter, const char* filename,
|
|
const SkPath& one, const SkPath& two, SkBitmap& bitmap);
|
|
|
|
inline int comparePaths(skiatest::Reporter* reporter, const char* filename,
|
|
const SkPath& one, const SkPath& two) {
|
|
SkBitmap bitmap;
|
|
return comparePaths(reporter, filename, one, two, bitmap);
|
|
}
|
|
|
|
extern bool drawAsciiPaths(const SkPath& one, const SkPath& two, bool drawPaths);
|
|
extern void showOp(const SkPathOp op);
|
|
extern bool testPathOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
|
|
const SkPathOp , const char* testName);
|
|
extern bool testPathOpCheck(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
|
|
const SkPathOp , const char* testName, bool checkFail);
|
|
extern bool testPathOpFailCheck(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
|
|
const SkPathOp , const char* testName);
|
|
extern bool testPathFailOp(skiatest::Reporter* reporter, const SkPath& a, const SkPath& b,
|
|
const SkPathOp , const char* testName);
|
|
extern bool testSimplify(SkPath& path, bool useXor, SkPath& out, PathOpsThreadState& state,
|
|
const char* pathStr);
|
|
extern bool testSimplify(skiatest::Reporter* reporter, const SkPath& path, const char* filename);
|
|
extern bool testSimplifyCheck(skiatest::Reporter* reporter, const SkPath& path,
|
|
const char* filename, bool checkFail);
|
|
|
|
void initializeTests(skiatest::Reporter* reporter, const char* testName);
|
|
void outputProgress(char* ramStr, const char* pathStr, SkPath::FillType );
|
|
void outputProgress(char* ramStr, const char* pathStr, SkPathOp op);
|
|
|
|
void RunTestSet(skiatest::Reporter* reporter, TestDesc tests[], size_t count,
|
|
void (*firstTest)(skiatest::Reporter* , const char* filename),
|
|
void (*skipTest)(skiatest::Reporter* , const char* filename),
|
|
void (*stopTest)(skiatest::Reporter* , const char* filename), bool reverse);
|
|
void ShowTestName(PathOpsThreadState* data, int a, int b, int c, int d);
|
|
void ShowFunctionHeader(const char* name);
|
|
void ShowPath(const SkPath& path, const char* pathName);
|
|
void ShowOp(SkPathOp op, const char* pathOne, const char* pathTwo);
|
|
|
|
#endif
|