[skottie] Separate text resize options
The sk_vj text property (Skottie extension) is currently mixing
vertical alignment and resizing semantics into a single enum. This
precludes certain valid combinations.
Split the resize options into a separate enum (ResizePolicy), and ensure
support for all combinations.
Before:
"sk_vj": 0 -> Shaper::VAlign::kVisualTop
"sk_vj": 1 -> Shaper::VAlign::kVisualCenter
"sk_vj": 2 -> Shaper::VAlign::kVisualBottom
"sk_vj": 3 -> Shaper::VAlign::kVisualResizeToFit
"sk_vj": 4 -> Shaper::VAlign::kVisualDownscaleToFit
After:
"sk_vj": 0 -> Shaper::VAlign::kVisualTop
"sk_vj": 1 -> Shaper::VAlign::kVisualCenter
"sk_vj": 2 -> Shaper::VAlign::kVisualBottom
"sk_rs": 0 -> Shaper::ResizePolicy::kNone
"sk_rs": 1 -> Shaper::ResizePolicy::kScaleToFit
"sk_rs": 2 -> Shaper::ResizePolicy::kDownscaleToFit
Bug: skia:9809, skia:9810
Change-Id: I631ae1fa31a9bc9c6958bb480354138591d504ff
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/267040
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Isabel Ren <isabelren@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
8 files changed