Use clipped bounds for reordering decisions

src/gpu/GrClip.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrClip.h"
 
 #include "GrClipMaskManager.h"
@@ skipping 26 matching lines @@
         }
     }
     if (isIntersectionOfRects) {
         *isIntersectionOfRects = true;
     }
 }
 
 bool GrFixedClip::apply(GrContext*, const GrPipelineBuilder& pipelineBuilder,
                         GrDrawContext* drawContext,
                         const SkRect* devBounds, GrAppliedClip* out) const {
+    SkASSERT(!fDeviceBounds.isLargest());
     if (fScissorState.enabled()) {
         SkIRect tightScissor;
         if (!tightScissor.intersect(fScissorState.rect(),
                                     SkIRect::MakeWH(drawContext->width(), drawContext->height()))) {
             return false;
         }
         if (devBounds && !devBounds->intersects(SkRect::Make(tightScissor))) {
             return false;
         }
-        out->makeScissoredStencil(fHasStencilClip, tightScissor);
+        if (fHasStencilClip) {
+            out->makeScissoredStencil(tightScissor, &fDeviceBounds);
+        } else {
+            out->makeScissored(tightScissor);
+        }
         return true;
     }
 
-    out->makeStencil(fHasStencilClip);
+    out->makeStencil(fHasStencilClip, fDeviceBounds);
     return true;
 }
 
 bool GrClipStackClip::quickContains(const SkRect& rect) const {
     if (!fStack) {
         return true;
     }
     return fStack->quickContains(rect.makeOffset(SkIntToScalar(fOrigin.x()),
                                                  SkIntToScalar(fOrigin.y())));
 }
@@ skipping 12 matching lines @@
                                   isIntersectionOfRects);
     devBounds.roundOut(devResult);
 }
 
 bool GrClipStackClip::apply(GrContext* context,
                             const GrPipelineBuilder& pipelineBuilder, GrDrawContext* drawContext,
                             const SkRect* devBounds, GrAppliedClip* out) const {
     return GrClipMaskManager::SetupClipping(context, pipelineBuilder, drawContext,
                                             *this, devBounds, out);
 }