Revert of Make GrStyle more sk_sp savy

Revert of Make GrStyle more sk_sp savy (patchset #1 id:1 of https://codereview.chromium.org/1947543002/ )

Reason for revert:
Crashing Ubuntu/GCC bot (but not clang)

Original issue's description:
> Make GrStyle more sk_sp savy
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1947543002
> 
> Committed: https://skia.googlesource.com/skia/+/46db22f1cfc65a7a4f1de13d774718347362f60f

TBR=robertphillips@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed: https://skia.googlesource.com/skia/+/308febaebd7048041ecd3ef4487e893238119d08

[bsalomon, 2016-05-03 17:11:49]

Created Revert of Make GrStyle more sk_sp savy

[commit-bot: I haz the power, 2016-05-03 17:11:51]

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

[commit-bot: I haz the power, 2016-05-03 17:11:57]

Description was changed from

==========
Revert of Make GrStyle more sk_sp savy (patchset #1 id:1 of
https://codereview.chromium.org/1947543002/ )

Reason for revert:
Crashing Ubuntu/GCC bot (but not clang)

Original issue's description:
> Make GrStyle more sk_sp savy
> GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
> 
> Committed:
https://skia.googlesource.com/skia/+/46db22f1cfc65a7a4f1de13d774718347362f60f

TBR=robertphillips@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
==========

to

==========
Revert of Make GrStyle more sk_sp savy (patchset #1 id:1 of
https://codereview.chromium.org/1947543002/ )

Reason for revert:
Crashing Ubuntu/GCC bot (but not clang)

Original issue's description:
> Make GrStyle more sk_sp savy
> GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
> 
> Committed:
https://skia.googlesource.com/skia/+/46db22f1cfc65a7a4f1de13d774718347362f60f

TBR=robertphillips@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed:
https://skia.googlesource.com/skia/+/308febaebd7048041ecd3ef4487e893238119d08
==========

[commit-bot: I haz the power, 2016-05-03 17:11:58]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/308febaebd7048041ecd3ef4487e893238119d08