c0bd9f9fe5
Current strategy: everything from the top
Things to look at first are the manual changes:
- added tools/rewrite_includes.py
- removed -Idirectives from BUILD.gn
- various compile.sh simplifications
- tweak tools/embed_resources.py
- update gn/find_headers.py to write paths from the top
- update gn/gn_to_bp.py SkUserConfig.h layout
so that #include "include/config/SkUserConfig.h" always
gets the header we want.
No-Presubmit: true
Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
364 lines
17 KiB
C++
364 lines
17 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "include/core/SkBitmap.h"
|
|
#include "tests/PathOpsExtendedTest.h"
|
|
#include "tests/PathOpsTestCommon.h"
|
|
#include "tests/Test.h"
|
|
|
|
DEF_TEST(PathOpsBuilder, reporter) {
|
|
SkOpBuilder builder;
|
|
SkPath result;
|
|
REPORTER_ASSERT(reporter, builder.resolve(&result));
|
|
REPORTER_ASSERT(reporter, result.isEmpty());
|
|
|
|
builder.add(result, kDifference_SkPathOp);
|
|
REPORTER_ASSERT(reporter, builder.resolve(&result));
|
|
REPORTER_ASSERT(reporter, result.isEmpty());
|
|
|
|
builder.add(result, kUnion_SkPathOp);
|
|
REPORTER_ASSERT(reporter, builder.resolve(&result));
|
|
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_SkPathOp);
|
|
REPORTER_ASSERT(reporter, builder.resolve(&result));
|
|
bool closed;
|
|
SkPath::Direction dir;
|
|
REPORTER_ASSERT(reporter, result.isRect(nullptr, &closed, &dir));
|
|
REPORTER_ASSERT(reporter, closed);
|
|
REPORTER_ASSERT(reporter, dir == SkPath::kCCW_Direction);
|
|
int pixelDiff = comparePaths(reporter, __FUNCTION__, rectPath, result);
|
|
REPORTER_ASSERT(reporter, pixelDiff == 0);
|
|
|
|
rectPath.reset();
|
|
rectPath.setFillType(SkPath::kEvenOdd_FillType);
|
|
rectPath.addRect(0, 1, 2, 3, SkPath::kCCW_Direction);
|
|
builder.add(rectPath, kUnion_SkPathOp);
|
|
REPORTER_ASSERT(reporter, builder.resolve(&result));
|
|
REPORTER_ASSERT(reporter, result.isRect(nullptr, &closed, &dir));
|
|
REPORTER_ASSERT(reporter, closed);
|
|
REPORTER_ASSERT(reporter, dir == SkPath::kCCW_Direction);
|
|
REPORTER_ASSERT(reporter, rectPath == result);
|
|
|
|
builder.add(rectPath, kDifference_SkPathOp);
|
|
REPORTER_ASSERT(reporter, builder.resolve(&result));
|
|
REPORTER_ASSERT(reporter, result.isEmpty());
|
|
|
|
SkPath rect2, rect3;
|
|
rect2.addRect(2, 1, 4, 3, SkPath::kCW_Direction);
|
|
rect3.addRect(4, 1, 5, 3, SkPath::kCCW_Direction);
|
|
builder.add(rectPath, kUnion_SkPathOp);
|
|
builder.add(rect2, kUnion_SkPathOp);
|
|
builder.add(rect3, kUnion_SkPathOp);
|
|
REPORTER_ASSERT(reporter, builder.resolve(&result));
|
|
REPORTER_ASSERT(reporter, result.isRect(nullptr, &closed, &dir));
|
|
REPORTER_ASSERT(reporter, closed);
|
|
SkRect expected;
|
|
expected.set(0, 1, 5, 3);
|
|
REPORTER_ASSERT(reporter, result.getBounds() == expected);
|
|
|
|
SkPath circle1, circle2, circle3;
|
|
circle1.addCircle(5, 6, 4, SkPath::kCW_Direction);
|
|
circle2.addCircle(7, 4, 8, SkPath::kCCW_Direction);
|
|
circle3.addCircle(6, 5, 6, SkPath::kCW_Direction);
|
|
SkPath opCompare;
|
|
Op(circle1, circle2, kUnion_SkPathOp, &opCompare);
|
|
Op(opCompare, circle3, kDifference_SkPathOp, &opCompare);
|
|
builder.add(circle1, kUnion_SkPathOp);
|
|
builder.add(circle2, kUnion_SkPathOp);
|
|
builder.add(circle3, kDifference_SkPathOp);
|
|
REPORTER_ASSERT(reporter, builder.resolve(&result));
|
|
pixelDiff = comparePaths(reporter, __FUNCTION__, opCompare, result);
|
|
REPORTER_ASSERT(reporter, pixelDiff == 0);
|
|
}
|
|
|
|
DEF_TEST(BuilderIssue3838, reporter) {
|
|
SkPath path;
|
|
path.moveTo(200, 170);
|
|
path.lineTo(220, 170);
|
|
path.lineTo(220, 230);
|
|
path.lineTo(240, 230);
|
|
path.lineTo(240, 210);
|
|
path.lineTo(180, 210);
|
|
path.lineTo(180, 190);
|
|
path.lineTo(260, 190);
|
|
path.lineTo(260, 250);
|
|
path.lineTo(200, 250);
|
|
path.lineTo(200, 170);
|
|
path.close();
|
|
SkPath path2;
|
|
SkOpBuilder builder;
|
|
builder.add(path, kUnion_SkPathOp);
|
|
builder.resolve(&path2);
|
|
int pixelDiff = comparePaths(reporter, __FUNCTION__, path, path2);
|
|
REPORTER_ASSERT(reporter, pixelDiff == 0);
|
|
}
|
|
|
|
DEF_TEST(BuilderIssue3838_2, reporter) {
|
|
SkPath path;
|
|
path.addCircle(100, 100, 50);
|
|
|
|
SkOpBuilder builder;
|
|
builder.add(path, kUnion_SkPathOp);
|
|
builder.add(path, kUnion_SkPathOp);
|
|
|
|
SkPath result;
|
|
builder.resolve(&result);
|
|
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);
|
|
}
|
|
|
|
DEF_TEST(BuilderIssue502792_2, reporter) {
|
|
SkPath path, pathB;
|
|
path.setFillType(SkPath::kWinding_FillType);
|
|
path.addRect(0, 0, 1, 1, SkPath::kCW_Direction);
|
|
path.addRect(2, 2, 3, 3, SkPath::kCW_Direction);
|
|
pathB.setFillType(SkPath::kEvenOdd_FillType);
|
|
pathB.addRect(3, 3, 4, 4, SkPath::kCW_Direction);
|
|
pathB.addRect(3, 3, 4, 4, SkPath::kCW_Direction);
|
|
SkOpBuilder builder;
|
|
builder.add(path, kUnion_SkPathOp);
|
|
builder.add(pathB, kDifference_SkPathOp);
|
|
SkPath result;
|
|
builder.resolve(&result);
|
|
}
|
|
|
|
DEF_TEST(Fuzz846, reporter) {
|
|
/*
|
|
<clipPath id="clip-circle">
|
|
<circle id="circle" cx="60" cy="60" r="50" />
|
|
</clipPath>
|
|
<clipPath id="clip-rect">
|
|
<clipPath id="clip-rect">
|
|
<clipPath id="clip-rect">
|
|
<clipPath id="clip-rect">
|
|
<rect x="10" y="30" width="0" height="60" />
|
|
<rect x="10" y="30" width="0" height="60" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="32668" />
|
|
<rect x="10" y="30" width="100" height="18446744073709551615" />
|
|
<rect x="10" y="255" width="100" height="60" />
|
|
<rect width="100" height="60" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="100" height="4294967236" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
</clipPath>
|
|
<rect x="10" y="30" width="0" height="60" />
|
|
<rect x="10" y="30" width="0" height="0.18093252719929986369568203" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="32668" height="60" />
|
|
<rect x="10" y="30" width="100" height="18446744073709551615" />
|
|
<rect x="10" y="255" width="100" height="60" />
|
|
<rect x="2147483649" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
</clipPath>
|
|
<rect x="10" y="30" width="0" height="60" />
|
|
<rect x="10" y="30" width="0" height="60" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="32668" height="60" />
|
|
<rect x="10" y="30" width="100" height="18446744073709551615" />
|
|
<rect x="10" y="255" width="100" height="60" />
|
|
<rect x="2147483649" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="10" y="2879753595" width="100" height="60" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
</clipPath>
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="0" height="60" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="32668" height="60" />
|
|
<rect x="10" y="30" width="100" height="18446744073709551615" />
|
|
<rect x="10" y="255" width="100" height="60" />
|
|
<rect x="2147483649" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="10" y="30" width="100" height="4294967236" />
|
|
<rect x="10" y="30" width="100" height="4294967236" />
|
|
<rect x="10" y="30" width="100" height="4294967236" />
|
|
<rect x="10" y="30" width="100" height="4294967236" />
|
|
<rect x="10" y="30" width="100" height="60" />
|
|
<rect x="757798030" y="30" width="100" height="60" />
|
|
*/
|
|
SkPath clipCircle, clipRect;
|
|
SkPath inner;
|
|
clipCircle.addCircle(60, 60, 50); // <circle id="circle" cx="60" cy="60" r="50" />
|
|
|
|
inner.addRect(10, 30, 10+0, 30+60); // <rect x="10" y="30" width="0" height="60" />
|
|
inner.addRect(10, 30, 10+0, 30+60); // <rect x="10" y="30" width="0" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+32668, 30+0); // <rect x="10" y="30" width="32668" />
|
|
inner.addRect(10, 30, 10+100, 30+18446744073709551615.f); // <rect x="10" y="30" width="100" height="18446744073709551615" />
|
|
inner.addRect(10, 255, 10+100, 255+60); // <rect x="10" y="255" width="100" height="60" />
|
|
inner.addRect(0, 0, 0+100, 0+60); // <rect width="100" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+4294967236.f); // <rect x="10" y="30" width="100" height="4294967236" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
clipRect.addPath(inner);
|
|
inner.reset();
|
|
inner.addRect(10, 30, 10+0, 30+60); // <rect x="10" y="30" width="0" height="60" />
|
|
inner.addRect(10, 30, 10+0, 30+0.18093252719929986369568203f); // <rect x="10" y="30" width="0" height="0.18093252719929986369568203" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+32668, 30+60); // <rect x="10" y="30" width="32668" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+18446744073709551615.f); // <rect x="10" y="30" width="100" height="18446744073709551615" />
|
|
inner.addRect(10, 255, 10+100, 255+60); // <rect x="10" y="255" width="100" height="60" />
|
|
inner.addRect(2147483649.f, 30, 2147483649.f+100, 30+60); // <rect x="2147483649" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
clipRect.addPath(inner);
|
|
inner.reset();
|
|
inner.addRect(10, 30, 10+0, 30+60); // <rect x="10" y="30" width="0" height="60" />
|
|
inner.addRect(10, 30, 10+0, 30+60); // <rect x="10" y="30" width="0" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+32668, 30+60); // <rect x="10" y="30" width="32668" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+18446744073709551615.f); // <rect x="10" y="30" width="100" height="18446744073709551615" />
|
|
inner.addRect(10, 255, 10+100, 255+60); // <rect x="10" y="255" width="100" height="60" />
|
|
inner.addRect(2147483649.f, 30, 2147483649.f+100, 30+60); // <rect x="2147483649" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(10, 2879753595.f, 10+100, 30+2879753595.f); // <rect x="10" y="2879753595" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
clipRect.addPath(inner);
|
|
inner.reset();
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+0, 30+60); // <rect x="10" y="30" width="0" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+32668, 30+60); // <rect x="10" y="30" width="32668" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+18446744073709551615.f); // <rect x="10" y="30" width="100" height="18446744073709551615" />
|
|
inner.addRect(10, 255, 10+100, 255+60); // <rect x="10" y="255" width="100" height="60" />
|
|
inner.addRect(2147483649.f, 30, 2147483649.f+100, 30+60); // <rect x="2147483649" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(10, 30, 10+100, 30+4294967236.f); // <rect x="10" y="30" width="100" height="4294967236" />
|
|
inner.addRect(10, 30, 10+100, 30+4294967236.f); // <rect x="10" y="30" width="100" height="4294967236" />
|
|
inner.addRect(10, 30, 10+100, 30+4294967236.f); // <rect x="10" y="30" width="100" height="4294967236" />
|
|
inner.addRect(10, 30, 10+100, 30+4294967236.f); // <rect x="10" y="30" width="100" height="4294967236" />
|
|
inner.addRect(10, 30, 10+100, 30+60); // <rect x="10" y="30" width="100" height="60" />
|
|
inner.addRect(757798030.f, 30, 757798030.f+100, 30+60); // <rect x="757798030" y="30" width="100" height="60" />
|
|
clipRect.addPath(inner);
|
|
|
|
SkOpBuilder builder;
|
|
builder.add(clipCircle, kUnion_SkPathOp);
|
|
builder.add(clipRect, kDifference_SkPathOp);
|
|
SkPath result;
|
|
builder.resolve(&result);
|
|
}
|
|
|
|
DEF_TEST(Issue569540, reporter) {
|
|
SkPath path1;
|
|
path1.moveTo(5, -225);
|
|
path1.lineTo(-225, 7425);
|
|
path1.lineTo(7425, 7425);
|
|
path1.lineTo(7425, -225);
|
|
path1.lineTo(-225, -225);
|
|
path1.lineTo(5, -225);
|
|
path1.close();
|
|
|
|
SkPath path2;
|
|
path2.moveTo(5940, 2790);
|
|
path2.lineTo(5940, 2160);
|
|
path2.lineTo(5970, 1980);
|
|
path2.lineTo(5688, 773669888);
|
|
path2.lineTo(5688, 2160);
|
|
path2.lineTo(5688, 2430);
|
|
path2.lineTo(5400, 4590);
|
|
path2.lineTo(5220, 4590);
|
|
path2.lineTo(5220, 4920);
|
|
path2.cubicTo(5182.22900390625f, 4948.328125f, 5160, 4992.78662109375f, 5160, 5040.00048828125f);
|
|
path2.lineTo(5940, 2790);
|
|
path2.close();
|
|
|
|
SkOpBuilder builder;
|
|
builder.add(path1, kUnion_SkPathOp);
|
|
builder.add(path2, kUnion_SkPathOp);
|
|
SkPath result;
|
|
builder.resolve(&result);
|
|
}
|
|
|
|
DEF_TEST(SkOpBuilderFuzz665, reporter) {
|
|
SkPath path;
|
|
path.setFillType(SkPath::kEvenOdd_FillType);
|
|
path.moveTo(SkBits2Float(0xcc4264a7), SkBits2Float(0x4bb12e50)); // -5.0959e+07f, 2.32235e+07f
|
|
path.lineTo(SkBits2Float(0xcc4264b0), SkBits2Float(0x4bb12e48)); // -5.0959e+07f, 2.32234e+07f
|
|
path.lineTo(SkBits2Float(0xcc4264a7), SkBits2Float(0x4bb12e50)); // -5.0959e+07f, 2.32235e+07f
|
|
path.close();
|
|
SkPath path1(path);
|
|
path.reset();
|
|
path.setFillType(SkPath::kWinding_FillType);
|
|
path.moveTo(SkBits2Float(0x43213333), SkBits2Float(0x43080000)); // 161.2f, 136
|
|
path.lineTo(SkBits2Float(0x43038000), SkBits2Float(0x43080000)); // 131.5f, 136
|
|
path.cubicTo(SkBits2Float(0x43038000), SkBits2Float(0x42f00000), SkBits2Float(0x42f16666), SkBits2Float(0x42d53333), SkBits2Float(0x42d3cccd), SkBits2Float(0x42cd6666)); // 131.5f, 120, 120.7f, 106.6f, 105.9f, 102.7f
|
|
path.lineTo(SkBits2Float(0x42e33333), SkBits2Float(0x42940000)); // 113.6f, 74
|
|
SkPath path2(path);
|
|
SkOpBuilder builder;
|
|
builder.add(path1, kUnion_SkPathOp);
|
|
builder.add(path2, kUnion_SkPathOp);
|
|
SkPath result;
|
|
builder.resolve(&result);
|
|
}
|
|
|
|
DEF_TEST(SkOpBuilder618991, reporter) {
|
|
SkPath path0;
|
|
path0.moveTo(140, 40);
|
|
path0.lineTo(200, 210);
|
|
path0.lineTo(40, 100);
|
|
path0.lineTo(2.22223e+07f, 2.22222e+14f);
|
|
path0.lineTo(2.22223e+07f, 2.22222e+14f);
|
|
|
|
SkPath path1;
|
|
path1.moveTo(160, 60);
|
|
path1.lineTo(220, 230);
|
|
path1.lineTo(60, 120);
|
|
path1.lineTo(2.22223e+07f, 2.22222e+14f);
|
|
path1.lineTo(2.22223e+07f, 2.22222e+14f);
|
|
|
|
SkOpBuilder builder;
|
|
builder.add(path0, SkPathOp::kUnion_SkPathOp);
|
|
builder.add(path1, SkPathOp::kUnion_SkPathOp);
|
|
builder.resolve(&path0);
|
|
}
|
|
|
|
DEF_TEST(SkOpBuilderKFuzz1, reporter) {
|
|
SkPath path;
|
|
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
|
|
path.lineTo(SkBits2Float(0x39008001), SkBits2Float(0xd31fbc1d)); // 0.000122547f, -6.86056e+11f
|
|
path.conicTo(SkBits2Float(0x246a205a), SkBits2Float(0x0080d3fb), SkBits2Float(0xce000001), SkBits2Float(0x04d31fbc), SkBits2Float(0x57a82c00)); // 5.07681e-17f, 1.1831e-38f, -5.36871e+08f, 4.9635e-36f, 3.69814e+14f
|
|
SkPath path0(path);
|
|
path.reset();
|
|
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
|
|
path.cubicTo(SkBits2Float(0x80d3f924), SkBits2Float(0xcecece4f), SkBits2Float(0xcececece), SkBits2Float(0xcececece), SkBits2Float(0x9a9a9ace), SkBits2Float(0x9a9a9a9a)); // -1.94667e-38f, -1.73481e+09f, -1.73483e+09f, -1.73483e+09f, -6.3943e-23f, -6.39427e-23f
|
|
path.moveTo(SkBits2Float(0x9a9a019a), SkBits2Float(0xa59a9a9a)); // -6.36955e-23f, -2.68195e-16f
|
|
SkPath path1(path);
|
|
SkOpBuilder builder;
|
|
builder.add(path0, SkPathOp::kUnion_SkPathOp);
|
|
builder.add(path1, SkPathOp::kUnion_SkPathOp);
|
|
builder.resolve(&path);
|
|
}
|