diff options
| author |  Mike Reed <reed@google.com> | 2016-12-09 09:00:50 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 14:33:41 +0000 |
| commit | c1f7774e8d327e3c98b4094c9c01d26e27013f71 (patch) | |
| tree | 202eecd519054c880daa6995876abb5d42fdbc89 /gm/complexclip2.cpp | |
| parent | 374e04acfa00da3c20a29d391b3e7305e37fbcfb (diff) | |
Revert[2] "remove SK_SUPPORT_LEGACY_CLIP_REGIONOPS"
This reverts commit a129dfef2aaab0b5995cdf1ab7b2cdd41c29cf72.
BUG=skia:
Change-Id: I717de6e5fcd4516aa684b014b1414b0f82ac2b91
Reviewed-on: https://skia-review.googlesource.com/5722
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Diffstat (limited to 'gm/complexclip2.cpp')
| -rw-r--r-- | gm/complexclip2.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp index 3180f6681a..71e07c9221 100644 --- a/gm/complexclip2.cpp +++ b/gm/complexclip2.cpp @@ -83,13 +83,13 @@ protected: fPaths[4].addRoundRect(fRects[4], 5, 5); fRectColors[4] = SK_ColorCYAN; - SkCanvas::ClipOp ops[] = { - SkCanvas::kDifference_Op, - SkCanvas::kIntersect_Op, - SkCanvas::kUnion_Op, - SkCanvas::kXOR_Op, - SkCanvas::kReverseDifference_Op, - SkCanvas::kReplace_Op, + const SkClipOp ops[] = { + kDifference_SkClipOp, + kIntersect_SkClipOp, + kUnion_SkClipOp, + kXOR_SkClipOp, + kReverseDifference_SkClipOp, + kReplace_SkClipOp, }; SkRandom r; @@ -200,7 +200,7 @@ private: SkRRect fRRects[5]; SkPath fPaths[5]; SkColor fRectColors[5]; - SkCanvas::ClipOp fOps[kRows * kCols][5]; + SkClipOp fOps[kRows * kCols][5]; SkScalar fWidth; SkScalar fHeight; SkScalar fTotalWidth; |