Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright 2011 Google Inc.
|
|
|
|
|
*
|
|
|
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
|
|
|
* found in the LICENSE file.
|
|
|
|
|
*/
|
|
|
|
|
#include "gm.h"
|
|
|
|
|
#include "SkCanvas.h"
|
|
|
|
|
#include "SkPaint.h"
|
|
|
|
|
#include "SkRandom.h"
|
|
|
|
|
|
2013-05-23 19:30:48 +00:00
|
|
|
// skbug.com/1316 shows that this cubic, when slightly clipped, creates big
|
|
|
|
|
// (incorrect) changes to its control points.
|
|
|
|
|
class ClippedCubicGM : public skiagm::GM {
|
|
|
|
|
public:
|
|
|
|
|
ClippedCubicGM() {}
|
2013-05-24 07:01:26 +00:00
|
|
|
|
2013-05-23 19:30:48 +00:00
|
|
|
protected:
|
|
|
|
|
SkString onShortName() {
|
2013-05-23 19:39:15 +00:00
|
|
|
return SkString("clippedcubic");
|
2013-05-23 19:30:48 +00:00
|
|
|
}
|
2013-05-24 07:01:26 +00:00
|
|
|
|
2013-05-23 19:30:48 +00:00
|
|
|
SkISize onISize() { return SkISize::Make(1240, 390); }
|
2013-05-24 07:01:26 +00:00
|
|
|
|
2013-05-23 19:30:48 +00:00
|
|
|
virtual void onDraw(SkCanvas* canvas) {
|
|
|
|
|
SkPath path;
|
|
|
|
|
path.moveTo(0, 0);
|
|
|
|
|
path.cubicTo(140, 150, 40, 10, 170, 150);
|
2013-05-24 07:01:26 +00:00
|
|
|
|
2013-05-23 19:30:48 +00:00
|
|
|
SkPaint paint;
|
|
|
|
|
SkRect bounds = path.getBounds();
|
2013-05-24 07:01:26 +00:00
|
|
|
|
2013-05-23 19:47:05 +00:00
|
|
|
for (SkScalar dy = -1; dy <= 1; dy += 1) {
|
2013-05-23 19:30:48 +00:00
|
|
|
canvas->save();
|
2013-05-23 19:47:05 +00:00
|
|
|
for (SkScalar dx = -1; dx <= 1; dx += 1) {
|
2013-05-23 19:30:48 +00:00
|
|
|
canvas->save();
|
|
|
|
|
canvas->clipRect(bounds);
|
|
|
|
|
canvas->translate(dx, dy);
|
|
|
|
|
canvas->drawPath(path, paint);
|
|
|
|
|
canvas->restore();
|
2013-05-24 07:01:26 +00:00
|
|
|
|
2013-05-23 19:30:48 +00:00
|
|
|
canvas->translate(bounds.width(), 0);
|
|
|
|
|
}
|
|
|
|
|
canvas->restore();
|
|
|
|
|
canvas->translate(0, bounds.height());
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-05-24 07:01:26 +00:00
|
|
|
|
2013-05-23 19:30:48 +00:00
|
|
|
private:
|
|
|
|
|
typedef skiagm::GM INHERITED;
|
|
|
|
|
};
|
|
|
|
|
|
2013-03-08 18:44:01 +00:00
|
|
|
class CubicPathGM : public skiagm::GM {
|
2011-12-20 21:48:14 +00:00
|
|
|
public:
|
|
|
|
|
CubicPathGM() {}
|
|
|
|
|
|
|
|
|
|
protected:
|
|
|
|
|
SkString onShortName() {
|
|
|
|
|
return SkString("cubicpath");
|
|
|
|
|
}
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2013-03-08 18:44:01 +00:00
|
|
|
SkISize onISize() { return SkISize::Make(1240, 390); }
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
|
|
|
|
|
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
|
|
|
|
|
SkPaint::Style style, SkPath::FillType fill,
|
|
|
|
|
SkScalar strokeWidth) {
|
|
|
|
|
path.setFillType(fill);
|
|
|
|
|
SkPaint paint;
|
|
|
|
|
paint.setStrokeCap(cap);
|
|
|
|
|
paint.setStrokeWidth(strokeWidth);
|
|
|
|
|
paint.setStrokeJoin(join);
|
|
|
|
|
paint.setColor(color);
|
|
|
|
|
paint.setStyle(style);
|
|
|
|
|
canvas->save();
|
|
|
|
|
canvas->clipRect(clip);
|
|
|
|
|
canvas->drawPath(path, paint);
|
|
|
|
|
canvas->restore();
|
|
|
|
|
}
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
virtual void onDraw(SkCanvas* canvas) {
|
|
|
|
|
struct FillAndName {
|
|
|
|
|
SkPath::FillType fFill;
|
|
|
|
|
const char* fName;
|
|
|
|
|
};
|
|
|
|
|
static const FillAndName gFills[] = {
|
|
|
|
|
{SkPath::kWinding_FillType, "Winding"},
|
|
|
|
|
{SkPath::kEvenOdd_FillType, "Even / Odd"},
|
|
|
|
|
{SkPath::kInverseWinding_FillType, "Inverse Winding"},
|
|
|
|
|
{SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
|
|
|
|
|
};
|
|
|
|
|
struct StyleAndName {
|
|
|
|
|
SkPaint::Style fStyle;
|
|
|
|
|
const char* fName;
|
|
|
|
|
};
|
|
|
|
|
static const StyleAndName gStyles[] = {
|
|
|
|
|
{SkPaint::kFill_Style, "Fill"},
|
|
|
|
|
{SkPaint::kStroke_Style, "Stroke"},
|
|
|
|
|
{SkPaint::kStrokeAndFill_Style, "Stroke And Fill"},
|
|
|
|
|
};
|
|
|
|
|
struct CapAndName {
|
|
|
|
|
SkPaint::Cap fCap;
|
|
|
|
|
SkPaint::Join fJoin;
|
|
|
|
|
const char* fName;
|
|
|
|
|
};
|
|
|
|
|
static const CapAndName gCaps[] = {
|
|
|
|
|
{SkPaint::kButt_Cap, SkPaint::kBevel_Join, "Butt"},
|
|
|
|
|
{SkPaint::kRound_Cap, SkPaint::kRound_Join, "Round"},
|
|
|
|
|
{SkPaint::kSquare_Cap, SkPaint::kBevel_Join, "Square"}
|
|
|
|
|
};
|
|
|
|
|
struct PathAndName {
|
|
|
|
|
SkPath fPath;
|
|
|
|
|
const char* fName;
|
|
|
|
|
};
|
|
|
|
|
PathAndName path;
|
|
|
|
|
path.fPath.moveTo(25*SK_Scalar1, 10*SK_Scalar1);
|
|
|
|
|
path.fPath.cubicTo(40*SK_Scalar1, 20*SK_Scalar1,
|
|
|
|
|
60*SK_Scalar1, 20*SK_Scalar1,
|
|
|
|
|
75*SK_Scalar1, 10*SK_Scalar1);
|
|
|
|
|
path.fName = "moveTo-cubic";
|
|
|
|
|
|
|
|
|
|
SkPaint titlePaint;
|
|
|
|
|
titlePaint.setColor(SK_ColorBLACK);
|
|
|
|
|
titlePaint.setAntiAlias(true);
|
|
|
|
|
titlePaint.setLCDRenderText(true);
|
|
|
|
|
titlePaint.setTextSize(15 * SK_Scalar1);
|
|
|
|
|
const char title[] = "Cubic Drawn Into Rectangle Clips With "
|
|
|
|
|
"Indicated Style, Fill and Linecaps, with stroke width 10";
|
|
|
|
|
canvas->drawText(title, strlen(title),
|
|
|
|
|
20 * SK_Scalar1,
|
|
|
|
|
20 * SK_Scalar1,
|
|
|
|
|
titlePaint);
|
|
|
|
|
|
|
|
|
|
SkRandom rand;
|
|
|
|
|
SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
|
|
|
|
|
canvas->save();
|
|
|
|
|
canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
|
|
|
|
|
canvas->save();
|
|
|
|
|
for (size_t cap = 0; cap < SK_ARRAY_COUNT(gCaps); ++cap) {
|
|
|
|
|
if (0 < cap) {
|
|
|
|
|
canvas->translate((rect.width() + 40 * SK_Scalar1) * SK_ARRAY_COUNT(gStyles), 0);
|
|
|
|
|
}
|
|
|
|
|
canvas->save();
|
|
|
|
|
for (size_t fill = 0; fill < SK_ARRAY_COUNT(gFills); ++fill) {
|
|
|
|
|
if (0 < fill) {
|
|
|
|
|
canvas->translate(0, rect.height() + 40 * SK_Scalar1);
|
|
|
|
|
}
|
|
|
|
|
canvas->save();
|
|
|
|
|
for (size_t style = 0; style < SK_ARRAY_COUNT(gStyles); ++style) {
|
|
|
|
|
if (0 < style) {
|
|
|
|
|
canvas->translate(rect.width() + 40 * SK_Scalar1, 0);
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
}
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
SkColor color = 0xff007000;
|
|
|
|
|
this->drawPath(path.fPath, canvas, color, rect,
|
|
|
|
|
gCaps[cap].fCap, gCaps[cap].fJoin, gStyles[style].fStyle,
|
|
|
|
|
gFills[fill].fFill, SK_Scalar1*10);
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
SkPaint rectPaint;
|
|
|
|
|
rectPaint.setColor(SK_ColorBLACK);
|
|
|
|
|
rectPaint.setStyle(SkPaint::kStroke_Style);
|
|
|
|
|
rectPaint.setStrokeWidth(-1);
|
|
|
|
|
rectPaint.setAntiAlias(true);
|
|
|
|
|
canvas->drawRect(rect, rectPaint);
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
SkPaint labelPaint;
|
|
|
|
|
labelPaint.setColor(color);
|
|
|
|
|
labelPaint.setAntiAlias(true);
|
|
|
|
|
labelPaint.setLCDRenderText(true);
|
|
|
|
|
labelPaint.setTextSize(10 * SK_Scalar1);
|
|
|
|
|
canvas->drawText(gStyles[style].fName,
|
|
|
|
|
strlen(gStyles[style].fName),
|
|
|
|
|
0, rect.height() + 12 * SK_Scalar1,
|
|
|
|
|
labelPaint);
|
|
|
|
|
canvas->drawText(gFills[fill].fName,
|
|
|
|
|
strlen(gFills[fill].fName),
|
|
|
|
|
0, rect.height() + 24 * SK_Scalar1,
|
|
|
|
|
labelPaint);
|
|
|
|
|
canvas->drawText(gCaps[cap].fName,
|
|
|
|
|
strlen(gCaps[cap].fName),
|
|
|
|
|
0, rect.height() + 36 * SK_Scalar1,
|
|
|
|
|
labelPaint);
|
|
|
|
|
}
|
|
|
|
|
canvas->restore();
|
|
|
|
|
}
|
|
|
|
|
canvas->restore();
|
|
|
|
|
}
|
|
|
|
|
canvas->restore();
|
|
|
|
|
canvas->restore();
|
|
|
|
|
}
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
private:
|
2013-03-08 18:44:01 +00:00
|
|
|
typedef skiagm::GM INHERITED;
|
2011-12-20 21:48:14 +00:00
|
|
|
};
|
|
|
|
|
|
2013-03-08 18:44:01 +00:00
|
|
|
class CubicClosePathGM : public skiagm::GM {
|
2011-12-20 21:48:14 +00:00
|
|
|
public:
|
|
|
|
|
CubicClosePathGM() {}
|
|
|
|
|
|
|
|
|
|
protected:
|
|
|
|
|
SkString onShortName() {
|
|
|
|
|
return SkString("cubicclosepath");
|
|
|
|
|
}
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2013-03-08 18:44:01 +00:00
|
|
|
SkISize onISize() { return SkISize::Make(1240, 390); }
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
|
|
|
|
|
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
|
|
|
|
|
SkPaint::Style style, SkPath::FillType fill,
|
|
|
|
|
SkScalar strokeWidth) {
|
|
|
|
|
path.setFillType(fill);
|
|
|
|
|
SkPaint paint;
|
|
|
|
|
paint.setStrokeCap(cap);
|
|
|
|
|
paint.setStrokeWidth(strokeWidth);
|
|
|
|
|
paint.setStrokeJoin(join);
|
|
|
|
|
paint.setColor(color);
|
|
|
|
|
paint.setStyle(style);
|
|
|
|
|
canvas->save();
|
|
|
|
|
canvas->clipRect(clip);
|
|
|
|
|
canvas->drawPath(path, paint);
|
|
|
|
|
canvas->restore();
|
|
|
|
|
}
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
virtual void onDraw(SkCanvas* canvas) {
|
|
|
|
|
struct FillAndName {
|
|
|
|
|
SkPath::FillType fFill;
|
|
|
|
|
const char* fName;
|
|
|
|
|
};
|
|
|
|
|
static const FillAndName gFills[] = {
|
|
|
|
|
{SkPath::kWinding_FillType, "Winding"},
|
|
|
|
|
{SkPath::kEvenOdd_FillType, "Even / Odd"},
|
|
|
|
|
{SkPath::kInverseWinding_FillType, "Inverse Winding"},
|
|
|
|
|
{SkPath::kInverseEvenOdd_FillType, "Inverse Even / Odd"},
|
|
|
|
|
};
|
|
|
|
|
struct StyleAndName {
|
|
|
|
|
SkPaint::Style fStyle;
|
|
|
|
|
const char* fName;
|
|
|
|
|
};
|
|
|
|
|
static const StyleAndName gStyles[] = {
|
|
|
|
|
{SkPaint::kFill_Style, "Fill"},
|
|
|
|
|
{SkPaint::kStroke_Style, "Stroke"},
|
|
|
|
|
{SkPaint::kStrokeAndFill_Style, "Stroke And Fill"},
|
|
|
|
|
};
|
|
|
|
|
struct CapAndName {
|
|
|
|
|
SkPaint::Cap fCap;
|
|
|
|
|
SkPaint::Join fJoin;
|
|
|
|
|
const char* fName;
|
|
|
|
|
};
|
|
|
|
|
static const CapAndName gCaps[] = {
|
|
|
|
|
{SkPaint::kButt_Cap, SkPaint::kBevel_Join, "Butt"},
|
|
|
|
|
{SkPaint::kRound_Cap, SkPaint::kRound_Join, "Round"},
|
|
|
|
|
{SkPaint::kSquare_Cap, SkPaint::kBevel_Join, "Square"}
|
|
|
|
|
};
|
|
|
|
|
struct PathAndName {
|
|
|
|
|
SkPath fPath;
|
|
|
|
|
const char* fName;
|
|
|
|
|
};
|
|
|
|
|
PathAndName path;
|
|
|
|
|
path.fPath.moveTo(25*SK_Scalar1, 10*SK_Scalar1);
|
|
|
|
|
path.fPath.cubicTo(40*SK_Scalar1, 20*SK_Scalar1,
|
|
|
|
|
60*SK_Scalar1, 20*SK_Scalar1,
|
|
|
|
|
75*SK_Scalar1, 10*SK_Scalar1);
|
|
|
|
|
path.fPath.close();
|
|
|
|
|
path.fName = "moveTo-cubic-close";
|
|
|
|
|
|
|
|
|
|
SkPaint titlePaint;
|
|
|
|
|
titlePaint.setColor(SK_ColorBLACK);
|
|
|
|
|
titlePaint.setAntiAlias(true);
|
|
|
|
|
titlePaint.setLCDRenderText(true);
|
|
|
|
|
titlePaint.setTextSize(15 * SK_Scalar1);
|
|
|
|
|
const char title[] = "Cubic Closed Drawn Into Rectangle Clips With "
|
|
|
|
|
"Indicated Style, Fill and Linecaps, with stroke width 10";
|
|
|
|
|
canvas->drawText(title, strlen(title),
|
|
|
|
|
20 * SK_Scalar1,
|
|
|
|
|
20 * SK_Scalar1,
|
|
|
|
|
titlePaint);
|
|
|
|
|
|
|
|
|
|
SkRandom rand;
|
|
|
|
|
SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
|
|
|
|
|
canvas->save();
|
|
|
|
|
canvas->translate(10 * SK_Scalar1, 30 * SK_Scalar1);
|
|
|
|
|
canvas->save();
|
|
|
|
|
for (size_t cap = 0; cap < SK_ARRAY_COUNT(gCaps); ++cap) {
|
|
|
|
|
if (0 < cap) {
|
|
|
|
|
canvas->translate((rect.width() + 40 * SK_Scalar1) * SK_ARRAY_COUNT(gStyles), 0);
|
|
|
|
|
}
|
|
|
|
|
canvas->save();
|
|
|
|
|
for (size_t fill = 0; fill < SK_ARRAY_COUNT(gFills); ++fill) {
|
|
|
|
|
if (0 < fill) {
|
|
|
|
|
canvas->translate(0, rect.height() + 40 * SK_Scalar1);
|
|
|
|
|
}
|
|
|
|
|
canvas->save();
|
|
|
|
|
for (size_t style = 0; style < SK_ARRAY_COUNT(gStyles); ++style) {
|
|
|
|
|
if (0 < style) {
|
|
|
|
|
canvas->translate(rect.width() + 40 * SK_Scalar1, 0);
|
|
|
|
|
}
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
SkColor color = 0xff007000;
|
|
|
|
|
this->drawPath(path.fPath, canvas, color, rect,
|
|
|
|
|
gCaps[cap].fCap, gCaps[cap].fJoin, gStyles[style].fStyle,
|
|
|
|
|
gFills[fill].fFill, SK_Scalar1*10);
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
SkPaint rectPaint;
|
|
|
|
|
rectPaint.setColor(SK_ColorBLACK);
|
|
|
|
|
rectPaint.setStyle(SkPaint::kStroke_Style);
|
|
|
|
|
rectPaint.setStrokeWidth(-1);
|
|
|
|
|
rectPaint.setAntiAlias(true);
|
|
|
|
|
canvas->drawRect(rect, rectPaint);
|
2012-08-23 18:14:13 +00:00
|
|
|
|
2011-12-20 21:48:14 +00:00
|
|
|
SkPaint labelPaint;
|
|
|
|
|
labelPaint.setColor(color);
|
|
|
|
|
labelPaint.setAntiAlias(true);
|
|
|
|
|
labelPaint.setLCDRenderText(true);
|
|
|
|
|
labelPaint.setTextSize(10 * SK_Scalar1);
|
|
|
|
|
canvas->drawText(gStyles[style].fName,
|
|
|
|
|
strlen(gStyles[style].fName),
|
|
|
|
|
0, rect.height() + 12 * SK_Scalar1,
|
|
|
|
|
labelPaint);
|
|
|
|
|
canvas->drawText(gFills[fill].fName,
|
|
|
|
|
strlen(gFills[fill].fName),
|
|
|
|
|
0, rect.height() + 24 * SK_Scalar1,
|
|
|
|
|
labelPaint);
|
|
|
|
|
canvas->drawText(gCaps[cap].fName,
|
|
|
|
|
strlen(gCaps[cap].fName),
|
|
|
|
|
0, rect.height() + 36 * SK_Scalar1,
|
|
|
|
|
labelPaint);
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
}
|
|
|
|
|
canvas->restore();
|
|
|
|
|
}
|
|
|
|
|
canvas->restore();
|
|
|
|
|
}
|
|
|
|
|
canvas->restore();
|
|
|
|
|
canvas->restore();
|
|
|
|
|
}
|
2012-08-23 18:14:13 +00:00
|
|
|
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
private:
|
2013-03-08 18:44:01 +00:00
|
|
|
typedef skiagm::GM INHERITED;
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
2013-03-08 18:44:01 +00:00
|
|
|
DEF_GM( return new CubicPathGM; )
|
|
|
|
|
DEF_GM( return new CubicClosePathGM; )
|
2013-05-23 19:30:48 +00:00
|
|
|
DEF_GM( return new ClippedCubicGM; )
|
