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
Review-Url: https://codereview.chromium.org/
1943973002