diff options
author | schenney@chromium.org <schenney@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-01-04 00:18:53 +0000 |
---|---|---|
committer | schenney@chromium.org <schenney@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-01-04 00:18:53 +0000 |
commit | 0b71f6cedd57de177b8368c48dfaab14feda9677 (patch) | |
tree | f8799ba9bd21bc2503f8de2c69ec56e79f4dc75f /gm/quadpaths.cpp | |
parent | df28f077b05bcd7ad4415b7ec29631a221b0f3fa (diff) |
Removing path drawing gm tests that produce either an entirely
filled or entirely empty clip area. Requested but not reviewed by
reed@google.com.
TEST=Covered now by unit testing.
git-svn-id: http://skia.googlecode.com/svn/trunk@2956 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/quadpaths.cpp')
-rw-r--r-- | gm/quadpaths.cpp | 293 |
1 files changed, 1 insertions, 292 deletions
diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp index 1ae9e15097..f8b172bc6c 100644 --- a/gm/quadpaths.cpp +++ b/gm/quadpaths.cpp @@ -11,291 +11,6 @@ namespace skiagm { -class ZeroQuadPathGM : public GM { -public: - ZeroQuadPathGM() {} - -protected: - SkString onShortName() { - return SkString("zeroquadpath"); - } - - SkISize onISize() { return make_isize(1240, 390); } - - 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(); - } - - 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(50*SK_Scalar1, 15*SK_Scalar1); - path.fPath.quadTo(50*SK_Scalar1, 15*SK_Scalar1, - 50*SK_Scalar1, 15*SK_Scalar1); - path.fName = "moveTo-zeroquad"; - - SkPaint titlePaint; - titlePaint.setColor(SK_ColorBLACK); - titlePaint.setAntiAlias(true); - titlePaint.setLCDRenderText(true); - titlePaint.setTextSize(15 * SK_Scalar1); - const char title[] = "Zero-Length Quad 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); - } - - 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); - - SkPaint rectPaint; - rectPaint.setColor(SK_ColorBLACK); - rectPaint.setStyle(SkPaint::kStroke_Style); - rectPaint.setStrokeWidth(-1); - rectPaint.setAntiAlias(true); - canvas->drawRect(rect, rectPaint); - - 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(); - } - -private: - typedef GM INHERITED; -}; - -class ZeroQuadClosePathGM : public GM { -public: - ZeroQuadClosePathGM() {} - -protected: - SkString onShortName() { - return SkString("zeroquadclosepath"); - } - - SkISize onISize() { return make_isize(1240, 390); } - - 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(); - } - - 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(50*SK_Scalar1, 15*SK_Scalar1); - path.fPath.quadTo(50*SK_Scalar1, 15*SK_Scalar1, - 50*SK_Scalar1, 15*SK_Scalar1); - path.fPath.close(); - path.fName = "moveTo-zeroquad-close"; - - SkPaint titlePaint; - titlePaint.setColor(SK_ColorBLACK); - titlePaint.setAntiAlias(true); - titlePaint.setLCDRenderText(true); - titlePaint.setTextSize(15 * SK_Scalar1); - const char title[] = "Zero-Length Quad 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); - } - - 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); - - SkPaint rectPaint; - rectPaint.setColor(SK_ColorBLACK); - rectPaint.setStyle(SkPaint::kStroke_Style); - rectPaint.setStrokeWidth(-1); - rectPaint.setAntiAlias(true); - canvas->drawRect(rect, rectPaint); - - 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(); - } - -private: - typedef GM INHERITED; -}; - class QuadPathGM : public GM { public: QuadPathGM() {} @@ -583,16 +298,10 @@ private: ////////////////////////////////////////////////////////////////////////////// -static GM* ZeroQuadPathFactory(void*) { return new ZeroQuadPathGM; } -static GMRegistry regZeroQuadPath(ZeroQuadPathFactory); - -static GM* ZeroQuadClosePathFactory(void*) { return new ZeroQuadClosePathGM; } -static GMRegistry regZeroQuadClosePath(ZeroQuadClosePathFactory); - static GM* QuadPathFactory(void*) { return new QuadPathGM; } static GMRegistry regQuadPath(QuadPathFactory); static GM* QuadClosePathFactory(void*) { return new QuadClosePathGM; } static GMRegistry regQuadClosePath(QuadClosePathFactory); -}
\ No newline at end of file +} |