Encapsulate GrReducedClip result in class members

include/gpu/GrClip.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrClip_DEFINED
 #define GrClip_DEFINED
 
@@ skipping 111 matching lines @@
     constexpr static SkScalar kBoundsTolerance = 1e-3f;
 
     /**
      * Returns true if the given query bounds count as entirely inside the clip.
      *
      * @param innerClipBounds   device-space rect contained by the clip (SkRect or SkIRect).
      * @param queryBounds       device-space bounds of the query region.
      */
     template<typename TRect> constexpr static bool IsInsideClip(const TRect& innerClipBounds,
                                                                 const SkRect& queryBounds) {
-        return innerClipBounds.fRight - innerClipBounds.fLeft >= kBoundsTolerance &&
-               innerClipBounds.fBottom - innerClipBounds.fTop >= kBoundsTolerance &&
-               innerClipBounds.fLeft <= queryBounds.fLeft + kBoundsTolerance &&
-               innerClipBounds.fTop <= queryBounds.fTop + kBoundsTolerance &&
-               innerClipBounds.fRight >= queryBounds.fRight - kBoundsTolerance &&
-               innerClipBounds.fBottom >= queryBounds.fBottom - kBoundsTolerance;
+        return innerClipBounds.fRight - innerClipBounds.fLeft > kBoundsTolerance &&
+               innerClipBounds.fBottom - innerClipBounds.fTop > kBoundsTolerance &&
+               innerClipBounds.fLeft < queryBounds.fLeft + kBoundsTolerance &&
+               innerClipBounds.fTop < queryBounds.fTop + kBoundsTolerance &&
+               innerClipBounds.fRight > queryBounds.fRight - kBoundsTolerance &&
+               innerClipBounds.fBottom > queryBounds.fBottom - kBoundsTolerance;
     }
 
     /**
      * Returns true if the given query bounds count as entirely outside the clip.
      *
      * @param outerClipBounds   device-space rect that contains the clip (SkRect or SkIRect).
      * @param queryBounds       device-space bounds of the query region.
      */
     template<typename TRect> constexpr static bool IsOutsideClip(const TRect& outerClipBounds,
                                                                  const SkRect& queryBounds) {
-        return outerClipBounds.fRight - outerClipBounds.fLeft < kBoundsTolerance ||
-               outerClipBounds.fBottom - outerClipBounds.fTop < kBoundsTolerance ||
-               outerClipBounds.fLeft > queryBounds.fRight - kBoundsTolerance ||
-               outerClipBounds.fTop > queryBounds.fBottom - kBoundsTolerance ||
-               outerClipBounds.fRight < queryBounds.fLeft + kBoundsTolerance ||
-               outerClipBounds.fBottom < queryBounds.fTop + kBoundsTolerance;
+        return outerClipBounds.fRight - outerClipBounds.fLeft <= kBoundsTolerance ||
+               outerClipBounds.fBottom - outerClipBounds.fTop <= kBoundsTolerance ||
+               outerClipBounds.fLeft >= queryBounds.fRight - kBoundsTolerance ||
+               outerClipBounds.fTop >= queryBounds.fBottom - kBoundsTolerance ||
+               outerClipBounds.fRight <= queryBounds.fLeft + kBoundsTolerance ||
+               outerClipBounds.fBottom <= queryBounds.fTop + kBoundsTolerance;

[csmartdalton, 2016/08/08 05:26:55]

Switching to <= and >= ought to remove the case where GrReducedClip could have
rounded the iBounds out to empty. 

     }
 
     /**
      * Returns the minimal integer rect that counts as containing a given set of bounds.
      */
     static SkIRect GetPixelIBounds(const SkRect& bounds) {
         return SkIRect::MakeLTRB(SkScalarFloorToInt(bounds.fLeft + kBoundsTolerance),
                                  SkScalarFloorToInt(bounds.fTop + kBoundsTolerance),
                                  SkScalarCeilToInt(bounds.fRight - kBoundsTolerance),
                                  SkScalarCeilToInt(bounds.fBottom - kBoundsTolerance));
@@ skipping 99 matching lines @@
                bool useHWAA,
                bool hasUserStencilSettings,
                GrAppliedClip* out) const final;
 
     GrScissorState   fScissorState;
     SkRect           fDeviceBounds;
     bool             fHasStencilClip;
 };
 
 #endif