diff options
author | 2014-06-20 11:33:59 -0700 | |
---|---|---|
committer | 2014-06-20 11:33:59 -0700 | |
commit | bbf3e8982d9e6846196f73068bb83db849654f12 (patch) | |
tree | 24514d2921b0adaf3feebd3f082b41ce0823d01f /gm/circularclips.cpp | |
parent | 9ac68ee2594f28dfc1bd16a4bf004b1a4f6f228d (diff) |
optimize circularclips to act as a bench, fix null-check bug in etcbench
BUG=skia:
R=krajcevski@google.com, rmistry@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/345183003
Diffstat (limited to 'gm/circularclips.cpp')
-rw-r--r-- | gm/circularclips.cpp | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/gm/circularclips.cpp b/gm/circularclips.cpp index 07b59f0a83..4730182252 100644 --- a/gm/circularclips.cpp +++ b/gm/circularclips.cpp @@ -9,15 +9,24 @@ #include "SkCanvas.h" #include "SkPath.h" -namespace skiagm { +class CircularClipsGM : public skiagm::GM { + SkScalar fX1, fX2, fY, fR; + SkPath fCircle1, fCircle2; -class CircularClipsGM : public GM { public: - CircularClipsGM() {} + CircularClipsGM() { + fX1 = 80; + fX2 = 120; + fY = 50; + fR = 40; + + fCircle1.addCircle(fX1, fY, fR, SkPath::kCW_Direction); + fCircle2.addCircle(fX2, fY, fR, SkPath::kCW_Direction); + } protected: virtual uint32_t onGetFlags() const SK_OVERRIDE { - return kSkipTiled_Flag; + return kSkipTiled_Flag | kAsBench_Flag; } virtual SkString onShortName() { @@ -38,45 +47,37 @@ protected: SkRegion::kReplace_Op, }; - SkScalar x1 = 80, x2 = 120; - SkScalar y = 50; - SkScalar r = 40; - - SkPath circle1, circle2; - circle1.addCircle(x1, y, r, SkPath::kCW_Direction); - circle2.addCircle(x2, y, r, SkPath::kCW_Direction); - SkRect rect = SkRect::MakeLTRB(x1 - r, y - r, x2 + r, y + r); + SkRect rect = SkRect::MakeLTRB(fX1 - fR, fY - fR, fX2 + fR, fY + fR); SkPaint fillPaint; for (size_t i = 0; i < 4; i++) { - circle1.toggleInverseFillType(); + fCircle1.toggleInverseFillType(); if (i % 2 == 0) { - circle2.toggleInverseFillType(); + fCircle2.toggleInverseFillType(); } canvas->save(); for (size_t op = 0; op < SK_ARRAY_COUNT(ops); op++) { canvas->save(); - canvas->clipPath(circle1, SkRegion::kReplace_Op); - canvas->clipPath(circle2, ops[op]); + canvas->clipPath(fCircle1, SkRegion::kReplace_Op); + canvas->clipPath(fCircle2, ops[op]); canvas->drawRect(rect, fillPaint); canvas->restore(); - canvas->translate(0, 2 * y); + canvas->translate(0, 2 * fY); } canvas->restore(); - canvas->translate(x1 + x2, 0); + canvas->translate(fX1 + fX2, 0); } } private: - typedef GM INHERITED; + typedef skiagm::GM INHERITED; }; ////////////////////////////////////////////////////////////////////////////// DEF_GM( return new CircularClipsGM; ) -} |