Disable gpu-side clip mask merging in the clip mask manager

Disable gpu-side clip mask merging in the clip mask manager

In the MDB world the clip mask manager would need to create a separate drawContext for each temporary mask (and we would need to support stencil draws in the drawContext). For now, disable the feature. 

Please see skbug.com/4519 (Re-enable gpu-side mask merging in Ganesh)

BUG=skia:4094
Committed: https://skia.googlesource.com/skia/+/423e337782f65b6861a45a4ecff84192994ced1d

[robertphillips, 2015-10-27 13:20:07]

Description was changed from

==========
Disable gpu-side clip mask merging in the clip mask manager

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

to

==========
Disable gpu-side clip mask merging in the clip mask manager

In the MDB world the clip mask manager would need to create a separate
drawContext for each temporary mask (and we would need to support stencil draws
in the drawContext). For now, disable the feature.

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

[robertphillips, 2015-10-27 13:22:40]

Description was changed from

==========
Disable gpu-side clip mask merging in the clip mask manager

In the MDB world the clip mask manager would need to create a separate
drawContext for each temporary mask (and we would need to support stencil draws
in the drawContext). For now, disable the feature.

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

to

==========
Disable gpu-side clip mask merging in the clip mask manager

In the MDB world the clip mask manager would need to create a separate
drawContext for each temporary mask (and we would need to support stencil draws
in the drawContext). For now, disable the feature. 

BUG=skia:4094
BUG=skia:4519 (Re-enable gpu-side mask merging in Ganesh)
==========

[robertphillips, 2015-10-27 13:22:40]

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

[robertphillips, 2015-10-27 13:23:15]

Description was changed from

==========
Disable gpu-side clip mask merging in the clip mask manager

In the MDB world the clip mask manager would need to create a separate
drawContext for each temporary mask (and we would need to support stencil draws
in the drawContext). For now, disable the feature. 

BUG=skia:4094
BUG=skia:4519 (Re-enable gpu-side mask merging in Ganesh)
==========

to

==========
Disable gpu-side clip mask merging in the clip mask manager

In the MDB world the clip mask manager would need to create a separate
drawContext for each temporary mask (and we would need to support stencil draws
in the drawContext). For now, disable the feature. 

Please see skbug.com/4519 (Re-enable gpu-side mask merging in Ganesh)

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

[bsalomon, 2015-10-27 13:37:00]

https://codereview.chromium.org/1424853002/diff/1/src/gpu/GrClipMaskManager.cpp
File src/gpu/GrClipMaskManager.cpp (right):

https://codereview.chromium.org/1424853002/diff/1/src/gpu/GrClipMaskManager.c...
src/gpu/GrClipMaskManager.cpp:613: SkASSERT(!useTemp);
Maybe a comment here saying see skbug.com/wxyz for explanation about why we
don't use a temp.

[bsalomon, 2015-10-27 13:37:17]

lgtm

[robertphillips, 2015-10-27 14:26:34]

https://codereview.chromium.org/1424853002/diff/1/src/gpu/GrClipMaskManager.cpp
File src/gpu/GrClipMaskManager.cpp (right):

https://codereview.chromium.org/1424853002/diff/1/src/gpu/GrClipMaskManager.c...
src/gpu/GrClipMaskManager.cpp:613: SkASSERT(!useTemp);
On 2015/10/27 13:37:00, bsalomon wrote:
> Maybe a comment here saying see skbug.com/wxyz for explanation about why we
> don't use a temp.

Done.

[robertphillips, 2015-10-27 16:08:50]

The CQ bit was checked by robertphillips@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-10-27 16:08:54]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1424853002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1424853002/20001

[commit-bot: I haz the power, 2015-10-27 16:19:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-10-27 16:19:48]

Dry run: This issue passed the CQ dry run.

[robertphillips, 2015-10-27 16:22:54]

The CQ bit was checked by robertphillips@google.com

[robertphillips, 2015-10-27 16:22:54]

The patchset sent to the CQ was uploaded after l-g-t-m from bsalomon@google.com
Link to the patchset: https://codereview.chromium.org/1424853002/#ps20001
(title: "Add comment linking to bug")

[commit-bot: I haz the power, 2015-10-27 16:23:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1424853002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1424853002/20001

[commit-bot: I haz the power, 2015-10-27 16:23:41]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/423e337782f65b6861a45a4ecff84192994ced1d