Pass clip to context

src/gpu/GrClipMaskManager.cpp

Index: src/gpu/GrClipMaskManager.cpp
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index b28b75cefb9f8b18210c87c06f8f9ab0f9eb5711..bb95a43b5625c8f95e26e00b70dd0c51ac3d27df 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -231,29 +231,46 @@ bool GrClipMaskManager::setupClipping(GrPipelineBuilder* pipelineBuilder,
     bool ignoreClip = clip.isWideOpen(clipSpaceRTIBounds);
     if (!ignoreClip) {
         // The clip mask manager always draws with a single IRect so we special case that logic here
-        if (GrClip::kIRect_ClipType == clip.clipType()) {
-            initialState = GrReducedClip::kAllIn_InitialState;
-            clipSpaceIBounds = clip.irect();
-            SkNEW_INSERT_AT_LLIST_HEAD(&elements,
-                                       Element,
-                                       (SkRect::Make(clipSpaceIBounds),
-                                        SkRegion::kIntersect_Op, false));
-        } else {
-            clipSpaceRTIBounds.offset(clip.origin());
-            GrReducedClip::ReduceClipStack(*clip.clipStack(),
-                                           clipSpaceRTIBounds,
-                                           &elements,
-                                           &genID,
-                                           &initialState,
-                                           &clipSpaceIBounds,
-                                           &requiresAA);
-            if (elements.isEmpty()) {
-                if (GrReducedClip::kAllIn_InitialState == initialState) {
-                    ignoreClip = clipSpaceIBounds == clipSpaceRTIBounds;
-                } else {
-                    return false;
+        // Image filters just use a rect, so we also special case that logic
+        switch (clip.clipType()) {
+            default:

[bsalomon, 2015/02/24 17:02:05]

We have bots that have compile flags set that will give us a compile time
warning if there is a missing case (and no default:). 

+                SkFAIL("Incomplete switch\n");
+            case GrClip::kIRect_ClipType: {
+                initialState = GrReducedClip::kAllIn_InitialState;
+                clipSpaceIBounds = clip.irect();
+                SkNEW_INSERT_AT_LLIST_HEAD(&elements,
+                                           Element,
+                                           (SkRect::Make(clipSpaceIBounds),
+                                            SkRegion::kIntersect_Op, false));
+            } break;
+            case GrClip::kRect_ClipType: {
+                initialState = GrReducedClip::kAllIn_InitialState;
+                clipSpaceIBounds.setLTRB(SkScalarCeilToInt(clip.rect().fLeft),
+                                         SkScalarCeilToInt(clip.rect().fTop),
+                                         SkScalarCeilToInt(clip.rect().fRight),
+                                         SkScalarCeilToInt(clip.rect().fBottom));
+                SkNEW_INSERT_AT_LLIST_HEAD(&elements,
+                                           Element,
+                                           (SkRect::Make(clipSpaceIBounds),
+                                            SkRegion::kIntersect_Op, false));
+            } break;
+            case GrClip::kClipStack_ClipType: {
+                clipSpaceRTIBounds.offset(clip.origin());
+                GrReducedClip::ReduceClipStack(*clip.clipStack(),
+                                               clipSpaceRTIBounds,
+                                               &elements,
+                                               &genID,
+                                               &initialState,
+                                               &clipSpaceIBounds,
+                                               &requiresAA);
+                if (elements.isEmpty()) {
+                    if (GrReducedClip::kAllIn_InitialState == initialState) {
+                        ignoreClip = clipSpaceIBounds == clipSpaceRTIBounds;
+                    } else {
+                        return false;
+                    }
                 }
-            }
+            } break;
         }
     }