aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar caryclark <caryclark@google.com>2015-09-09 09:34:22 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-09-09 09:34:22 -0700
commit5ca4fa3846067a47e88d35ace895df3ebe3ec2a5 (patch)
treeba745ddb320f96a452ff6a9984d9559ad2632acf /tests
parent6c59d80858f453a426df9b07fdf3a8cc01e0b906 (diff)
Revert of more zero-length changes for svg compatibility (patchset #6 id:100001 of https://codereview.chromium.org/1330623003/ )
Reason for revert: breaks DEPS Original issue's description: > more zero-length changes for svg compatibility > > If a path contains a moveTo followed by a line or curve, > even if the line or curve has no length, SVG expects > the end caps to draw if the cap style is round or square. > > Fredrik Söderquist attached a patch to the chrome bug > (slightly modified here) that fixes layout test failures > resulting from deleting special-case code in SVG > dealing with zero-length path segments. > > R=reed@google.com,fs@opera.com > BUG=22974 > > Committed: https://skia.googlesource.com/skia/+/62fb1ba1786863e545c89839b5706ad5151cec15 TBR=fs@opera.com,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=22974 Review URL: https://codereview.chromium.org/1334543002
Diffstat (limited to 'tests')
-rw-r--r--tests/EmptyPathTest.cpp19
1 files changed, 2 insertions, 17 deletions
diff --git a/tests/EmptyPathTest.cpp b/tests/EmptyPathTest.cpp
index 060ef8d237..c4f011a0dc 100644
--- a/tests/EmptyPathTest.cpp
+++ b/tests/EmptyPathTest.cpp
@@ -54,13 +54,7 @@ static void drawAndTest(skiatest::Reporter* reporter, const SkPath& path,
}
}
-enum DrawCaps {
- kDontDrawCaps,
- kDrawCaps
-};
-
-static void iter_paint(skiatest::Reporter* reporter, const SkPath& path, bool shouldDraw,
- DrawCaps drawCaps) {
+static void iter_paint(skiatest::Reporter* reporter, const SkPath& path, bool shouldDraw) {
static const SkPaint::Cap gCaps[] = {
SkPaint::kButt_Cap,
SkPaint::kRound_Cap,
@@ -79,11 +73,6 @@ static void iter_paint(skiatest::Reporter* reporter, const SkPath& path, bool sh
for (size_t cap = 0; cap < SK_ARRAY_COUNT(gCaps); ++cap) {
for (size_t join = 0; join < SK_ARRAY_COUNT(gJoins); ++join) {
for (size_t style = 0; style < SK_ARRAY_COUNT(gStyles); ++style) {
- if (drawCaps && SkPaint::kButt_Cap != gCaps[cap]
- && SkPaint::kFill_Style != gStyles[style]) {
- continue;
- }
-
SkPaint paint;
paint.setStrokeWidth(SkIntToScalar(10));
@@ -138,14 +127,10 @@ static void test_emptydrawing(skiatest::Reporter* reporter) {
if (doClose) {
path.close();
}
- /* zero length segments and close following moves draw round and square caps */
- bool allowCaps = make_L == gMakeProc[i] || make_Q == gMakeProc[i]
- || make_C == gMakeProc[i] || make_MZM == gMakeProc[i];
- allowCaps |= SkToBool(doClose);
for (size_t fill = 0; fill < SK_ARRAY_COUNT(gFills); ++fill) {
path.setFillType(gFills[fill]);
bool shouldDraw = path.isInverseFillType();
- iter_paint(reporter, path, shouldDraw, allowCaps ? kDrawCaps : kDontDrawCaps);
+ iter_paint(reporter, path, shouldDraw);
}
}
}