forked from flutter/engine
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[skottie] Fill-over-stroke support for text
AE allows selecting the paint order when both fill & stroke are present. The CL also fixes some text stroke issues: stroke width not parsed correctly and not actually used on the paint. Change-Id: Iec27bb65d09f689365e43b801d3844106780572b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/301857 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Florin Malita <fmalita@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
- Loading branch information
Showing
5 changed files
with
35 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"v":"5.7.0","fr":60,"ip":0,"op":421,"w":500,"h":500,"nm":"fill/stroke order","ddd":0,"assets":[],"fonts":{"list":[{"fName":"Arial-BoldMT","fFamily":"Arial","fStyle":"Bold","ascent":78.6476929411292}]},"layers":[{"ddd":0,"ind":1,"ty":5,"nm":"all fills/strokes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[364.5,369.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"t":{"d":{"k":[{"s":{"sz":[209,149],"ps":[-104.5,-74.5],"s":45,"f":"Arial-BoldMT","t":"Foo Bar Baz","j":2,"tr":0,"lh":54,"ls":0,"fc":[0,0.961,0],"sc":[1,0,0],"sw":3,"of":false},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[{"nm":"Animator 1","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":1,"rn":0,"sh":1,"r":1},"a":{"t":{"a":0,"k":-15,"ix":89}}}]},"ip":0,"op":421,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":5,"nm":"all strokes/fills","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[141.5,369.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"t":{"d":{"k":[{"s":{"sz":[209,149],"ps":[-104.5,-74.5],"s":45,"f":"Arial-BoldMT","t":"Foo Bar Baz","j":2,"tr":0,"lh":54,"ls":0,"fc":[0,0.961,0],"sc":[1,0,0],"sw":3,"of":true},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[{"nm":"Animator 1","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":1,"rn":0,"sh":1,"r":1},"a":{"t":{"a":0,"k":-15,"ix":89}}}]},"ip":0,"op":421,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":5,"nm":"fill/stroke","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[364.5,183.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"t":{"d":{"k":[{"s":{"sz":[209,149],"ps":[-104.5,-74.5],"s":45,"f":"Arial-BoldMT","t":"Foo Bar Baz","j":2,"tr":0,"lh":54,"ls":0,"fc":[0,0.961,0],"sc":[1,0,0],"sw":3,"of":false},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[{"nm":"Animator 1","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":1,"rn":0,"sh":1,"r":1},"a":{"t":{"a":0,"k":-15,"ix":89}}}]},"ip":0,"op":421,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":5,"nm":"stroke/fill","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[141.5,183.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"t":{"d":{"k":[{"s":{"sz":[209,149],"ps":[-104.5,-74.5],"s":45,"f":"Arial-BoldMT","t":"Foo Bar Baz","j":2,"tr":0,"lh":54,"ls":0,"fc":[0,0.961,0],"sc":[1,0,0],"sw":3,"of":true},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[{"nm":"Animator 1","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":1,"rn":0,"sh":1,"r":1},"a":{"t":{"a":0,"k":-15,"ix":89}}}]},"ip":0,"op":421,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":1,"nm":"White Solid 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[250,250,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"sw":500,"sh":500,"sc":"#ffffff","ip":0,"op":421,"st":0,"bm":0}],"markers":[],"chars":[{"ch":"F","size":45,"style":"Bold","w":61.08,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[21.826,0],[21.826,-30.42],[51.709,-30.42],[51.709,-42.529],[21.826,-42.529],[21.826,-59.473],[56.445,-59.473],[56.445,-71.582],[7.373,-71.582],[7.373,0]],"c":true},"ix":2},"nm":"F","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"F","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Arial"},{"ch":"o","size":45,"style":"Bold","w":61.08,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.246,-4.15],[-4.314,-2.148],[-4.753,0],[-5.062,5.16],[0,7.845],[5.013,5.095],[7.845,0],[4.118,-2.246],[2.246,-4.264],[0,-4.557]],"o":[[2.246,4.15],[4.313,2.148],[7.682,0],[5.061,-5.159],[0,-7.78],[-5.013,-5.094],[-5.078,0],[-4.118,2.246],[-2.246,4.265],[0,5.957]],"v":[[7.373,-11.499],[17.212,-2.051],[30.811,1.172],[49.927,-6.567],[57.52,-26.074],[50,-45.386],[30.713,-53.027],[16.919,-49.658],[7.373,-39.893],[4.004,-26.66]],"c":true},"ix":2},"nm":"o","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-2.441,2.734],[-3.581,0],[-2.425,-2.734],[0,-5.078],[2.425,-2.734],[3.58,0],[2.441,2.734],[0,5.144]],"o":[[2.441,-2.734],[3.58,0],[2.425,2.734],[0,5.209],[-2.425,2.734],[-3.581,0],[-2.441,-2.734],[0,-5.143]],"v":[[21.729,-37.744],[30.762,-41.846],[39.771,-37.744],[43.408,-26.025],[39.771,-14.111],[30.762,-10.01],[21.729,-14.111],[18.066,-25.928]],"c":true},"ix":2},"nm":"o","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"o","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Arial"},{"ch":" ","size":45,"style":"Bold","w":27.78,"data":{},"fFamily":"Arial"},{"ch":"B","size":45,"style":"Bold","w":72.22,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[-2.409,0.261],[-2.621,1.839],[-1.514,3.076],[0,3.255],[2.344,3.06],[4.362,1.27],[-1.807,2.8],[0,3.353],[1.465,2.49],[2.197,1.498],[2.783,0.472],[5.664,0],[0,0]],"o":[[0,0],[9.212,-0.065],[3.841,-0.423],[2.62,-1.839],[1.514,-3.076],[0,-4.134],[-2.344,-3.059],[3.092,-1.399],[1.807,-2.799],[0,-3.092],[-1.465,-2.49],[-2.197,-1.497],[-2.783,-0.471],[0,0],[0,0]],"v":[[7.324,0],[31.689,0],[49.121,-0.488],[58.813,-3.882],[65.015,-11.255],[67.285,-20.752],[63.77,-31.543],[53.711,-38.037],[61.06,-44.336],[63.77,-53.564],[61.572,-61.938],[56.079,-67.92],[48.608,-70.874],[35.938,-71.582],[7.324,-71.582]],"c":true},"ix":2},"nm":"B","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-1.433,-0.163],[-1.221,-1.383],[0,-2.213],[1.416,-1.416],[2.473,-0.293],[5.631,0],[0,0],[0,0]],"o":[[6.803,0],[2.409,0.293],[1.221,1.384],[0,2.312],[-1.416,1.416],[-1.367,0.163],[0,0],[0,0],[0,0]],"v":[[30.078,-59.668],[42.432,-59.424],[47.876,-56.909],[49.707,-51.514],[47.583,-45.923],[41.748,-43.359],[31.25,-43.115],[21.777,-43.115],[21.777,-59.668]],"c":true},"ix":2},"nm":"B","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[-1.97,-0.684],[-1.042,-1.497],[0,-2.148],[1.35,-1.514],[2.148,-0.391],[5.208,0],[0,0],[0,0]],"o":[[6.575,0],[1.969,0.684],[1.041,1.498],[0,2.539],[-1.351,1.514],[-1.4,0.293],[0,0],[0,0],[0,0]],"v":[[33.447,-31.201],[46.265,-30.176],[50.781,-26.904],[52.344,-21.436],[50.317,-15.356],[45.068,-12.5],[35.156,-12.061],[21.777,-12.061],[21.777,-31.201]],"c":true},"ix":2},"nm":"B","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"B","np":6,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Arial"},{"ch":"a","size":45,"style":"Bold","w":55.62,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.367,0.961],[-2.441,0],[-1.302,-1.123],[0,-2.637],[0,0],[6.413,-1.204],[2.522,-1.221],[1.399,-2.295],[0,-2.93],[-3.076,-2.897],[-5.339,0],[-2.67,1.139],[-2.344,2.279],[-0.228,-0.813],[-0.359,-0.911],[0,0],[0.439,2.165],[0,4.558],[0,0],[1.221,2.23],[2.995,1.449],[6.12,0],[3.418,-2.409],[1.399,-5.013],[0,0]],"o":[[1.367,-0.96],[3.613,0],[1.302,1.123],[0,0],[-2.474,1.042],[-4.753,0.912],[-2.523,1.221],[-1.4,2.295],[0,4.427],[3.076,2.898],[3.027,0],[2.669,-1.139],[0.098,0.261],[0.52,1.791],[0,0],[-1.205,-2.473],[-0.439,-2.164],[0,0],[0,-5.957],[-1.221,-2.229],[-2.995,-1.448],[-6.738,0],[-3.418,2.409],[0,0],[0.846,-2.409]],"v":[[20.752,-41.089],[26.465,-42.529],[33.838,-40.845],[35.791,-35.205],[35.791,-33.838],[22.461,-30.469],[11.548,-27.271],[5.664,-21.997],[3.564,-14.16],[8.179,-3.174],[20.801,1.172],[29.346,-0.537],[36.865,-5.664],[37.354,-4.053],[38.672,0],[52.246,0],[49.78,-6.958],[49.121,-17.041],[49.268,-33.057],[47.437,-45.337],[41.113,-50.854],[27.441,-53.027],[12.207,-49.414],[4.98,-38.281],[17.432,-36.035]],"c":true},"ix":2},"nm":"a","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0.358,-1.172],[1.66,-1.237],[2.473,0],[1.432,1.4],[0,1.921],[-1.791,1.27],[-3.809,0.814],[-1.758,0.586]],"o":[[0,3.288],[-0.521,1.791],[-2.246,1.628],[-2.214,0],[-1.433,-1.399],[0,-1.953],[1.172,-0.781],[3.809,-0.813],[0,0]],"v":[[35.791,-22.168],[35.254,-15.479],[31.982,-10.938],[24.902,-8.496],[19.434,-10.596],[17.285,-15.576],[19.971,-20.41],[27.441,-22.803],[35.791,-24.902]],"c":true},"ix":2},"nm":"a","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"a","np":5,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Arial"},{"ch":"r","size":45,"style":"Bold","w":38.92,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-0.765,2.767],[-1.335,1.058],[-1.921,0],[-2.312,-1.497],[0,0],[3.125,0],[1.741,-1.106],[2.18,-3.483],[0,0],[0,0],[0,0],[0,0]],"o":[[0,-8.821],[0.764,-2.766],[1.334,-1.057],[1.985,0],[0,0],[-2.898,-1.725],[-2.214,0],[-1.742,1.107],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[20.312,-16.016],[21.46,-33.398],[24.609,-39.136],[29.492,-40.723],[35.938,-38.477],[40.186,-50.439],[31.152,-53.027],[25.22,-51.367],[19.336,-44.482],[19.336,-51.855],[6.592,-51.855],[6.592,0],[20.312,0]],"c":true},"ix":2},"nm":"r","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"r","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Arial"},{"ch":"z","size":45,"style":"Bold","w":50,"data":{"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[3.809,-0.227],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-1.595,0.098],[3.19,-3.645],[0,0],[0,0]],"o":[[0,0],[0,0],[-0.912,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[2.604,-0.032],[-1.53,1.53],[0,0],[0,0],[0,0]],"v":[[47.949,0],[47.949,-12.061],[26.709,-12.061],[19.629,-11.719],[26.611,-19.287],[46.436,-42.139],[46.436,-51.855],[3.564,-51.855],[3.564,-40.479],[21.875,-40.576],[28.174,-40.771],[21.094,-33.008],[1.66,-10.693],[1.66,0]],"c":true},"ix":2},"nm":"z","mn":"ADBE Vector Shape - Group","hd":false}],"nm":"z","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}]},"fFamily":"Arial"}]} |