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, 3 insertions, 14 deletions

diff --git a/src/gpu/GrClipStackClip.h b/src/gpu/GrClipStackClip.h
index ad143d6969..075d1d857d 100644
--- a/src/gpu/GrClipStackClip.h
+++ b/src/gpu/GrClipStackClip.h
@@ -49,28 +49,17 @@ private:
                                     GrPathRenderer** prOut,
                                     bool needsStencil);
 
-    // Draws the clip into the stencil buffer
-    static bool CreateStencilClipMask(GrContext*,
-                                      GrDrawContext*,
-                                      const GrReducedClip&,
-                                      const SkIPoint& clipSpaceToStencilOffset);
-
     // Creates an alpha mask of the clip. The mask is a rasterization of elements through the
     // rect specified by clipSpaceIBounds.
-    static sk_sp<GrTexture> CreateAlphaClipMask(GrContext*,
-                                                const GrReducedClip&,
-                                                const SkVector& clipToMaskOffset);
+    static sk_sp<GrTexture> CreateAlphaClipMask(GrContext*, const GrReducedClip&);
 
     // Similar to createAlphaClipMask but it rasterizes in SW and uploads to the result texture.
-    static sk_sp<GrTexture> CreateSoftwareClipMask(GrTextureProvider*,
-                                                   const GrReducedClip&,
-                                                   const SkVector& clipToMaskOffset);
+    static sk_sp<GrTexture> CreateSoftwareClipMask(GrTextureProvider*, const GrReducedClip&);
 
    static bool UseSWOnlyPath(GrContext*,
                              bool hasUserStencilSettings,
                              const GrDrawContext*,
-                             const SkVector& clipToMaskOffset,
-                             const GrReducedClip::ElementList& elements);
+                             const GrReducedClip&);
 
     static GrTexture* CreateCachedMask(int width, int height, const GrUniqueKey& key,
                                        bool renderTarget);