Fix stroked oval and rrect rendering on Ubuntu-x86-Release.

Fix stroked oval and rrect rendering on Ubuntu-x86-Release.

The Ubuntu-x86 compiler was optimizing out a case where I was
reseting the isStroked boolean based on the new inner radii.
This changes it to check the radii at the time the effect is
created, which tricks the compiler into doing the right thing.

Committed: http://code.google.com/p/skia/source/detail?r=11035

[robertphillips, 2013-08-29 17:01:14]

Questions.

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

https://codereview.chromium.org/23592021/diff/1/src/gpu/GrOvalRenderer.cpp#ne...
src/gpu/GrOvalRenderer.cpp:374: innerRadius = radius - halfWidth;
Did you try leaving the "innerRadius = radius - halfWidth;" line here and just
moving the creation and addCoverEffect of the CircleEdgeEffect down?

It seems like the order this was done in before this patch was wrong.

https://codereview.chromium.org/23592021/diff/1/src/gpu/GrOvalRenderer.cpp#ne...
src/gpu/GrOvalRenderer.cpp:850: // drop out the middle quad if we're stroked
It seems like this won't behave exactly the same? Is that okay?

[jvanverth1, 2013-08-29 18:16:52]

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

https://codereview.chromium.org/23592021/diff/1/src/gpu/GrOvalRenderer.cpp#ne...
src/gpu/GrOvalRenderer.cpp:374: innerRadius = radius - halfWidth;
On 2013/08/29 17:01:14, robertphillips wrote:
> Did you try leaving the "innerRadius = radius - halfWidth;" line here and just
> moving the creation and addCoverEffect of the CircleEdgeEffect down?
> 
> It seems like the order this was done in before this patch was wrong.

Yes, that's why I moved it down.

https://codereview.chromium.org/23592021/diff/1/src/gpu/GrOvalRenderer.cpp#ne...
src/gpu/GrOvalRenderer.cpp:850: // drop out the middle quad if we're stroked
On 2013/08/29 17:01:14, robertphillips wrote:
> It seems like this won't behave exactly the same? Is that okay?

Nope, not okay. Good catch.

[jvanverth1, 2013-08-30 12:59:08]

Updated based on Robert's comments.

https://codereview.chromium.org/23592021/diff/6001/src/gpu/GrOvalRenderer.cpp
File src/gpu/GrOvalRenderer.cpp (right):

https://codereview.chromium.org/23592021/diff/6001/src/gpu/GrOvalRenderer.cpp...
src/gpu/GrOvalRenderer.cpp:690: isStroked = (isStroked && innerRadius > 0);
Revised to reset isStroked because it's used in two places.

https://codereview.chromium.org/23592021/diff/6001/src/gpu/GrOvalRenderer.cpp...
src/gpu/GrOvalRenderer.cpp:786: isStroked = (isStroked && innerXRadius > 0 &&
innerYRadius > 0);
Revised to reset isStroked because it's used in two places.

[robertphillips, 2013-08-30 13:00:27]

lgtm

[bsalomon, 2013-08-30 13:12:27]

On 2013/08/30 13:00:27, robertphillips wrote:
> lgtm

lgtm

[commit-bot: I haz the power, 2013-08-30 16:25:04]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/jvanverth@google.com/23592021/6001

[commit-bot: I haz the power, 2013-08-30 16:34:56]

Change committed as 11035