AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dump path fill type with data

Browse Source 
SkPath::dump() and SkPath::dumpHex() dump the fill type
in addition to the data so that the original path can
be faithfully reconstructed.

This may be a small part of why some error cases
aren't reproduced.

R=reed@google.com
BUG=skia:6041

Change-Id: Ice86bf08ea907a6b87ceef182a9316a3c979af0b
Reviewed-on: https://skia-review.googlesource.com/6185
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
This commit is contained in:
Cary Clark 2016-12-16 11:32:54 -05:00 committed by Skia Commit-Bot
parent d2a5e30678
commit 9f67f044dd
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/SkPath.cpp
View File

@ -2147,11 +2147,15 @@ void SkPath::dump(SkWStream* wStream, bool forceClose, bool dumpAsHex) const {
SkPoint pts[4];
Verb verb;
if (!wStream) {
SkDebugf("path: forceClose=%s\n", forceClose ? "true" : "false");
}
SkString builder;
char const * const gFillTypeStrs[] = {
"Winding",
"EvenOdd",
"InverseWinding",
"InverseEvenOdd",
};
builder.printf("path.setFillType(SkPath::k%s_FillType);\n",
gFillTypeStrs[(int) this->getFillType()]);
while ((verb = iter.next(pts, false)) != kDone_Verb) {
switch (verb) {
case kMove_Verb:

27
tests/PathTest.cpp
View File

@ -4184,41 +4184,52 @@ static void compare_dump(skiatest::Reporter* reporter, const SkPath& path, bool
static void test_dump(skiatest::Reporter* reporter) {
SkPath p;
compare_dump(reporter, p, false, false, "");
compare_dump(reporter, p, true, false, "");
compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kWinding_FillType);\n");
compare_dump(reporter, p, true, false, "path.setFillType(SkPath::kWinding_FillType);\n");
p.moveTo(1, 2);
p.lineTo(3, 4);
compare_dump(reporter, p, false, false, "path.moveTo(1, 2);\n"
compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kWinding_FillType);\n"
"path.moveTo(1, 2);\n"
"path.lineTo(3, 4);\n");
compare_dump(reporter, p, true, false, "path.moveTo(1, 2);\n"
compare_dump(reporter, p, true, false, "path.setFillType(SkPath::kWinding_FillType);\n"
"path.moveTo(1, 2);\n"
"path.lineTo(3, 4);\n"
"path.lineTo(1, 2);\n"
"path.close();\n");
p.reset();
p.setFillType(SkPath::kEvenOdd_FillType);
p.moveTo(1, 2);
p.quadTo(3, 4, 5, 6);
compare_dump(reporter, p, false, false, "path.moveTo(1, 2);\n"
compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kEvenOdd_FillType);\n"
"path.moveTo(1, 2);\n"
"path.quadTo(3, 4, 5, 6);\n");
p.reset();
p.setFillType(SkPath::kInverseWinding_FillType);
p.moveTo(1, 2);
p.conicTo(3, 4, 5, 6, 0.5f);
compare_dump(reporter, p, false, false, "path.moveTo(1, 2);\n"
compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kInverseWinding_FillType);\n"
"path.moveTo(1, 2);\n"
"path.conicTo(3, 4, 5, 6, 0.5f);\n");
p.reset();
p.setFillType(SkPath::kInverseEvenOdd_FillType);
p.moveTo(1, 2);
p.cubicTo(3, 4, 5, 6, 7, 8);
compare_dump(reporter, p, false, false, "path.moveTo(1, 2);\n"
compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kInverseEvenOdd_FillType);\n"
"path.moveTo(1, 2);\n"
"path.cubicTo(3, 4, 5, 6, 7, 8);\n");
p.reset();
p.setFillType(SkPath::kWinding_FillType);
p.moveTo(1, 2);
p.lineTo(3, 4);
compare_dump(reporter, p, false, true,
"path.setFillType(SkPath::kWinding_FillType);\n"
"path.moveTo(SkBits2Float(0x3f800000), SkBits2Float(0x40000000)); // 1, 2\n"
"path.lineTo(SkBits2Float(0x40400000), SkBits2Float(0x40800000)); // 3, 4\n");
p.reset();
p.moveTo(SkBits2Float(0x3f800000), SkBits2Float(0x40000000));
p.lineTo(SkBits2Float(0x40400000), SkBits2Float(0x40800000));
compare_dump(reporter, p, false, false, "path.moveTo(1, 2);\n"
compare_dump(reporter, p, false, false, "path.setFillType(SkPath::kWinding_FillType);\n"
"path.moveTo(1, 2);\n"
"path.lineTo(3, 4);\n");
}