222869 2021-03-06 12:34:40 -0800 Move new color(), lab() and lch() color functions behind runtime settings. 2021-03-07 10:17:19 -0800 1 1 1 Unclassified WebKit CSS Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sam sam simon.fraser webkit-bug-importer oldest_to_newest 1736835 0 sam 2021-03-06 12:34:40 -0800 There is enough debate in the CSS working group about the specifics of CSS Color 4 that I think it would be prudent of us to add runtime settings for the new new color(), lab() and lch() functions added in the past few months. 1736878 1 422516 sam 2021-03-06 18:26:39 -0800 Created attachment 422516 Patch 1736940 2 ews-feeder 2021-03-07 10:16:51 -0800 Committed r274053: <https://commits.webkit.org/r274053> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422516. 1736941 3 webkit-bug-importer 2021-03-07 10:17:19 -0800 <rdar://problem/75149189> 422516 2021-03-06 18:26:39 -0800 2021-03-07 10:16:52 -0800 Patch bug-222869-20210306182639.patch text/plain 13736 sam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNzQwNDUpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIxLTAzLTA2ICBTYW0gV2VpbmlnICA8d2Vpbmln QGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIG5ldyBjb2xvcigpLCBsYWIoKSBhbmQgbGNoKCkg Y29sb3IgZnVuY3Rpb25zIGJlaGluZCBydW50aW1lIHNldHRpbmdzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyODY5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL1ByZWZlcmVuY2VzL1dl YlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWw6CisgICAgICAgIEFkZCBleHBlcmltZW50YWwg ZmVhdHVyZSBmbGFnIGZvciB0aGUgbmV3IENTUyBDb2xvciA0IGNvbG9yIHR5cGVzLiAKKwogMjAy MS0wMy0wNiAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgZGxvcGVu X3ByZWZsaWdodCBpcyBmYWlsaW5nICh0ZW1wb3JhcmlseSkgYnV0IG9ic29sZXRlCkluZGV4OiBT b3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNFeHBlcmltZW50YWwu eWFtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJl ZmVyZW5jZXNFeHBlcmltZW50YWwueWFtbAkocmV2aXNpb24gMjc0MDQ1KQorKysgU291cmNlL1dU Ri9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwJKHdv cmtpbmcgY29weSkKQEAgLTExMyw2ICsxMTMsMTggQEAgQ0ZOZXR3b3JrTmV0d29ya0xvYWRlckVu YWJsZWQ6CiAgICAgV2ViS2l0OgogICAgICAgZGVmYXVsdDogZmFsc2UKIAorQ1NTQ29sb3I0Ogor ICB0eXBlOiBib29sCisgIGh1bWFuUmVhZGFibGVOYW1lOiAiQ1NTIENvbG9yIDQgQ29sb3IgVHlw ZXMiCisgIGh1bWFuUmVhZGFibGVEZXNjcmlwdGlvbjogIkVuYWJsZSBzdXBwb3J0IGZvciBDU1Mg Q29sb3IgNCBDb2xvciBUeXBlcyIKKyAgZGVmYXVsdFZhbHVlOgorICAgIFdlYktpdExlZ2FjeToK KyAgICAgIGRlZmF1bHQ6IHRydWUKKyAgICBXZWJLaXQ6CisgICAgICBkZWZhdWx0OiB0cnVlCisg ICAgV2ViQ29yZToKKyAgICAgIGRlZmF1bHQ6IHRydWUKKwogQ1NTQ29sb3JDb250cmFzdEVuYWJs ZWQ6CiAgIHR5cGU6IGJvb2wKICAgaHVtYW5SZWFkYWJsZU5hbWU6ICJDU1MgY29sb3ItY29udHJh c3QoKSIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3NDA0NSkKKysrIFNvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDIxLTAzLTA2ICBT YW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIG5ldyBjb2xvcigp LCBsYWIoKSBhbmQgbGNoKCkgY29sb3IgZnVuY3Rpb25zIGJlaGluZCBydW50aW1lIHNldHRpbmdz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyODY5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGNo ZWNraW5nIGZvciBuZXcgZXhwZXJpbWVudGFsIGZlYXR1cmUgZmxhZyBmb3IgdGhlIG5ldyBDU1Mg Q29sb3IgNCBjb2xvciB0eXBlcy4KKworICAgICAgICBBcyB0aGUgZmxhZyBpcyBvbiBieSBkZWZh dWx0LCB0aGVyZSBpcyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuIFRoaXMgaXMganVzdCB0byBhbGxv dworICAgICAgICBwb3J0cyB0byBkaXNhYmxlIHRoZSBmZWF0dXJlIGlmIHRoZXkgbmVlZCB0by4K KworICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUGFyc2VyQ29udGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpvcGVyYXRvcj09KToKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1BhcnNlckNvbnRl eHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlckNvbnRleHRIYXNoOjpoYXNoKToKKyAg ICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VySGVscGVycy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OnBhcnNlSFdCUGFyYW1ldGVycyk6 CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OnBhcnNlTGFiUGFy YW1ldGVycyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OnBh cnNlTENIUGFyYW1ldGVycyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlckhl bHBlcnM6OnBhcnNlQ29sb3JGdW5jdGlvbkZvclJHQlR5cGVzKToKKyAgICAgICAgKFdlYkNvcmU6 OkNTU1Byb3BlcnR5UGFyc2VySGVscGVyczo6cGFyc2VDb2xvckZ1bmN0aW9uRm9yTGFiUGFyYW1l dGVycyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnM6OnBhcnNl Q29sb3JGdW5jdGlvbkZvclhZWlBhcmFtZXRlcnMpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJv cGVydHlQYXJzZXJIZWxwZXJzOjpwYXJzZUNvbG9yRnVuY3Rpb25QYXJhbWV0ZXJzKToKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VySGVscGVyczo6cGFyc2VDb2xvckZ1bmN0aW9u KToKKwogMjAyMS0wMy0wNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtSZW5kZXJUcmVlQnVpbGRlcl0gSW52YWxpZGF0ZSBiZWZvcmVDaGlsZCB3aGVuIHBhcmVu dCBjaGFuZ2VzIHRvIFJ1YnlCYXNlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NT U1BhcnNlckNvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJz ZXIvQ1NTUGFyc2VyQ29udGV4dC5jcHAJKHJldmlzaW9uIDI3NDA0NSkKKysrIFNvdXJjZS9XZWJD b3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcy LDYgKzcyLDcgQEAgQ1NTUGFyc2VyQ29udGV4dDo6Q1NTUGFyc2VyQ29udGV4dChjb25zdAogICAg ICwgY29sb3JGaWx0ZXJFbmFibGVkIHsgZG9jdW1lbnQuc2V0dGluZ3MoKS5jb2xvckZpbHRlckVu YWJsZWQoKSB9CiAgICAgLCBjb2xvck1peEVuYWJsZWQgeyBkb2N1bWVudC5zZXR0aW5ncygpLmNz c0NvbG9yTWl4RW5hYmxlZCgpIH0KICAgICAsIGNvbnN0YW50UHJvcGVydGllc0VuYWJsZWQgeyBk b2N1bWVudC5zZXR0aW5ncygpLmNvbnN0YW50UHJvcGVydGllc0VuYWJsZWQoKSB9CisgICAgLCBj c3NDb2xvcjQgeyBkb2N1bWVudC5zZXR0aW5ncygpLmNzc0NvbG9yNCgpIH0KICAgICAsIGRlZmVy cmVkQ1NTUGFyc2VyRW5hYmxlZCB7IGRvY3VtZW50LnNldHRpbmdzKCkuZGVmZXJyZWRDU1NQYXJz ZXJFbmFibGVkKCkgfQogICAgICwgZW5mb3JjZXNDU1NNSU1FVHlwZUluTm9RdWlya3NNb2RlIHsg ZG9jdW1lbnQuc2V0dGluZ3MoKS5lbmZvcmNlQ1NTTUlNRVR5cGVJbk5vUXVpcmtzTW9kZSgpIH0K ICAgICAsIGluZGl2aWR1YWxUcmFuc2Zvcm1Qcm9wZXJ0aWVzRW5hYmxlZCB7IGRvY3VtZW50LnNl dHRpbmdzKCkuY3NzSW5kaXZpZHVhbFRyYW5zZm9ybVByb3BlcnRpZXNFbmFibGVkKCkgfQpAQCAt MTExLDYgKzExMiw3IEBAIGJvb2wgb3BlcmF0b3I9PShjb25zdCBDU1NQYXJzZXJDb250ZXh0JiAK ICAgICAgICAgJiYgYS5jb2xvckZpbHRlckVuYWJsZWQgPT0gYi5jb2xvckZpbHRlckVuYWJsZWQK ICAgICAgICAgJiYgYS5jb2xvck1peEVuYWJsZWQgPT0gYi5jb2xvck1peEVuYWJsZWQKICAgICAg ICAgJiYgYS5jb25zdGFudFByb3BlcnRpZXNFbmFibGVkID09IGIuY29uc3RhbnRQcm9wZXJ0aWVz RW5hYmxlZAorICAgICAgICAmJiBhLmNzc0NvbG9yNCA9PSBiLmNzc0NvbG9yNAogICAgICAgICAm JiBhLmRlZmVycmVkQ1NTUGFyc2VyRW5hYmxlZCA9PSBiLmRlZmVycmVkQ1NTUGFyc2VyRW5hYmxl ZAogICAgICAgICAmJiBhLmVuZm9yY2VzQ1NTTUlNRVR5cGVJbk5vUXVpcmtzTW9kZSA9PSBiLmVu Zm9yY2VzQ1NTTUlNRVR5cGVJbk5vUXVpcmtzTW9kZQogICAgICAgICAmJiBhLmluZGl2aWR1YWxU cmFuc2Zvcm1Qcm9wZXJ0aWVzRW5hYmxlZCA9PSBiLmluZGl2aWR1YWxUcmFuc2Zvcm1Qcm9wZXJ0 aWVzRW5hYmxlZApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJDb250 ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJD b250ZXh0LmgJKHJldmlzaW9uIDI3NDA0NSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIv Q1NTUGFyc2VyQ29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC02Miw2ICs2Miw3IEBAIHB1Ymxp YzoKICAgICBib29sIGNvbG9yRmlsdGVyRW5hYmxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBjb2xv ck1peEVuYWJsZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgY29uc3RhbnRQcm9wZXJ0aWVzRW5hYmxl ZCB7IGZhbHNlIH07CisgICAgYm9vbCBjc3NDb2xvcjQgeyBmYWxzZSB9OwogICAgIGJvb2wgZGVm ZXJyZWRDU1NQYXJzZXJFbmFibGVkIHsgZmFsc2UgfTsKICAgICBib29sIGVuZm9yY2VzQ1NTTUlN RVR5cGVJbk5vUXVpcmtzTW9kZSB7IHRydWUgfTsKICAgICBib29sIGluZGl2aWR1YWxUcmFuc2Zv cm1Qcm9wZXJ0aWVzRW5hYmxlZCB7IGZhbHNlIH07CkBAIC0xMTQsMjggKzExNSwyOSBAQCBzdHJ1 Y3QgQ1NTUGFyc2VyQ29udGV4dEhhc2ggewogICAgICAgICAgICAgJiBrZXkuY29sb3JGaWx0ZXJF bmFibGVkICAgICAgICAgICAgICAgICAgICAgICAgPDwgNgogICAgICAgICAgICAgJiBrZXkuY29s b3JNaXhFbmFibGVkICAgICAgICAgICAgICAgICAgICAgICAgICAgPDwgNwogICAgICAgICAgICAg JiBrZXkuY29uc3RhbnRQcm9wZXJ0aWVzRW5hYmxlZCAgICAgICAgICAgICAgICAgPDwgOAotICAg ICAgICAgICAgJiBrZXkuZGVmZXJyZWRDU1NQYXJzZXJFbmFibGVkICAgICAgICAgICAgICAgICAg PDwgOQotICAgICAgICAgICAgJiBrZXkuZW5mb3JjZXNDU1NNSU1FVHlwZUluTm9RdWlya3NNb2Rl ICAgICAgICAgPDwgMTAKLSAgICAgICAgICAgICYga2V5LmluZGl2aWR1YWxUcmFuc2Zvcm1Qcm9w ZXJ0aWVzRW5hYmxlZCAgICAgIDw8IDExCisgICAgICAgICAgICAmIGtleS5jc3NDb2xvcjQgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8PCA5CisgICAgICAgICAgICAmIGtleS5kZWZl cnJlZENTU1BhcnNlckVuYWJsZWQgICAgICAgICAgICAgICAgICA8PCAxMAorICAgICAgICAgICAg JiBrZXkuZW5mb3JjZXNDU1NNSU1FVHlwZUluTm9RdWlya3NNb2RlICAgICAgICAgPDwgMTEKKyAg ICAgICAgICAgICYga2V5LmluZGl2aWR1YWxUcmFuc2Zvcm1Qcm9wZXJ0aWVzRW5hYmxlZCAgICAg IDw8IDEyCiAjaWYgRU5BQkxFKE9WRVJGTE9XX1NDUk9MTElOR19UT1VDSCkKLSAgICAgICAgICAg ICYga2V5LmxlZ2FjeU92ZXJmbG93U2Nyb2xsaW5nVG91Y2hFbmFibGVkICAgICAgIDw8IDEyCisg ICAgICAgICAgICAmIGtleS5sZWdhY3lPdmVyZmxvd1Njcm9sbGluZ1RvdWNoRW5hYmxlZCAgICAg ICA8PCAxMwogI2VuZGlmCi0gICAgICAgICAgICAmIGtleS5vdmVyc2Nyb2xsQmVoYXZpb3JFbmFi bGVkICAgICAgICAgICAgICAgICA8PCAxMwotICAgICAgICAgICAgJiBrZXkucmVsYXRpdmVDb2xv clN5bnRheEVuYWJsZWQgICAgICAgICAgICAgICAgPDwgMTQKLSAgICAgICAgICAgICYga2V5LnNj cm9sbEJlaGF2aW9yRW5hYmxlZCAgICAgICAgICAgICAgICAgICAgIDw8IDE1Ci0gICAgICAgICAg ICAmIGtleS5zcHJpbmdUaW1pbmdGdW5jdGlvbkVuYWJsZWQgICAgICAgICAgICAgICA8PCAxNgor ICAgICAgICAgICAgJiBrZXkub3ZlcnNjcm9sbEJlaGF2aW9yRW5hYmxlZCAgICAgICAgICAgICAg ICAgPDwgMTQKKyAgICAgICAgICAgICYga2V5LnJlbGF0aXZlQ29sb3JTeW50YXhFbmFibGVkICAg ICAgICAgICAgICAgIDw8IDE1CisgICAgICAgICAgICAmIGtleS5zY3JvbGxCZWhhdmlvckVuYWJs ZWQgICAgICAgICAgICAgICAgICAgICA8PCAxNgorICAgICAgICAgICAgJiBrZXkuc3ByaW5nVGlt aW5nRnVuY3Rpb25FbmFibGVkICAgICAgICAgICAgICAgPDwgMTcKICNpZiBFTkFCTEUoVEVYVF9B VVRPU0laSU5HKQotICAgICAgICAgICAgJiBrZXkudGV4dEF1dG9zaXppbmdFbmFibGVkICAgICAg ICAgICAgICAgICAgICAgPDwgMTcKKyAgICAgICAgICAgICYga2V5LnRleHRBdXRvc2l6aW5nRW5h YmxlZCAgICAgICAgICAgICAgICAgICAgIDw8IDE4CiAjZW5kaWYKICNpZiBFTkFCTEUoQ1NTX1RS QU5TRk9STV9TVFlMRV9PUFRJTUlaRURfM0QpCi0gICAgICAgICAgICAmIGtleS50cmFuc2Zvcm1T dHlsZU9wdGltaXplZDNERW5hYmxlZCAgICAgICAgICA8PCAxOAorICAgICAgICAgICAgJiBrZXku dHJhbnNmb3JtU3R5bGVPcHRpbWl6ZWQzREVuYWJsZWQgICAgICAgICAgPDwgMTkKICNlbmRpZgot ICAgICAgICAgICAgJiBrZXkudXNlTGVnYWN5QmFja2dyb3VuZFNpemVTaG9ydGhhbmRCZWhhdmlv ciAgPDwgMTkKLSAgICAgICAgICAgICYga2V5LmZvY3VzVmlzaWJsZUVuYWJsZWQgICAgICAgICAg ICAgICAgICAgICAgIDw8IDIwCisgICAgICAgICAgICAmIGtleS51c2VMZWdhY3lCYWNrZ3JvdW5k U2l6ZVNob3J0aGFuZEJlaGF2aW9yICA8PCAyMAorICAgICAgICAgICAgJiBrZXkuZm9jdXNWaXNp YmxlRW5hYmxlZCAgICAgICAgICAgICAgICAgICAgICAgPDwgMjEKICNpZiBFTkFCTEUoQVRUQUNI TUVOVF9FTEVNRU5UKQotICAgICAgICAgICAgJiBrZXkuYXR0YWNobWVudEVuYWJsZWQgICAgICAg ICAgICAgICAgICAgICAgICAgPDwgMjEKKyAgICAgICAgICAgICYga2V5LmF0dGFjaG1lbnRFbmFi bGVkICAgICAgICAgICAgICAgICAgICAgICAgIDw8IDIyCiAjZW5kaWYKLSAgICAgICAgICAgICYg a2V5Lm1vZGUgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDw8IDIyOyAvLyBL ZWVwIHRoaXMgbGFzdC4KKyAgICAgICAgICAgICYga2V5Lm1vZGUgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDw8IDIzOyAvLyBLZWVwIHRoaXMgbGFzdC4KICAgICAgICAgaGFz aCBePSBXVEY6OmludEhhc2goYml0cyk7CiAgICAgICAgIHJldHVybiBoYXNoOwogICAgIH0KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFy c2VySGVscGVycy5jcHAJKHJldmlzaW9uIDI3NDA0NSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9w YXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE3 NSw2ICsxMTc1LDEwIEBAIHN0YXRpYyBDb2xvciBwYXJzZVJlbGF0aXZlSFdCUGFyYW1ldGVycygK IHN0YXRpYyBDb2xvciBwYXJzZUhXQlBhcmFtZXRlcnMoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFu Z2UsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmIGNvbnRleHQpCiB7CiAgICAgQVNTRVJUKHJhbmdl LnBlZWsoKS5mdW5jdGlvbklkKCkgPT0gQ1NTVmFsdWVId2IpOworCisgICAgaWYgKCFjb250ZXh0 LmNzc0NvbG9yNCkKKyAgICAgICAgcmV0dXJuIHsgfTsKKwogICAgIGF1dG8gYXJncyA9IGNvbnN1 bWVGdW5jdGlvbihyYW5nZSk7CiAKICAgICBpZiAoY29udGV4dC5yZWxhdGl2ZUNvbG9yU3ludGF4 RW5hYmxlZCAmJiBhcmdzLnBlZWsoKS5pZCgpID09IENTU1ZhbHVlRnJvbSkKQEAgLTEyNTAsNiAr MTI1NCwxMCBAQCBzdGF0aWMgQ29sb3IgcGFyc2VSZWxhdGl2ZUxhYlBhcmFtZXRlcnMoCiBzdGF0 aWMgQ29sb3IgcGFyc2VMYWJQYXJhbWV0ZXJzKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBj b25zdCBDU1NQYXJzZXJDb250ZXh0JiBjb250ZXh0KQogewogICAgIEFTU0VSVChyYW5nZS5wZWVr KCkuZnVuY3Rpb25JZCgpID09IENTU1ZhbHVlTGFiKTsKKworICAgIGlmICghY29udGV4dC5jc3ND b2xvcjQpCisgICAgICAgIHJldHVybiB7IH07CisKICAgICBhdXRvIGFyZ3MgPSBjb25zdW1lRnVu Y3Rpb24ocmFuZ2UpOwogCiAgICAgaWYgKGNvbnRleHQucmVsYXRpdmVDb2xvclN5bnRheEVuYWJs ZWQgJiYgYXJncy5wZWVrKCkuaWQoKSA9PSBDU1NWYWx1ZUZyb20pCkBAIC0xMzI2LDYgKzEzMzQs MTAgQEAgc3RhdGljIENvbG9yIHBhcnNlUmVsYXRpdmVMQ0hQYXJhbWV0ZXJzKAogc3RhdGljIENv bG9yIHBhcnNlTENIUGFyYW1ldGVycyhDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgY29uc3Qg Q1NTUGFyc2VyQ29udGV4dCYgY29udGV4dCkKIHsKICAgICBBU1NFUlQocmFuZ2UucGVlaygpLmZ1 bmN0aW9uSWQoKSA9PSBDU1NWYWx1ZUxjaCk7CisKKyAgICBpZiAoIWNvbnRleHQuY3NzQ29sb3I0 KQorICAgICAgICByZXR1cm4geyB9OworCiAgICAgYXV0byBhcmdzID0gY29uc3VtZUZ1bmN0aW9u KHJhbmdlKTsKIAogICAgIGlmIChjb250ZXh0LnJlbGF0aXZlQ29sb3JTeW50YXhFbmFibGVkICYm IGFyZ3MucGVlaygpLmlkKCkgPT0gQ1NTVmFsdWVGcm9tKQpAQCAtMTM1Nyw5ICsxMzY5LDE0IEBA IHN0YXRpYyBDb2xvciBwYXJzZUxDSFBhcmFtZXRlcnMoQ1NTUGFyc2UKICAgICByZXR1cm4gTENI QTxmbG9hdD4geyBzdGF0aWNfY2FzdDxmbG9hdD4obm9ybWFsaXplZExpZ2h0bmVzcyksIHN0YXRp Y19jYXN0PGZsb2F0Pihub3JtYWxpemVkQ2hyb21hKSwgc3RhdGljX2Nhc3Q8ZmxvYXQ+KG5vcm1h bGl6ZWRIdWUpLCBzdGF0aWNfY2FzdDxmbG9hdD4oKmFscGhhKSB9OwogfQogCi10ZW1wbGF0ZTx0 eXBlbmFtZSBDb2xvclR5cGU+IHN0YXRpYyBDb2xvciBwYXJzZUNvbG9yRnVuY3Rpb25Gb3JSR0JU eXBlcyhDU1NQYXJzZXJUb2tlblJhbmdlJiBhcmdzKQordGVtcGxhdGU8dHlwZW5hbWUgQ29sb3JU eXBlPiBzdGF0aWMgQ29sb3IgcGFyc2VDb2xvckZ1bmN0aW9uRm9yUkdCVHlwZXMoQ1NTUGFyc2Vy VG9rZW5SYW5nZSYgYXJncywgY29uc3QgQ1NTUGFyc2VyQ29udGV4dCYgY29udGV4dCkKIHsKICAg ICBBU1NFUlQoYXJncy5wZWVrKCkuaWQoKSA9PSBDU1NWYWx1ZUE5OFJnYiB8fCBhcmdzLnBlZWso KS5pZCgpID09IENTU1ZhbHVlRGlzcGxheVAzIHx8IGFyZ3MucGVlaygpLmlkKCkgPT0gQ1NTVmFs dWVQcm9waG90b1JnYiB8fCBhcmdzLnBlZWsoKS5pZCgpID09IENTU1ZhbHVlUmVjMjAyMCB8fCBh cmdzLnBlZWsoKS5pZCgpID09IENTU1ZhbHVlU1JHQik7CisKKyAgICAvLyBTdXBwb3J0IHNSR0Ig YW5kIERpc3BsYXktUDMgcmVnYXJkbGVzcyBvZiB0aGUgc2V0dGluZyBhcyB3ZSBoYXZlIHNoaXBw ZWQgc3VwcG9ydCBmb3IgdGhlbSBmb3IgYSB3aGlsZS4KKyAgICBpZiAoIWNvbnRleHQuY3NzQ29s b3I0ICYmIChhcmdzLnBlZWsoKS5pZCgpID09IENTU1ZhbHVlQTk4UmdiIHx8IGFyZ3MucGVlaygp LmlkKCkgPT0gQ1NTVmFsdWVQcm9waG90b1JnYiB8fCBhcmdzLnBlZWsoKS5pZCgpID09IENTU1Zh bHVlUmVjMjAyMCkpCisgICAgICAgIHJldHVybiB7IH07CisKICAgICBjb25zdW1lSWRlbnRSYXco YXJncyk7CiAKICAgICBkb3VibGUgY2hhbm5lbHNbM10gPSB7IDAsIDAsIDAgfTsKQEAgLTEzNzcs OSArMTM5NCwxMyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBDb2xvclR5cGU+IHN0YXRpYyBDb2xvCiAg ICAgcmV0dXJuIHsgQ29sb3JUeXBlIHsgY2xhbXBUbzxmbG9hdD4oY2hhbm5lbHNbMF0sIDAuMCwg MS4wKSwgY2xhbXBUbzxmbG9hdD4oY2hhbm5lbHNbMV0sIDAuMCwgMS4wKSwgY2xhbXBUbzxmbG9h dD4oY2hhbm5lbHNbMl0sIDAuMCwgMS4wKSwgc3RhdGljX2Nhc3Q8ZmxvYXQ+KCphbHBoYSkgfSwg Q29sb3I6OkZsYWdzOjpVc2VDb2xvckZ1bmN0aW9uU2VyaWFsaXphdGlvbiB9OwogfQogCi1zdGF0 aWMgQ29sb3IgcGFyc2VDb2xvckZ1bmN0aW9uRm9yTGFiUGFyYW1ldGVycyhDU1NQYXJzZXJUb2tl blJhbmdlJiBhcmdzKQorc3RhdGljIENvbG9yIHBhcnNlQ29sb3JGdW5jdGlvbkZvckxhYlBhcmFt ZXRlcnMoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgYXJncywgY29uc3QgQ1NTUGFyc2VyQ29udGV4dCYg Y29udGV4dCkKIHsKICAgICBBU1NFUlQoYXJncy5wZWVrKCkuaWQoKSA9PSBDU1NWYWx1ZUxhYik7 CisKKyAgICBpZiAoIWNvbnRleHQuY3NzQ29sb3I0KQorICAgICAgICByZXR1cm4geyB9OworCiAg ICAgY29uc3VtZUlkZW50UmF3KGFyZ3MpOwogCiAgICAgZG91YmxlIGNoYW5uZWxzWzNdID0geyAw LCAwLCAwIH07CkBAIC0xNDA5LDkgKzE0MzAsMTMgQEAgc3RhdGljIENvbG9yIHBhcnNlQ29sb3JG dW5jdGlvbkZvckxhYlBhcgogICAgIHJldHVybiB7IExhYjxmbG9hdD4geyBzdGF0aWNfY2FzdDxm bG9hdD4obm9ybWFsaXplZExpZ2h0bmVzcyksIHN0YXRpY19jYXN0PGZsb2F0PihjaGFubmVsc1sx XSksIHN0YXRpY19jYXN0PGZsb2F0PihjaGFubmVsc1syXSksIHN0YXRpY19jYXN0PGZsb2F0Pigq YWxwaGEpIH0sIENvbG9yOjpGbGFnczo6VXNlQ29sb3JGdW5jdGlvblNlcmlhbGl6YXRpb24gfTsK IH0KIAotc3RhdGljIENvbG9yIHBhcnNlQ29sb3JGdW5jdGlvbkZvclhZWlBhcmFtZXRlcnMoQ1NT UGFyc2VyVG9rZW5SYW5nZSYgYXJncykKK3N0YXRpYyBDb2xvciBwYXJzZUNvbG9yRnVuY3Rpb25G b3JYWVpQYXJhbWV0ZXJzKENTU1BhcnNlclRva2VuUmFuZ2UmIGFyZ3MsIGNvbnN0IENTU1BhcnNl ckNvbnRleHQmIGNvbnRleHQpCiB7CiAgICAgQVNTRVJUKGFyZ3MucGVlaygpLmlkKCkgPT0gQ1NT VmFsdWVYeXopOworCisgICAgaWYgKCFjb250ZXh0LmNzc0NvbG9yNCkKKyAgICAgICAgcmV0dXJu IHsgfTsKKwogICAgIGNvbnN1bWVJZGVudFJhdyhhcmdzKTsKIAogICAgIGRvdWJsZSBjaGFubmVs c1szXSA9IHsgMCwgMCwgMCB9OwpAQCAtMTQzOSw3ICsxNDY0LDcgQEAgc3RhdGljIENvbG9yIHBh cnNlQ29sb3JGdW5jdGlvbkZvclhZWlBhcgogICAgIHJldHVybiB7IFhZWkE8ZmxvYXQsIFdoaXRl UG9pbnQ6OkQ1MD4geyBzdGF0aWNfY2FzdDxmbG9hdD4oY2hhbm5lbHNbMF0pLCBzdGF0aWNfY2Fz dDxmbG9hdD4oY2hhbm5lbHNbMV0pLCBzdGF0aWNfY2FzdDxmbG9hdD4oY2hhbm5lbHNbMl0pLCBz dGF0aWNfY2FzdDxmbG9hdD4oKmFscGhhKSB9LCBDb2xvcjo6RmxhZ3M6OlVzZUNvbG9yRnVuY3Rp b25TZXJpYWxpemF0aW9uIH07CiB9CiAKLXN0YXRpYyBDb2xvciBwYXJzZUNvbG9yRnVuY3Rpb25Q YXJhbWV0ZXJzKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQorc3RhdGljIENvbG9yIHBhcnNl Q29sb3JGdW5jdGlvblBhcmFtZXRlcnMoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIGNvbnN0 IENTU1BhcnNlckNvbnRleHQmIGNvbnRleHQpCiB7CiAgICAgQVNTRVJUKHJhbmdlLnBlZWsoKS5m dW5jdGlvbklkKCkgPT0gQ1NTVmFsdWVDb2xvcik7CiAgICAgYXV0byBhcmdzID0gY29uc3VtZUZ1 bmN0aW9uKHJhbmdlKTsKQEAgLTE0NDcsMjUgKzE0NzIsMjUgQEAgc3RhdGljIENvbG9yIHBhcnNl Q29sb3JGdW5jdGlvblBhcmFtZXRlcgogICAgIENvbG9yIGNvbG9yOwogICAgIHN3aXRjaCAoYXJn cy5wZWVrKCkuaWQoKSkgewogICAgIGNhc2UgQ1NTVmFsdWVBOThSZ2I6Ci0gICAgICAgIGNvbG9y ID0gcGFyc2VDb2xvckZ1bmN0aW9uRm9yUkdCVHlwZXM8QTk4UkdCPGZsb2F0Pj4oYXJncyk7Cisg ICAgICAgIGNvbG9yID0gcGFyc2VDb2xvckZ1bmN0aW9uRm9yUkdCVHlwZXM8QTk4UkdCPGZsb2F0 Pj4oYXJncywgY29udGV4dCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ1NTVmFsdWVEaXNw bGF5UDM6Ci0gICAgICAgIGNvbG9yID0gcGFyc2VDb2xvckZ1bmN0aW9uRm9yUkdCVHlwZXM8RGlz cGxheVAzPGZsb2F0Pj4oYXJncyk7CisgICAgICAgIGNvbG9yID0gcGFyc2VDb2xvckZ1bmN0aW9u Rm9yUkdCVHlwZXM8RGlzcGxheVAzPGZsb2F0Pj4oYXJncywgY29udGV4dCk7CiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgQ1NTVmFsdWVMYWI6Ci0gICAgICAgIGNvbG9yID0gcGFyc2VDb2xvckZ1 bmN0aW9uRm9yTGFiUGFyYW1ldGVycyhhcmdzKTsKKyAgICAgICAgY29sb3IgPSBwYXJzZUNvbG9y RnVuY3Rpb25Gb3JMYWJQYXJhbWV0ZXJzKGFyZ3MsIGNvbnRleHQpOwogICAgICAgICBicmVhazsK ICAgICBjYXNlIENTU1ZhbHVlUHJvcGhvdG9SZ2I6Ci0gICAgICAgIGNvbG9yID0gcGFyc2VDb2xv ckZ1bmN0aW9uRm9yUkdCVHlwZXM8UHJvUGhvdG9SR0I8ZmxvYXQ+PihhcmdzKTsKKyAgICAgICAg Y29sb3IgPSBwYXJzZUNvbG9yRnVuY3Rpb25Gb3JSR0JUeXBlczxQcm9QaG90b1JHQjxmbG9hdD4+ KGFyZ3MsIGNvbnRleHQpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIENTU1ZhbHVlUmVjMjAy MDoKLSAgICAgICAgY29sb3IgPSBwYXJzZUNvbG9yRnVuY3Rpb25Gb3JSR0JUeXBlczxSZWMyMDIw PGZsb2F0Pj4oYXJncyk7CisgICAgICAgIGNvbG9yID0gcGFyc2VDb2xvckZ1bmN0aW9uRm9yUkdC VHlwZXM8UmVjMjAyMDxmbG9hdD4+KGFyZ3MsIGNvbnRleHQpOwogICAgICAgICBicmVhazsKICAg ICBjYXNlIENTU1ZhbHVlU1JHQjoKLSAgICAgICAgY29sb3IgPSBwYXJzZUNvbG9yRnVuY3Rpb25G b3JSR0JUeXBlczxTUkdCQTxmbG9hdD4+KGFyZ3MpOworICAgICAgICBjb2xvciA9IHBhcnNlQ29s b3JGdW5jdGlvbkZvclJHQlR5cGVzPFNSR0JBPGZsb2F0Pj4oYXJncywgY29udGV4dCk7CiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgQ1NTVmFsdWVYeXo6Ci0gICAgICAgIGNvbG9yID0gcGFyc2VD b2xvckZ1bmN0aW9uRm9yWFlaUGFyYW1ldGVycyhhcmdzKTsKKyAgICAgICAgY29sb3IgPSBwYXJz ZUNvbG9yRnVuY3Rpb25Gb3JYWVpQYXJhbWV0ZXJzKGFyZ3MsIGNvbnRleHQpOwogICAgICAgICBi cmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4geyB9OwpAQCAtMTk2Nyw3ICsxOTky LDcgQEAgc3RhdGljIENvbG9yIHBhcnNlQ29sb3JGdW5jdGlvbihDU1NQYXJzZQogICAgICAgICBj b2xvciA9IHBhcnNlTENIUGFyYW1ldGVycyhjb2xvclJhbmdlLCBjb250ZXh0KTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBDU1NWYWx1ZUNvbG9yOgotICAgICAgICBjb2xvciA9IHBhcnNlQ29s b3JGdW5jdGlvblBhcmFtZXRlcnMoY29sb3JSYW5nZSk7CisgICAgICAgIGNvbG9yID0gcGFyc2VD b2xvckZ1bmN0aW9uUGFyYW1ldGVycyhjb2xvclJhbmdlLCBjb250ZXh0KTsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBDU1NWYWx1ZUNvbG9yQ29udHJhc3Q6CiAgICAgICAgIGNvbG9yID0gcGFy c2VDb2xvckNvbnRyYXN0RnVuY3Rpb25QYXJhbWV0ZXJzKGNvbG9yUmFuZ2UsIGNvbnRleHQpOwo=