Replace GrStrokeInfo with GrStyle.

Replace GrStrokeInfo with GrStyle.

A side effect is that arbitrary path effects can no be pushed deeper into the Ganesh flow for paths. They may be applied by path renderers.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1957363002

Committed: https://skia.googlesource.com/skia/+/33595bdf4b64a745f6340338d307e806e96c587f

Committed: https://skia.googlesource.com/skia/+/6663acff010ce752e4bf778da81fa97448c9db31

[bsalomon, 2016-05-09 16:02:42]

Description was changed from

==========
Replace GrStrokeInfo with GrStyle.

A side effect is that arbitrary path effects can no be pushed deeper into the
Ganesh flow for paths. They may be applied by path renderers.
==========

to

==========
Replace GrStrokeInfo with GrStyle.

A side effect is that arbitrary path effects can no be pushed deeper into the
Ganesh flow for paths. They may be applied by path renderers.
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[bsalomon, 2016-05-09 18:04:57]

Patchset #1 (id:1) has been deleted

[bsalomon, 2016-05-09 18:05:07]

Patchset #1 (id:20001) has been deleted

[bsalomon, 2016-05-09 18:05:36]

Patchset #1 (id:40001) has been deleted

[bsalomon, 2016-05-09 18:15:33]

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

[bsalomon, 2016-05-09 18:15:34]

A lot, but not all, of this is wrote. Most of the files have few changes. This
deletes GrStrokeInfo and uses GrStyle in its place.

[robertphillips, 2016-05-09 20:05:29]

lgtm

https://codereview.chromium.org/1957363002/diff/80001/include/gpu/GrTestUtils.h
File include/gpu/GrTestUtils.h (right):

https://codereview.chromium.org/1957363002/diff/80001/include/gpu/GrTestUtils...
include/gpu/GrTestUtils.h:44: 
Can this class go in the .cpp file ?

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrBlurUtils.cpp
File src/gpu/GrBlurUtils.cpp (right):

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrBlurUtils.cpp...
src/gpu/GrBlurUtils.cpp:140: translate.setTranslate(-maskRect->fLeft,
-maskRect->fTop);
should this 'style' also be called 'fillOrHairline' ?

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrStyle.h
File src/gpu/GrStyle.h (right):

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrStyle.h#newco...
src/gpu/GrStyle.h:141: static SkScalar MatrixToScaleFactor(const SkMatrix&
matrix) {
we us -> we use ?

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/batches/GrTesse...
File src/gpu/batches/GrTessellatingPathRenderer.cpp (right):

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/batches/GrTesse...
src/gpu/batches/GrTessellatingPathRenderer.cpp:153: styleScale =
GrStyle::MatrixToScaleFactor(fViewMatrix);
stray ';' ?

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/batches/GrTesse...
src/gpu/batches/GrTessellatingPathRenderer.cpp:160: fPath.isInverseFillType() ?
sizeof(fClipBounds) / sizeof(uint32_t) : 0;
can we rm the 32 suffix ?

[egdaniel, 2016-05-09 20:08:40]

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrDrawContext.cpp
File src/gpu/GrDrawContext.cpp (right):

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrDrawContext.c...
src/gpu/GrDrawContext.cpp:291: // Dashing should've been devolved to a path in
SkGpuDevice
so previously this seemed to allow some none dashed PE. Was that always a
mistake? Otherwise we just update comment to be general PE and not just dashing

[bsalomon, 2016-05-09 20:38:55]

https://codereview.chromium.org/1957363002/diff/80001/include/gpu/GrTestUtils.h
File include/gpu/GrTestUtils.h (right):

https://codereview.chromium.org/1957363002/diff/80001/include/gpu/GrTestUtils...
include/gpu/GrTestUtils.h:44: 
On 2016/05/09 20:05:28, robertphillips wrote:
> Can this class go in the .cpp file ?

It's also used by GrDashingEffect's test function.

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrBlurUtils.cpp
File src/gpu/GrBlurUtils.cpp (right):

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrBlurUtils.cpp...
src/gpu/GrBlurUtils.cpp:140: translate.setTranslate(-maskRect->fLeft,
-maskRect->fTop);
On 2016/05/09 20:05:28, robertphillips wrote:
> should this 'style' also be called 'fillOrHairline' ?

Done.

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrDrawContext.cpp
File src/gpu/GrDrawContext.cpp (right):

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrDrawContext.c...
src/gpu/GrDrawContext.cpp:291: // Dashing should've been devolved to a path in
SkGpuDevice
Updated the comment to say path effects instead of dashing. The old type
couldn't represent path effects other than dashing. So no functional change
here.

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrStyle.h
File src/gpu/GrStyle.h (right):

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/GrStyle.h#newco...
src/gpu/GrStyle.h:141: static SkScalar MatrixToScaleFactor(const SkMatrix&
matrix) {
On 2016/05/09 20:05:28, robertphillips wrote:
> we us -> we use ?

Done.

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/batches/GrTesse...
File src/gpu/batches/GrTessellatingPathRenderer.cpp (right):

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/batches/GrTesse...
src/gpu/batches/GrTessellatingPathRenderer.cpp:153: styleScale =
GrStyle::MatrixToScaleFactor(fViewMatrix);
On 2016/05/09 20:05:28, robertphillips wrote:
> stray ';' ?

Done.

https://codereview.chromium.org/1957363002/diff/80001/src/gpu/batches/GrTesse...
src/gpu/batches/GrTessellatingPathRenderer.cpp:160: fPath.isInverseFillType() ?
sizeof(fClipBounds) / sizeof(uint32_t) : 0;
On 2016/05/09 20:05:28, robertphillips wrote:
> can we rm the 32 suffix ?

Done.

[bsalomon, 2016-05-09 20:39:18]

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

[commit-bot: I haz the power, 2016-05-09 20:39:25]

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

[commit-bot: I haz the power, 2016-05-09 20:42:15]

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

[commit-bot: I haz the power, 2016-05-09 20:42:17]

Dry run: Try jobs failed on following builders:
  Build-Win-MSVC-x86-Debug-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Win-MSVC-x86-D...)

[bsalomon, 2016-05-09 21:16:55]

Patchset #4 (id:120001) has been deleted

[bsalomon, 2016-05-09 21:17:04]

Patchset #4 (id:140001) has been deleted

[bsalomon, 2016-05-09 21:19:08]

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

[commit-bot: I haz the power, 2016-05-09 21:19:15]

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

[commit-bot: I haz the power, 2016-05-09 21:40:45]

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

[commit-bot: I haz the power, 2016-05-09 21:40:46]

Dry run: This issue passed the CQ dry run.

[bsalomon, 2016-05-10 12:55:59]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-05-10 12:55:59]

