diff options
| author |  Mike Reed <reed@google.com> | 2016-12-12 10:02:12 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-12 15:38:31 +0000 |
| commit | ebfce6d9b42198e04288a15953f40c395a7b6139 (patch) | |
| tree | edb5bfa26c2efb5c58f7071efb3811ca33e23560 /src/gpu/GrReducedClip.cpp | |
| parent | c30833327f0dda75a8fbe061f3f1966d1f6621a3 (diff) | |
change SkClipOp to a class enum
BUG=skia:
Change-Id: I25dbe6d6b8666a2a0a7be7bdd2ae0b067868d14e
Reviewed-on: https://skia-review.googlesource.com/5718
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/gpu/GrReducedClip.cpp')
| -rw-r--r-- | src/gpu/GrReducedClip.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp index 8b9090f427..fd616866f0 100644 --- a/src/gpu/GrReducedClip.cpp +++ b/src/gpu/GrReducedClip.cpp @@ -19,6 +19,7 @@ #include "GrStencilSettings.h" #include "GrStyle.h" #include "GrUserStencilSettings.h" +#include "SkClipOpPriv.h" typedef SkClipStack::Element Element; @@ -432,11 +433,11 @@ void GrReducedClip::walkStack(const SkClipStack& stack, const SkRect& queryBound } static bool element_is_pure_subtract(SkClipOp op) { - SkASSERT(op >= 0); - return op <= kIntersect_SkClipOp; + SkASSERT(static_cast<int>(op) >= 0); + return static_cast<int>(op) <= static_cast<int>(kIntersect_SkClipOp); - GR_STATIC_ASSERT(0 == kDifference_SkClipOp); - GR_STATIC_ASSERT(1 == kIntersect_SkClipOp); + GR_STATIC_ASSERT(0 == static_cast<int>(kDifference_SkClipOp)); + GR_STATIC_ASSERT(1 == static_cast<int>(kIntersect_SkClipOp)); } void GrReducedClip::addInteriorWindowRectangles(int maxWindowRectangles) { |