Move clip mask generation into GrReducedClip

This is a temporary solution to facilitate window rectangles and make
clip mask generation more accessible for testing. The eventual goal is
to simplify clips and merge GrReducedClip into GrClipStackClip.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2263343002

Review-Url: https://codereview.chromium.org/2263343002

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gpu/GrStencilAttachment.h b/src/gpu/GrStencilAttachment.h
index 8f41b57e21..0ed3c8b27c 100644
--- a/src/gpu/GrStencilAttachment.h
+++ b/src/gpu/GrStencilAttachment.h
@@ -31,18 +31,18 @@ public:
     // called to note the last clip drawn to this buffer.
     void setLastClip(int32_t clipStackGenID,
                      const SkIRect& clipSpaceRect,
-                     const SkIPoint clipSpaceToStencilOffset) {
+                     const SkIPoint clipOrigin) {
         fLastClipStackGenID = clipStackGenID;
         fLastClipStackRect = clipSpaceRect;
-        fLastClipSpaceOffset = clipSpaceToStencilOffset;
+        fLastClipOrigin = clipOrigin;
     }
 
     // called to determine if we have to render the clip into SB.
     bool mustRenderClip(int32_t clipStackGenID,
                         const SkIRect& clipSpaceRect,
-                        const SkIPoint clipSpaceToStencilOffset) const {
+                        const SkIPoint& clipOrigin) const {
         return fLastClipStackGenID != clipStackGenID ||
-               fLastClipSpaceOffset != clipSpaceToStencilOffset ||
+               fLastClipOrigin != clipOrigin ||
                !fLastClipStackRect.contains(clipSpaceRect);
     }
 
@@ -71,7 +71,7 @@ private:
 
     int32_t     fLastClipStackGenID;
     SkIRect     fLastClipStackRect;
-    SkIPoint    fLastClipSpaceOffset;
+    SkIPoint    fLastClipOrigin;
 
     typedef GrGpuResource INHERITED;
 };