diff options
| author |  caryclark <caryclark@google.com> | 2015-09-09 13:20:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-09 13:20:49 -0700 |
| commit | 6651a3238dd6affa4276ada42ab613abf1d42d1d (patch) | |
| tree | add6859c39d7ec8091b4d23ab18e900f7fef2137 /gm/strokes.cpp | |
| parent | 809e5afdd95962465a51e3dbab707abf9d594fab (diff) | |
Reland of more zero-length changes for svg compatibility (patchset #1 id:1 of https://codereview.chromium.org/1334543002/ )
Reason for revert:
DEPS should be fixed now
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/5ca4fa3846067a47e88d35ace895df3ebe3ec2a5
TBR=fs@opera.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=22974
Review URL: https://codereview.chromium.org/1314833004
Diffstat (limited to 'gm/strokes.cpp')
| -rw-r--r-- | gm/strokes.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gm/strokes.cpp b/gm/strokes.cpp index 57517a0616..e74d35f800 100644 --- a/gm/strokes.cpp +++ b/gm/strokes.cpp @@ -84,12 +84,16 @@ 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); @@ -140,6 +144,12 @@ 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(); } } |