AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
c100d48e42
skia2/gm/pathfill.cpp
Cary Clark dbc59ba23b path is rect track corners 
This was triggered by an exploit that started the first
edge well outside the final rectangle, causing the captured
to exceed the correct result.

Ivan observes that we really only want the first and third
corners to compute the bounds, so remove the tracking code
that looks for a valid range of points, and record the
corners instead.

R=robertphillips@google.com
Bug: 824145,skia:7792
Change-Id: If228573d0f05c7158dba8142c144d13834e691ec
Reviewed-on: https://skia-review.googlesource.com/122081
Commit-Queue: Cary Clark <caryclark@skia.org>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Auto-Submit: Cary Clark <caryclark@skia.org>
2018-04-19 12:11:34 +00:00

614 lines
17 KiB
C++
Raw Blame History

/*
* 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 "SkPath.h"
typedef SkScalar (*MakePathProc)(SkPath*);
static SkScalar make_frame(SkPath* path) {
SkRect r = { SkIntToScalar(10), SkIntToScalar(10),
SkIntToScalar(630), SkIntToScalar(470) };
path->addRoundRect(r, SkIntToScalar(15), SkIntToScalar(15));
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(SkIntToScalar(5));
paint.getFillPath(*path, path);
return SkIntToScalar(15);
}
static SkScalar make_triangle(SkPath* path) {
constexpr int gCoord[] = {
10, 20, 15, 5, 30, 30
};
path->moveTo(SkIntToScalar(gCoord[0]), SkIntToScalar(gCoord[1]));
path->lineTo(SkIntToScalar(gCoord[2]), SkIntToScalar(gCoord[3]));
path->lineTo(SkIntToScalar(gCoord[4]), SkIntToScalar(gCoord[5]));
path->close();
path->offset(SkIntToScalar(10), SkIntToScalar(0));
return SkIntToScalar(30);
}
static SkScalar make_rect(SkPath* path) {
SkRect r = { SkIntToScalar(10), SkIntToScalar(10),
SkIntToScalar(30), SkIntToScalar(30) };
path->addRect(r);
path->offset(SkIntToScalar(10), SkIntToScalar(0));
return SkIntToScalar(30);
}
static SkScalar make_oval(SkPath* path) {
SkRect r = { SkIntToScalar(10), SkIntToScalar(10),
SkIntToScalar(30), SkIntToScalar(30) };
path->addOval(r);
path->offset(SkIntToScalar(10), SkIntToScalar(0));
return SkIntToScalar(30);
}
static SkScalar make_sawtooth(SkPath* path, int teeth) {
SkScalar x = SkIntToScalar(20);
SkScalar y = SkIntToScalar(20);
const SkScalar x0 = x;
const SkScalar dx = SkIntToScalar(5);
const SkScalar dy = SkIntToScalar(10);
path->moveTo(x, y);
for (int i = 0; i < teeth; i++) {
x += dx;
path->lineTo(x, y - dy);
x += dx;
path->lineTo(x, y + dy);
}
path->lineTo(x, y + (2 * dy));
path->lineTo(x0, y + (2 * dy));
path->close();
return SkIntToScalar(30);
}
static SkScalar make_sawtooth_3(SkPath* path) { return make_sawtooth(path, 3); }
static SkScalar make_sawtooth_32(SkPath* path) { return make_sawtooth(path, 32); }
static SkScalar make_house(SkPath* path) {
path->moveTo(21, 23);
path->lineTo(21, 11.534f);
path->lineTo(22.327f, 12.741f);
path->lineTo(23.673f, 11.261f);
path->lineTo(12, 0.648f);
path->lineTo(8, 4.285f);
path->lineTo(8, 2);
path->lineTo(4, 2);
path->lineTo(4, 7.921f);
path->lineTo(0.327f, 11.26f);
path->lineTo(1.673f, 12.74f);
path->lineTo(3, 11.534f);
path->lineTo(3, 23);
path->lineTo(11, 23);
path->lineTo(11, 18);
path->lineTo(13, 18);
path->lineTo(13, 23);
path->lineTo(21, 23);
path->close();
path->lineTo(9, 16);
path->lineTo(9, 21);
path->lineTo(5, 21);
path->lineTo(5, 9.715f);
path->lineTo(12, 3.351f);
path->lineTo(19, 9.715f);
path->lineTo(19, 21);
path->lineTo(15, 21);
path->lineTo(15, 16);
path->lineTo(9, 16);
path->close();
path->offset(20, 0);
return SkIntToScalar(30);
}
static SkScalar make_star(SkPath* path, int n) {
const SkScalar c = SkIntToScalar(45);
const SkScalar r = SkIntToScalar(20);
SkScalar rad = -SK_ScalarPI / 2;
const SkScalar drad = (n >> 1) * SK_ScalarPI * 2 / n;
path->moveTo(c, c - r);
for (int i = 1; i < n; i++) {
rad += drad;
SkScalar cosV, sinV = SkScalarSinCos(rad, &cosV);
path->lineTo(c + cosV * r, c + sinV * r);
}
path->close();
return r * 2 * 6 / 5;
}
static SkScalar make_star_5(SkPath* path) { return make_star(path, 5); }
static SkScalar make_star_13(SkPath* path) { return make_star(path, 13); }
// We don't expect any output from this path.
static SkScalar make_line(SkPath* path) {
path->moveTo(SkIntToScalar(30), SkIntToScalar(30));
path->lineTo(SkIntToScalar(120), SkIntToScalar(40));
path->close();
path->moveTo(SkIntToScalar(150), SkIntToScalar(30));
path->lineTo(SkIntToScalar(150), SkIntToScalar(30));
path->lineTo(SkIntToScalar(300), SkIntToScalar(40));
path->close();
return SkIntToScalar(40);
}
static void make_info(SkPath* path) {
path->moveTo(24, 4);
path->cubicTo(12.94999980926514f,
4,
4,
12.94999980926514f,
4,
24);
path->cubicTo(4,
35.04999923706055f,
12.94999980926514f,
44,
24,
44);
path->cubicTo(35.04999923706055f,
44,
44,
35.04999923706055f,
44,
24);
path->cubicTo(44,
12.95000076293945f,
35.04999923706055f,
4,
24,
4);
path->close();
path->moveTo(26, 34);
path->lineTo(22, 34);
path->lineTo(22, 22);
path->lineTo(26, 22);
path->lineTo(26, 34);
path->close();
path->moveTo(26, 18);
path->lineTo(22, 18);
path->lineTo(22, 14);
path->lineTo(26, 14);
path->lineTo(26, 18);
path->close();
}
static void make_accessibility(SkPath* path) {
path->moveTo(12, 2);
path->cubicTo(13.10000038146973f,
2,
14,
2.900000095367432f,
14,
4);
path->cubicTo(14,
5.099999904632568f,
13.10000038146973f,
6,
12,
6);
path->cubicTo(10.89999961853027f,
6,
10,
5.099999904632568f,
10,
4);
path->cubicTo(10,
2.900000095367432f,
10.89999961853027f,
2,
12,
2);
path->close();
path->moveTo(21, 9);
path->lineTo(15, 9);
path->lineTo(15, 22);
path->lineTo(13, 22);
path->lineTo(13, 16);
path->lineTo(11, 16);
path->lineTo(11, 22);
path->lineTo(9, 22);
path->lineTo(9, 9);
path->lineTo(3, 9);
path->lineTo(3, 7);
path->lineTo(21, 7);
path->lineTo(21, 9);
path->close();
}
// test case for http://crbug.com/695196
static void make_visualizer(SkPath* path) {
path->moveTo(1.9520f, 2.0000f);
path->conicTo(1.5573f, 1.9992f, 1.2782f, 2.2782f, 0.9235f);
path->conicTo(0.9992f, 2.5573f, 1.0000f, 2.9520f, 0.9235f);
path->lineTo(1.0000f, 5.4300f);
path->lineTo(17.0000f, 5.4300f);
path->lineTo(17.0000f, 2.9520f);
path->conicTo(17.0008f, 2.5573f, 16.7218f, 2.2782f, 0.9235f);
path->conicTo(16.4427f, 1.9992f, 16.0480f, 2.0000f, 0.9235f);
path->lineTo(1.9520f, 2.0000f);
path->close();
path->moveTo(2.7140f, 3.1430f);
path->conicTo(3.0547f, 3.1287f, 3.2292f, 3.4216f, 0.8590f);
path->conicTo(3.4038f, 3.7145f, 3.2292f, 4.0074f, 0.8590f);
path->conicTo(3.0547f, 4.3003f, 2.7140f, 4.2860f, 0.8590f);
path->conicTo(2.1659f, 4.2631f, 2.1659f, 3.7145f, 0.7217f);
path->conicTo(2.1659f, 3.1659f, 2.7140f, 3.1430f, 0.7217f);
path->lineTo(2.7140f, 3.1430f);
path->close();
path->moveTo(5.0000f, 3.1430f);
path->conicTo(5.3407f, 3.1287f, 5.5152f, 3.4216f, 0.8590f);
path->conicTo(5.6898f, 3.7145f, 5.5152f, 4.0074f, 0.8590f);
path->conicTo(5.3407f, 4.3003f, 5.0000f, 4.2860f, 0.8590f);
path->conicTo(4.4519f, 4.2631f, 4.4519f, 3.7145f, 0.7217f);
path->conicTo(4.4519f, 3.1659f, 5.0000f, 3.1430f, 0.7217f);
path->lineTo(5.0000f, 3.1430f);
path->close();
path->moveTo(7.2860f, 3.1430f);
path->conicTo(7.6267f, 3.1287f, 7.8012f, 3.4216f, 0.8590f);
path->conicTo(7.9758f, 3.7145f, 7.8012f, 4.0074f, 0.8590f);
path->conicTo(7.6267f, 4.3003f, 7.2860f, 4.2860f, 0.8590f);
path->conicTo(6.7379f, 4.2631f, 6.7379f, 3.7145f, 0.7217f);
path->conicTo(6.7379f, 3.1659f, 7.2860f, 3.1430f, 0.7217f);
path->close();
path->moveTo(1.0000f, 6.1900f);
path->lineTo(1.0000f, 14.3810f);
path->conicTo(0.9992f, 14.7757f, 1.2782f, 15.0548f, 0.9235f);
path->conicTo(1.5573f, 15.3338f, 1.9520f, 15.3330f, 0.9235f);
path->lineTo(16.0480f, 15.3330f);
path->conicTo(16.4427f, 15.3338f, 16.7218f, 15.0548f, 0.9235f);
path->conicTo(17.0008f, 14.7757f, 17.0000f, 14.3810f, 0.9235f);
path->lineTo(17.0000f, 6.1910f);
path->lineTo(1.0000f, 6.1910f);
path->lineTo(1.0000f, 6.1900f);
path->close();
}
constexpr MakePathProc gProcs[] = {
make_frame,
make_triangle,
make_rect,
make_oval,
make_sawtooth_32,
make_star_5,
make_star_13,
make_line,
make_house,
make_sawtooth_3,
};
#define N SK_ARRAY_COUNT(gProcs)
class PathFillGM : public skiagm::GM {
SkPath fPath[N];
SkScalar fDY[N];
SkPath fInfoPath;
SkPath fAccessibilityPath;
SkPath fVisualizerPath;
protected:
void onOnceBeforeDraw() override {
for (size_t i = 0; i < N; i++) {
fDY[i] = gProcs[i](&fPath[i]);
}
make_info(&fInfoPath);
make_accessibility(&fAccessibilityPath);
make_visualizer(&fVisualizerPath);
}
SkString onShortName() override {
return SkString("pathfill");
}
SkISize onISize() override {
return SkISize::Make(640, 480);
}
void onDraw(SkCanvas* canvas) override {
SkPaint paint;
paint.setAntiAlias(true);
for (size_t i = 0; i < N; i++) {
canvas->drawPath(fPath[i], paint);
canvas->translate(SkIntToScalar(0), fDY[i]);
}
canvas->save();
canvas->scale(0.300000011920929f, 0.300000011920929f);
canvas->translate(50, 50);
canvas->drawPath(fInfoPath, paint);
canvas->restore();
canvas->scale(2, 2);
canvas->translate(5, 15);
canvas->drawPath(fAccessibilityPath, paint);
canvas->scale(0.5f, 0.5f);
canvas->translate(5, 50);
canvas->drawPath(fVisualizerPath, paint);
}
private:
typedef skiagm::GM INHERITED;
};
// test inverse-fill w/ a clip that completely excludes the geometry
class PathInverseFillGM : public skiagm::GM {
SkPath fPath[N];
SkScalar fDY[N];
protected:
void onOnceBeforeDraw() override {
for (size_t i = 0; i < N; i++) {
fDY[i] = gProcs[i](&fPath[i]);
}
}
SkString onShortName() override {
return SkString("pathinvfill");
}
SkISize onISize() override {
return SkISize::Make(450, 220);
}
static void show(SkCanvas* canvas, const SkPath& path, const SkPaint& paint,
const SkRect* clip, SkScalar top, const SkScalar bottom) {
canvas->save();
if (clip) {
SkRect r = *clip;
r.fTop = top;
r.fBottom = bottom;
canvas->clipRect(r);
}
canvas->drawPath(path, paint);
canvas->restore();
}
void onDraw(SkCanvas* canvas) override {
SkPath path;
path.addCircle(SkIntToScalar(50), SkIntToScalar(50), SkIntToScalar(40));
path.toggleInverseFillType();
SkRect clipR = { 0, 0, SkIntToScalar(100), SkIntToScalar(200) };
canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
for (int doclip = 0; doclip <= 1; ++doclip) {
for (int aa = 0; aa <= 1; ++aa) {
SkPaint paint;
paint.setAntiAlias(SkToBool(aa));
canvas->save();
canvas->clipRect(clipR);
const SkRect* clipPtr = doclip ? &clipR : nullptr;
show(canvas, path, paint, clipPtr, clipR.fTop, clipR.centerY());
show(canvas, path, paint, clipPtr, clipR.centerY(), clipR.fBottom);
canvas->restore();
canvas->translate(SkIntToScalar(110), 0);
}
}
}
private:
typedef skiagm::GM INHERITED;
};
DEF_SIMPLE_GM(rotatedcubicpath, canvas, 200, 200) {
SkPaint p;
p.setAntiAlias(true);
p.setStyle(SkPaint::kFill_Style);
canvas->translate(50, 50);
SkPath path;
path.moveTo(48,-23);
path.cubicTo(48,-29.5, 6,-30, 6,-30);
path.cubicTo(6,-30, 2,0, 2,0);
path.cubicTo(2,0, 44,-21.5, 48,-23);
path.close();
p.setColor(SK_ColorBLUE);
canvas->drawPath(path, p);
// Rotated path, which is not antialiased on GPU
p.setColor(SK_ColorRED);
canvas->rotate(90);
canvas->drawPath(path, p);
}
///////////////////////////////////////////////////////////////////////////////
DEF_GM( return new PathFillGM; )
DEF_GM( return new PathInverseFillGM; )
DEF_SIMPLE_GM(bug7792, canvas, 800, 800) {
// from skbug.com/7792 bug description
SkPaint p;
SkPath path;
path.moveTo(10, 10);
path.moveTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
canvas->drawPath(path, p);
// from skbug.com/7792#c3
canvas->translate(200, 0);
path.reset();
path.moveTo(75, 50);
path.moveTo(100, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.lineTo(75, 50);
path.close();
canvas->drawPath(path, p);
// from skbug.com/7792#c9
canvas->translate(200, 0);
path.reset();
path.moveTo(10, 10);
path.moveTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.close();
canvas->drawPath(path, p);
// from skbug.com/7792#c11
canvas->translate(-200 * 2, 200);
path.reset();
path.moveTo(75, 150);
path.lineTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.moveTo(75, 150);
canvas->drawPath(path, p);
// from skbug.com/7792#c14
canvas->translate(200, 0);
path.reset();
path.moveTo(250, 75);
path.moveTo(250, 75);
path.moveTo(250, 75);
path.moveTo(100, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.lineTo(75, 75);
path.close();
path.lineTo(0, 0);
path.close();
canvas->drawPath(path, p);
// from skbug.com/7792#c15
canvas->translate(200, 0);
path.reset();
path.moveTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.moveTo(250, 75);
canvas->drawPath(path, p);
// from skbug.com/7792#c17
canvas->translate(-200 * 2, 200);
path.reset();
path.moveTo(75, 10);
path.moveTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.lineTo(75, 10);
path.close();
canvas->drawPath(path, p);
// from skbug.com/7792#c19
canvas->translate(200, 0);
path.reset();
path.moveTo(75, 75);
path.lineTo(75, 75);
path.lineTo(75, 75);
path.lineTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.close();
path.moveTo(10, 10);
path.lineTo(30, 10);
path.lineTo(10, 30);
canvas->drawPath(path, p);
// from skbug.com/7792#c23
canvas->translate(200, 0);
path.reset();
path.moveTo(75, 75);
path.lineTo(75, 75);
path.moveTo(75, 75);
path.lineTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.close();
canvas->drawPath(path, p);
// from skbug.com/7792#c29
canvas->translate(-200 * 2, 200);
path.reset();
path.moveTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.lineTo(75, 250);
path.moveTo(75, 75);
path.close();
canvas->drawPath(path, p);
// from skbug.com/7792#c31
canvas->translate(200, 0);
path.reset();
path.moveTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.lineTo(75, 10);
path.moveTo(75, 75);
path.close();
canvas->drawPath(path, p);
// from skbug.com/7792#c36
canvas->translate(200, 0);
path.reset();
path.moveTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(10, 150);
path.moveTo(75, 75);
path.lineTo(75, 75);
canvas->drawPath(path, p);
// from skbug.com/7792#c39
canvas->translate(200, -200 * 3);
path.reset();
path.moveTo(150, 75);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.lineTo(75, 100);
canvas->drawPath(path, p);
// from zero_length_paths_aa
canvas->translate(0, 200);
path.reset();
path.moveTo(150, 100);
path.lineTo(150, 100);
path.lineTo(150, 150);
path.lineTo(75, 150);
path.lineTo(75, 100);
path.lineTo(75, 75);
path.lineTo(150, 75);
path.close();
canvas->drawPath(path, p);
// from skbug.com/7792#c41
canvas->translate(0, 200);
path.reset();
path.moveTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(140, 150);
path.lineTo(140, 75);
path.moveTo(75, 75);
path.close();
canvas->drawPath(path, p);
// from skbug.com/7792#c53
canvas->translate(0, 200);
path.reset();
path.moveTo(75, 75);
path.lineTo(150, 75);
path.lineTo(150, 150);
path.lineTo(140, 150);
path.lineTo(140, 75);
path.moveTo(75, 75);
path.close();
canvas->drawPath(path, p);
}
Reference in New Issue View Git Blame Copy Permalink