aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental/skottie
diff options
context:
space:
mode:
authorGravatar Florin Malita <fmalita@chromium.org>2018-04-25 21:43:03 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-04-26 02:35:10 +0000
commitcd05b196099492da8f4badd3d47a906395fc0b79 (patch)
treeb75c7b86c278d31f438ae2d3733f5c1bafd1cadb /experimental/skottie
parent1366282bc2f2c9566e1ffa77bafb2ec4d8f190df (diff)
[skottie] Add support for inverse mask paths
TBR= Change-Id: I442033b2e82777c90ee497d8a5b2310af1d2e631 Reviewed-on: https://skia-review.googlesource.com/123840 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'experimental/skottie')
-rw-r--r--experimental/skottie/Skottie.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/experimental/skottie/Skottie.cpp b/experimental/skottie/Skottie.cpp
index 7486502f2e..194efe70c4 100644
--- a/experimental/skottie/Skottie.cpp
+++ b/experimental/skottie/Skottie.cpp
@@ -949,19 +949,16 @@ sk_sp<sksg::RenderNode> AttachMask(const Json::Value& jmask,
if (!m.isObject())
continue;
- const auto inverted = ParseDefault(m["inv"], false);
- // TODO
- if (inverted) {
- LogFail(m, "Unsupported inverse mask");
- continue;
- }
-
auto mask_path = AttachPath(m["pt"], ctx);
if (!mask_path) {
LogFail(m, "Could not parse mask path");
continue;
}
+ mask_path->setFillType(ParseDefault(m["inv"], false)
+ ? SkPath::kInverseWinding_FillType
+ : SkPath::kWinding_FillType);
+
SkString mode;
if (!Parse(m["mode"], &mode) ||
mode.size() != 1 ||