Revert "Don't require AA in order to use shader-based clips"

This reverts commit 259656779334689ab1624ec4e2e234b35fe4024b.

TBR=robertphillips@google.com

Review URL: https://codereview.chromium.org/981723009

diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index a39c4a3..6635436 100644 (file)
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -292,7 +292,8 @@ bool GrClipMaskManager::setupClipping(GrPipelineBuilder* pipelineBuilder,
         SkVector clipToRTOffset = { SkIntToScalar(-clip.origin().fX),
                                     SkIntToScalar(-clip.origin().fY) };
         if (elements.isEmpty() ||
-            this->installClipEffects(pipelineBuilder, arfp, elements, clipToRTOffset, devBounds)) {
+            (requiresAA && this->installClipEffects(pipelineBuilder, arfp, elements, clipToRTOffset,
+                                                    devBounds))) {
             SkIRect scissorSpaceIBounds(clipSpaceIBounds);
             scissorSpaceIBounds.offset(-clip.origin());
             if (NULL == devBounds ||