check for wide-open inside quickContains

src/gpu/GrClipStackClip.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrClipStackClip.h"
 
 #include "GrAppliedClip.h"
 #include "GrDrawingManager.h"
 #include "GrDrawContextPriv.h"
 #include "GrFixedClip.h"
 #include "GrGpuResourcePriv.h"
 #include "GrRenderTargetPriv.h"
 #include "GrStencilAttachment.h"
 #include "GrSWMaskHelper.h"
 #include "effects/GrConvexPolyEffect.h"
 #include "effects/GrRRectEffect.h"
 #include "effects/GrTextureDomain.h"
 
 typedef SkClipStack::Element Element;
 typedef GrReducedClip::InitialState InitialState;
 typedef GrReducedClip::ElementList ElementList;
 
 static const int kMaxAnalyticElements = 4;
 
 bool GrClipStackClip::quickContains(const SkRect& rect) const {
-    if (!fStack) {
+    if (!fStack || fStack->isWideOpen()) {

[bsalomon, 2016/08/22 19:47:56]

We don't need this call to isWideOpen() anymore, right?

[reed1, 2016/08/22 19:49:49]

Well, this is why my first version didn't put the check in clipstack: the cost
of making the rect itself (esp. since there are two int-to-float conversions)
was part of the slow-down. If I rely on the clipstack check, I still pay for the
rect.

         return true;
     }
     return fStack->quickContains(rect.makeOffset(SkIntToScalar(fOrigin.x()),
                                                  SkIntToScalar(fOrigin.y())));
 }
 
 bool GrClipStackClip::quickContains(const SkRRect& rrect) const {
-    if (!fStack) {
+    if (!fStack || fStack->isWideOpen()) {

[bsalomon, 2016/08/22 19:47:56]

or this one.

         return true;
     }
     return fStack->quickContains(rrect.makeOffset(SkIntToScalar(fOrigin.fX),
                                                   SkIntToScalar(fOrigin.fY)));
 }
 
 void GrClipStackClip::getConservativeBounds(int width, int height, SkIRect* devResult,
                                             bool* isIntersectionOfRects) const {
     if (!fStack) {
         devResult->setXYWH(0, 0, width, height);
@@ skipping 735 matching lines @@
     sk_sp<GrTexture> result(texProvider->createApproxTexture(desc));
     if (!result) {
         return nullptr;
     }
     result->resourcePriv().setUniqueKey(key);
 
     helper.toTexture(result.get());
 
     return result;
 }