When clipping treat rrect corners where either the x or y radius is < 0.5 as square.

When clipping treat rrect corners where either the x or y radius is < 0.5 as square.

BUG=skia:2181
Committed: http://code.google.com/p/skia/source/detail?r=13918

[robertphillips, 2014-03-24 14:26:33]

lgtm + comment suggestions and maybe a minor change

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
File src/gpu/effects/GrRRectEffect.cpp (right):

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
src/gpu/effects/GrRRectEffect.cpp:639: if (rrect.getSimpleRadii().fX <
kRadiusMin || rrect.getSimpleRadii().fY < kRadiusMin) {
// In this case the RR basically collapses to a rect ?

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
src/gpu/effects/GrRRectEffect.cpp:658: radii[c] =
rrect.radii((SkRRect::Corner)c);
|| 0 == radii[c].fY ?

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
src/gpu/effects/GrRRectEffect.cpp:659: if (0 == radii[c].fX) {
// A square corner ?

[jvanverth1, 2014-03-24 15:45:11]

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
File src/gpu/effects/GrRRectEffect.cpp (right):

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
src/gpu/effects/GrRRectEffect.cpp:18: static const SkScalar kRadiusMin = 0.5;
0.5f? Or SK_ScalarHalf?

[bsalomon, 2014-03-24 18:02:10]

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
File src/gpu/effects/GrRRectEffect.cpp (right):

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
src/gpu/effects/GrRRectEffect.cpp:18: static const SkScalar kRadiusMin = 0.5;
On 2014/03/24 15:45:11, JimVV wrote:
> 0.5f? Or SK_ScalarHalf?

Done.

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
src/gpu/effects/GrRRectEffect.cpp:639: if (rrect.getSimpleRadii().fX <
kRadiusMin || rrect.getSimpleRadii().fY < kRadiusMin) {
On 2014/03/24 14:26:34, robertphillips wrote:
> // In this case the RR basically collapses to a rect ?

Done.

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
src/gpu/effects/GrRRectEffect.cpp:658: radii[c] =
rrect.radii((SkRRect::Corner)c);
On 2014/03/24 14:26:34, robertphillips wrote:
> || 0 == radii[c].fY ?

I put back this assert: SkASSERT((0 == r.fX) == (0 == r.fY));

SkRRect enforces this.

https://codereview.chromium.org/200723011/diff/60001/src/gpu/effects/GrRRectE...
src/gpu/effects/GrRRectEffect.cpp:659: if (0 == radii[c].fX) {
On 2014/03/24 14:26:34, robertphillips wrote:
> // A square corner ?

Done.

[bsalomon, 2014-03-24 18:02:17]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-03-24 18:02:25]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/bsalomon@google.com/200723011/80001

[commit-bot: I haz the power, 2014-03-24 19:25:02]

Change committed as 13918