Convert GrAppliedClip interface to builder style

Convert GrAppliedClip interface to builder style

GrAppliedClip was about at its limit for how many "make" functions it
could have. Window rectangles would push it over the edge. This change
makes it so GrDrawTarget supplies the original draw bounds to the
constructor, and then GrClip adds the various required clipping
techniques.

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

Committed: https://skia.googlesource.com/skia/+/d211e7875d9d564f075f664d9f402e1fed6dd90c

[csmartdalton, 2016-08-15 15:53:59]

Description was changed from

==========
Convert GrAppliedClip interface to builder style

GrAppliedClip was about at its limit for how many “make” functions it
could have. Window rectangles would push it over the edge. This change
makes it so GrDrawTarget supplies the original draw bounds to the
constructor, and then GrClip adds the various required clipping
techniques.

Remove stencil settings param from stencilPath()

stencilPath() picks its own user stencil settings. This argument
should not be there.

BUG=skia:
==========

to

==========
Convert GrAppliedClip interface to builder style

GrAppliedClip was about at its limit for how many “make” functions it
could have. Window rectangles would push it over the edge. This change
makes it so GrDrawTarget supplies the original draw bounds to the
constructor, and then GrClip adds the various required clipping
techniques.

Remove stencil settings param from stencilPath()

stencilPath() picks its own user stencil settings. This argument
should not be there.

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

[csmartdalton, 2016-08-15 16:05:25]

csmartdalton@google.com changed reviewers:
+ bsalomon@google.com, robertphillips@google.com

[csmartdalton, 2016-08-15 16:05:26]

https://codereview.chromium.org/2246113002/diff/1/include/gpu/GrClip.h
File include/gpu/GrClip.h (left):

https://codereview.chromium.org/2246113002/diff/1/include/gpu/GrClip.h#oldcod...
include/gpu/GrClip.h:268: SkRect           fDeviceBounds;
Here we can eventually store a simple SkRect that just tells us the bounding box
of the scissor. All intersect logic can happen once it's added to GrAppliedClip.

https://codereview.chromium.org/2246113002/diff/1/include/gpu/GrClip.h
File include/gpu/GrClip.h (right):

https://codereview.chromium.org/2246113002/diff/1/include/gpu/GrClip.h#newcode36
include/gpu/GrClip.h:36: SkASSERT(!fClipCoverageFP);
This can eventually accept the bounding box and intersect it into the dev
bounds. (But GrReducedClip needs to start providing that info first.)

https://codereview.chromium.org/2246113002/diff/1/include/gpu/GrClip.h#newcode41
include/gpu/GrClip.h:41: SkASSERT(!fHasStencilClip);
ditto

https://codereview.chromium.org/2246113002/diff/1/src/gpu/GrClipStackClip.cpp
File src/gpu/GrClipStackClip.cpp (left):

https://codereview.chromium.org/2246113002/diff/1/src/gpu/GrClipStackClip.cpp...
src/gpu/GrClipStackClip.cpp:689: clip.enableStencilClip(bounds);
These weren't the bounds of the current stencil clip mask;  they were the bounds
of the pending draw. This should be taken care of when GrDrawTarget initializes
the batch's GrAppliedClip with the draw bounds.

[csmartdalton, 2016-08-15 16:05:44]

Description was changed from

==========
Convert GrAppliedClip interface to builder style

GrAppliedClip was about at its limit for how many “make” functions it
could have. Window rectangles would push it over the edge. This change
makes it so GrDrawTarget supplies the original draw bounds to the
constructor, and then GrClip adds the various required clipping
techniques.

Remove stencil settings param from stencilPath()

stencilPath() picks its own user stencil settings. This argument
should not be there.

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

to

==========
Convert GrAppliedClip interface to builder style

GrAppliedClip was about at its limit for how many "make" functions it
could have. Window rectangles would push it over the edge. This change
makes it so GrDrawTarget supplies the original draw bounds to the
constructor, and then GrClip adds the various required clipping
techniques.

Remove stencil settings param from stencilPath()

stencilPath() picks its own user stencil settings. This argument
should not be there.

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

[csmartdalton, 2016-08-15 16:11:39]

Description was changed from

==========
Convert GrAppliedClip interface to builder style

GrAppliedClip was about at its limit for how many "make" functions it
could have. Window rectangles would push it over the edge. This change
makes it so GrDrawTarget supplies the original draw bounds to the
constructor, and then GrClip adds the various required clipping
techniques.

Remove stencil settings param from stencilPath()

stencilPath() picks its own user stencil settings. This argument
should not be there.

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

to

==========
Convert GrAppliedClip interface to builder style

