Fix failures associated with skshaper refactor

Change-Id: I3b58202085df2027ba807471a5e5b79c9c698148
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/820698
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
3 files changed