commit ebfce6d9b42198e04288a15953f40c395a7b6139
author Mike Reed <reed@google.com> Mon Dec 12 10:02:12 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 12 15:38:31 2016 +0000
tree edb5bfa26c2efb5c58f7071efb3811ca33e23560
parent c30833327f0dda75a8fbe061f3f1966d1f6621a3

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>

src/gpu/GrReducedClip.cpp

diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index 8b9090f..fd61686 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 @@
 }
 
 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) {