GrAppliedClip was about at its limit for how many "make" functions it
could have. Window rectangles would push it over the edge. This change
makes it so GrDrawTarget supplies the original draw bounds to the
constructor, and then GrClip adds the various required clipping
techniques.

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

[csmartdalton, 2016-08-15 16:12:17]

Oops, patch 1 had a rebasing error

https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h
File include/gpu/GrClip.h (left):

https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h#ol...
include/gpu/GrClip.h:268: SkRect           fDeviceBounds;
Here we can eventually store a simple SkRect that just tells us the bounding box
of the scissor. All intersect logic can happen once it's added to GrAppliedClip.

https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h
File include/gpu/GrClip.h (right):

https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h#ne...
include/gpu/GrClip.h:36: SkASSERT(!fClipCoverageFP);
This can eventually accept the bounding box and intersect it into the dev
bounds. (But GrReducedClip needs to start providing that info first.)

https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h#ne...
include/gpu/GrClip.h:41: SkASSERT(!fHasStencilClip);
ditto

https://codereview.chromium.org/2246113002/diff/20001/src/gpu/GrClipStackClip...
File src/gpu/GrClipStackClip.cpp (left):

https://codereview.chromium.org/2246113002/diff/20001/src/gpu/GrClipStackClip...
src/gpu/GrClipStackClip.cpp:689: clip.enableStencilClip(bounds);
These weren't the bounds of the current stencil clip mask;  they were the bounds
of the pending draw. This should be taken care of when GrDrawTarget initializes
the batch's GrAppliedClip with the draw bounds.

[bsalomon, 2016-08-15 16:34:03]

https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h
File include/gpu/GrClip.h (right):

https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h#ne...
include/gpu/GrClip.h:46: * Returns the device bounds of the draw after clip has
been applied. TODO: Ideally this would
The interface change to make the GrAppliedClip consider the draw bounds is
throwing me a bit. Does this make the intersection at the bottom of
GrDrawTarget::drawBatch redundant?

[csmartdalton, 2016-08-15 17:27:28]

On 2016/08/15 16:34:03, bsalomon wrote:
> https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h
> File include/gpu/GrClip.h (right):
> 
>
https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h#ne...
> include/gpu/GrClip.h:46: * Returns the device bounds of the draw after clip
has
> been applied. TODO: Ideally this would
> The interface change to make the GrAppliedClip consider the draw bounds is
> throwing me a bit. Does this make the intersection at the bottom of
> GrDrawTarget::drawBatch redundant?

Yes, good point. I pushed another change taking it out.

[csmartdalton, 2016-08-15 17:27:29]

On 2016/08/15 16:34:03, bsalomon wrote:
> https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h
> File include/gpu/GrClip.h (right):
> 
>
https://codereview.chromium.org/2246113002/diff/20001/include/gpu/GrClip.h#ne...
> include/gpu/GrClip.h:46: * Returns the device bounds of the draw after clip
has
> been applied. TODO: Ideally this would
> The interface change to make the GrAppliedClip consider the draw bounds is
> throwing me a bit. Does this make the intersection at the bottom of
> GrDrawTarget::drawBatch redundant?

Yes, good point. I pushed another change taking it out.

[bsalomon, 2016-08-15 17:56:30]

Ok, this makes more sense to me. lgtm

[csmartdalton, 2016-08-15 18:01:27]

The CQ bit was checked by csmartdalton@google.com

[csmartdalton, 2016-08-15 18:01:31]

The CQ bit was unchecked by csmartdalton@google.com

[csmartdalton, 2016-08-15 18:01:36]

The CQ bit was checked by csmartdalton@google.com

[commit-bot: I haz the power, 2016-08-15 18:01:43]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-15 18:17:32]

Description was changed from

==========
Convert GrAppliedClip interface to builder style

GrAppliedClip was about at its limit for how many "make" functions it
could have. Window rectangles would push it over the edge. This change
makes it so GrDrawTarget supplies the original draw bounds to the
constructor, and then GrClip adds the various required clipping
techniques.

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

to

==========
Convert GrAppliedClip interface to builder style

GrAppliedClip was about at its limit for how many "make" functions it
could have. Window rectangles would push it over the edge. This change
makes it so GrDrawTarget supplies the original draw bounds to the
constructor, and then GrClip adds the various required clipping
techniques.

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

Committed:
https://skia.googlesource.com/skia/+/d211e7875d9d564f075f664d9f402e1fed6dd90c
==========

[commit-bot: I haz the power, 2016-08-15 18:17:34]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/d211e7875d9d564f075f664d9f402e1fed6dd90c