Move clip mask generation into GrReducedClip

src/gpu/GrStencilAttachment.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrStencilAttachment_DEFINED
 #define GrStencilAttachment_DEFINED
@@ skipping 13 matching lines @@
     }
 
     int width() const { return fWidth; }
     int height() const { return fHeight; }
     int bits() const { return fBits; }
     int numSamples() const { return fSampleCnt; }
 
     // 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);
     }
 
     // We create a unique stencil buffer at each width, height and sampleCnt and share it for
     // all render targets that require a stencil with those params.
     static void ComputeSharedStencilAttachmentKey(int width, int height, int sampleCnt,
                                                   GrUniqueKey* key);
 
 protected:
     GrStencilAttachment(GrGpu* gpu, int width, int height, int bits, int sampleCnt)
         : GrGpuResource(gpu)
         , fWidth(width)
         , fHeight(height)
         , fBits(bits)
         , fSampleCnt(sampleCnt)
         , fLastClipStackGenID(SkClipStack::kInvalidGenID) {
         fLastClipStackRect.setEmpty();
     }
 
 private:
 
     int fWidth;
     int fHeight;
     int fBits;
     int fSampleCnt;
 
     int32_t     fLastClipStackGenID;
     SkIRect     fLastClipStackRect;
-    SkIPoint    fLastClipSpaceOffset;
+    SkIPoint    fLastClipOrigin;
 
     typedef GrGpuResource INHERITED;
 };
 
 #endif