| Index: src/gpu/GrClipMaskManager.h
|
| diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
|
| index dc24d9f5b353f422de0a76e91cb2e1c78e625c33..5cf35690723a8bf827f0da7b20923ae9bf568262 100644
|
| --- a/src/gpu/GrClipMaskManager.h
|
| +++ b/src/gpu/GrClipMaskManager.h
|
| @@ -15,15 +15,10 @@ class GrAppliedClip;
|
| class GrClipStackClip;
|
| class GrContext;
|
| class GrDrawContext;
|
| -class GrFixedClip;
|
| class GrPathRenderer;
|
| -class GrPathRendererChain;
|
| -class GrPipelineBuilder;
|
| -class GrResourceProvider;
|
| class GrTexture;
|
| class GrTextureProvider;
|
| class GrUniqueKey;
|
| -struct GrUserStencilSettings;
|
|
|
|
|
| /**
|
| @@ -43,8 +38,13 @@ public:
|
| * then the draw can be skipped. devBounds is optional but can help optimize
|
| * clipping.
|
| */
|
| - static bool SetupClipping(GrContext*, const GrPipelineBuilder&, GrDrawContext*,
|
| - const GrClipStackClip&, const SkRect* devBounds, GrAppliedClip*);
|
| + static bool SetupClipping(GrContext*,
|
| + GrDrawContext*,
|
| + const GrClipStackClip&,
|
| + const SkRect* devBounds,
|
| + bool useHWAA,
|
| + bool hasUserStencilSettings,
|
| + GrAppliedClip* out);
|
|
|
| private:
|
| static bool PathNeedsSWRenderer(GrContext* context,
|
| @@ -82,7 +82,7 @@ private:
|
| const SkIRect& clipSpaceIBounds);
|
|
|
| static bool UseSWOnlyPath(GrContext*,
|
| - const GrPipelineBuilder&,
|
| + bool hasUserStencilSettings,
|
| const GrDrawContext*,
|
| const SkVector& clipToMaskOffset,
|
| const GrReducedClip::ElementList& elements);
|
|
|