The patchset sent to the CQ was uploaded after l-g-t-m from
robertphillips@google.com
Link to the patchset: https://codereview.chromium.org/1957363002/#ps160001
(title: "don't include private headers in GrTestUtils.h")

[commit-bot: I haz the power, 2016-05-10 12:56:07]

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

[commit-bot: I haz the power, 2016-05-10 12:57:32]

Description was changed from

==========
Replace GrStrokeInfo with GrStyle.

A side effect is that arbitrary path effects can no be pushed deeper into the
Ganesh flow for paths. They may be applied by path renderers.
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
Replace GrStrokeInfo with GrStyle.

A side effect is that arbitrary path effects can no be pushed deeper into the
Ganesh flow for paths. They may be applied by path renderers.
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/33595bdf4b64a745f6340338d307e806e96c587f
==========

[commit-bot: I haz the power, 2016-05-10 12:57:33]

Committed patchset #4 (id:160001) as
https://skia.googlesource.com/skia/+/33595bdf4b64a745f6340338d307e806e96c587f

[bsalomon, 2016-05-10 13:18:55]

A revert of this CL (patchset #4 id:160001) has been created in
https://codereview.chromium.org/1967513002/ by bsalomon@google.com.

The reason for reverting is: Breaking some bots.

[bsalomon, 2016-05-10 15:52:03]

Description was changed from

==========
Replace GrStrokeInfo with GrStyle.

A side effect is that arbitrary path effects can no be pushed deeper into the
Ganesh flow for paths. They may be applied by path renderers.
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/33595bdf4b64a745f6340338d307e806e96c587f
==========

to

==========
Replace GrStrokeInfo with GrStyle.

A side effect is that arbitrary path effects can no be pushed deeper into the
Ganesh flow for paths. They may be applied by path renderers.
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/33595bdf4b64a745f6340338d307e806e96c587f
==========

[bsalomon, 2016-05-10 15:52:09]

The CQ bit was checked by bsalomon@google.com

[bsalomon, 2016-05-10 15:52:09]

The patchset sent to the CQ was uploaded after l-g-t-m from
robertphillips@google.com
Link to the patchset: https://codereview.chromium.org/1957363002/#ps180001
(title: "Fix issue where hairlines were going to MSAAPathRenderer")

[commit-bot: I haz the power, 2016-05-10 16:14:20]

Description was changed from

==========
Replace GrStrokeInfo with GrStyle.

A side effect is that arbitrary path effects can no be pushed deeper into the
Ganesh flow for paths. They may be applied by path renderers.
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/33595bdf4b64a745f6340338d307e806e96c587f
==========

to

==========
Replace GrStrokeInfo with GrStyle.

A side effect is that arbitrary path effects can no be pushed deeper into the
Ganesh flow for paths. They may be applied by path renderers.
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/33595bdf4b64a745f6340338d307e806e96c587f

Committed:
https://skia.googlesource.com/skia/+/6663acff010ce752e4bf778da81fa97448c9db31
==========

[commit-bot: I haz the power, 2016-05-10 16:14:22]

Committed patchset #5 (id:180001) as
https://skia.googlesource.com/skia/+/6663acff010ce752e4bf778da81fa97448c9db31

[Stephen White, 2016-05-17 21:34:29]

senorblanco@chromium.org changed reviewers:
+ senorblanco@chromium.org

[Stephen White, 2016-05-17 21:34:30]

https://codereview.chromium.org/1957363002/diff/180001/src/gpu/batches/GrTess...
File src/gpu/batches/GrTessellatingPathRenderer.cpp (right):

https://codereview.chromium.org/1957363002/diff/180001/src/gpu/batches/GrTess...
src/gpu/batches/GrTessellatingPathRenderer.cpp:163: if (styleDataCnt >= 0) {
Post-landing driveby: could we just assert this is true, given that we've
checked for !args.fStyle->hasNonDashPathEffect() in onCanDrawPath()? Or are
there other conditions which would cause it to occur? If so, could we add those
conditions on onCanDrawPath()? (or make a helper on GrStyle that lets us know
when it can't be key'ed?).

Not doing caching will probably make this path renderer slower than others if we
hit this case.