diff options
author | caryclark <caryclark@google.com> | 2015-09-09 09:34:22 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-09 09:34:22 -0700 |
commit | 5ca4fa3846067a47e88d35ace895df3ebe3ec2a5 (patch) | |
tree | ba745ddb320f96a452ff6a9984d9559ad2632acf | |
parent | 6c59d80858f453a426df9b07fdf3a8cc01e0b906 (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
-rw-r--r-- | gm/strokes.cpp | 10 | ||||
-rw-r--r-- | src/core/SkCanvas.cpp | 2 | ||||
-rw-r--r-- | src/core/SkStroke.cpp | 12 | ||||
-rw-r--r-- | tests/EmptyPathTest.cpp | 19 |
4 files changed, 3 insertions, 40 deletions
diff --git a/gm/strokes.cpp b/gm/strokes.cpp index e74d35f800..57517a0616 100644 --- a/gm/strokes.cpp +++ b/gm/strokes.cpp @@ -84,16 +84,12 @@ private: */ class ZeroLenStrokesGM : public skiagm::GM { SkPath fMoveHfPath, fMoveZfPath, fDashedfPath, fRefPath[4]; - SkPath fCubicPath, fQuadPath, fLinePath; protected: void onOnceBeforeDraw() override { SkAssertResult(SkParsePath::FromSVGString("M0,0h0M10,0h0M20,0h0", &fMoveHfPath)); SkAssertResult(SkParsePath::FromSVGString("M0,0zM10,0zM20,0z", &fMoveZfPath)); SkAssertResult(SkParsePath::FromSVGString("M0,0h25", &fDashedfPath)); - SkAssertResult(SkParsePath::FromSVGString("M 0 0 C 0 0 0 0 0 0", &fCubicPath)); - SkAssertResult(SkParsePath::FromSVGString("M 0 0 Q 0 0 0 0", &fQuadPath)); - SkAssertResult(SkParsePath::FromSVGString("M 0 0 L 0 0", &fLinePath)); for (int i = 0; i < 3; ++i) { fRefPath[0].addCircle(i * 10.f, 0, 5); @@ -144,12 +140,6 @@ protected: canvas->translate(0, 30); fillPaint.setAlpha(127); canvas->drawPath(fRefPath[1 + i * 2], fillPaint); - canvas->translate(0, 30); - canvas->drawPath(fCubicPath, strokePaint); - canvas->translate(0, 30); - canvas->drawPath(fQuadPath, strokePaint); - canvas->translate(0, 30); - canvas->drawPath(fLinePath, strokePaint); canvas->restore(); } } diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 3a289566cb..7043ec3bc3 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -2124,8 +2124,8 @@ void SkCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { if (r.width() <= 0 && r.height() <= 0) { if (path.isInverseFillType()) { this->internalDrawPaint(paint); - return; } + return; } LOOPER_BEGIN(paint, SkDrawFilter::kPath_Type, bounds) diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp index 522a000712..1689f9730b 100644 --- a/src/core/SkStroke.cpp +++ b/src/core/SkStroke.cpp @@ -619,10 +619,6 @@ void SkPathStroker::conicTo(const SkPoint& pt1, const SkPoint& pt2, SkScalar wei SkPoint reduction; ReductionType reductionType = CheckConicLinear(conic, &reduction); if (kPoint_ReductionType == reductionType) { - /* If the stroke consists of a moveTo followed by a degenerate curve, treat it - as if it were followed by a zero-length line. Lines without length - can have square and round end caps. */ - this->lineTo(pt2); return; } if (kLine_ReductionType == reductionType) { @@ -657,10 +653,6 @@ void SkPathStroker::quadTo(const SkPoint& pt1, const SkPoint& pt2) { SkPoint reduction; ReductionType reductionType = CheckQuadLinear(quad, &reduction); if (kPoint_ReductionType == reductionType) { - /* If the stroke consists of a moveTo followed by a degenerate curve, treat it - as if it were followed by a zero-length line. Lines without length - can have square and round end caps. */ - this->lineTo(pt2); return; } if (kLine_ReductionType == reductionType) { @@ -1176,10 +1168,6 @@ void SkPathStroker::cubicTo(const SkPoint& pt1, const SkPoint& pt2, const SkPoint* tangentPt; ReductionType reductionType = CheckCubicLinear(cubic, reduction, &tangentPt); if (kPoint_ReductionType == reductionType) { - /* If the stroke consists of a moveTo followed by a degenerate curve, treat it - as if it were followed by a zero-length line. Lines without length - can have square and round end caps. */ - this->lineTo(pt3); return; } if (kLine_ReductionType == reductionType) { 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); } } } |