diff options
| author |  Mike Reed <reed@google.com> | 2016-12-08 16:06:37 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-08 21:45:27 +0000 |
| commit | 8e7432b7f98dd592e529a0c8bb038d73ebfb0478 (patch) | |
| tree | d3eb65dacc074a58eedfb0d430f969e2e3336774 /gm/windowrectangles.cpp | |
| parent | 6a4cdb6ba9ff5aa03186b7fa287f8e4d08be4578 (diff) | |
remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS
switch over to SkClipOps now that SK_SUPPORT_LEGACY_CLIP_REGIONOPS is gone
BUG=skia:
Change-Id: Ifdc8b3746d508348a40cc009a4e529a1cb3c405d
Reviewed-on: https://skia-review.googlesource.com/5714
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'gm/windowrectangles.cpp')
| -rw-r--r-- | gm/windowrectangles.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/windowrectangles.cpp b/gm/windowrectangles.cpp index 3949b3f41c..e277db626c 100644 --- a/gm/windowrectangles.cpp +++ b/gm/windowrectangles.cpp @@ -43,20 +43,20 @@ void WindowRectanglesBaseGM::onDraw(SkCanvas* canvas) { SkClipStack stack; stack.clipRect(SkRect::MakeXYWH(370.75, 80.25, 149, 100), SkMatrix::I(), - SkCanvas::kDifference_Op, false); + kDifference_SkClipOp, false); stack.clipRect(SkRect::MakeXYWH(80.25, 420.75, 150, 100), SkMatrix::I(), - SkCanvas::kDifference_Op, true); + kDifference_SkClipOp, true); stack.clipRRect(SkRRect::MakeRectXY(SkRect::MakeXYWH(200, 200, 200, 200), 60, 45), - SkMatrix::I(), SkCanvas::kDifference_Op, true); + SkMatrix::I(), kDifference_SkClipOp, true); SkRRect nine; nine.setNinePatch(SkRect::MakeXYWH(550 - 30.25 - 100, 370.75, 100, 150), 12, 35, 23, 20); - stack.clipRRect(nine, SkMatrix::I(), SkCanvas::kDifference_Op, true); + stack.clipRRect(nine, SkMatrix::I(), kDifference_SkClipOp, true); SkRRect complx; SkVector complxRadii[4] = {{6, 4}, {8, 12}, {16, 24}, {48, 32}}; complx.setRectRadii(SkRect::MakeXYWH(80.25, 80.75, 100, 149), complxRadii); - stack.clipRRect(complx, SkMatrix::I(), SkCanvas::kDifference_Op, false); + stack.clipRRect(complx, SkMatrix::I(), kDifference_SkClipOp, false); this->onCoverClipStack(stack, canvas); @@ -79,7 +79,7 @@ private: */ class ReplayClipStackVisitor final : public SkCanvasClipVisitor { public: - typedef SkCanvas::ClipOp Op; + typedef SkClipOp Op; ReplayClipStackVisitor(SkCanvas* canvas) : fCanvas(canvas) {} void clipRect(const SkRect& r, Op op, bool aa) override { fCanvas->clipRect(r, op, aa); } void clipRRect(const SkRRect& rr, Op op, bool aa) override { fCanvas->clipRRect(rr, op, aa); } |