241209 2022-06-01 18:40:28 -0700 AX ITM: Remaining WTR::AccessibilityUIElement calls into the Mac accessibility API must be dispatched to the AX thread. 2022-06-02 06:01:58 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 andresg_22 cfleizach tyler_w webkit-bug-importer oldest_to_newest 1873466 0 andresg_22 2022-06-01 18:40:28 -0700 There are a few calls in WTR::AccessibilityUIElement into the Mac WebAccessibilityObjectWrapper API that need to be dispatched to the AX thread for testing purposes. 1873467 1 webkit-bug-importer 2022-06-01 18:40:35 -0700 <rdar://problem/94260093> 1873478 2 459948 andresg_22 2022-06-01 18:56:35 -0700 Created attachment 459948 Patch 1873512 3 tyler_w 2022-06-01 21:54:17 -0700 Looks good to me. 1873570 4 ews-feeder 2022-06-02 06:01:56 -0700 Committed r295125 (251216@main): <https://commits.webkit.org/251216@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459948. 459948 2022-06-01 18:56:35 -0700 2022-06-02 06:01:57 -0700 Patch bug-241209-20220601215634.patch text/plain 10296 andresg_22 RnJvbSBhYTEzYjQ2MDE2ODczZGY4MTVkMTIyOWNhZjU0ZDg3MGM4NDk1Mzg1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDEyIEFwciAyMDIyIDEwOjU5OjUzIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0g QVggSVRNOiBSZW1haW5pbmcgV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50IGNhbGxzIGludG8g dGhlCiBNYWMgYWNjZXNzaWJpbGl0eSBBUEkgbXVzdCBiZSBkaXNwYXRjaGVkIHRvIHRoZSBBWCB0 aHJlYWQuCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxMjA5CgpS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoZXJlIHdhcyBhIGhhbmRmdWwgb2YgY2FsbHMg aW50byBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBtZXRob2RzIHRoYXQgc3RpbGwgbmVl ZGVkIHRvIGJlIGRpc3BhdGNoZWQgdG8gdGhlIEFYIHRocmVhZCBmb3IgdGVzdGluZyBwdXJwb3Nl cyBpbiBpc29sYXRlZCB0cmVlIG1vZGUuIEluIHBhcnRpY3VsYXIsIFtXZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5UGVyZm9ybUFjdGlvbl0gYW5kIFtXZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5QWN0aW9uTmFtZXNdLgoKKiBUb29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaDoK KiBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9BY2Nlc3NpYmlsaXR5 VUlFbGVtZW50TWFjLm1tOgooV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpwYXJhbWV0ZXJp emVkQXR0cmlidXRlTmFtZXMpOgooV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpzY3JvbGxU b01ha2VWaXNpYmxlKToKKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6c2Nyb2xsVG9HbG9i YWxQb2ludCk6CihXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnNjcm9sbFRvTWFrZVZpc2li bGVXaXRoU3ViRm9jdXMpOgooV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpkaXNtaXNzKToK KFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aW5jcmVtZW50KToKKFdUUjo6QWNjZXNzaWJp bGl0eVVJRWxlbWVudDo6ZGVjcmVtZW50KToKKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6 YXN5bmNJbmNyZW1lbnQpOgooV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojphc3luY0RlY3Jl bWVudCk6CihXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnNob3dNZW51KToKKFdUUjo6QWNj ZXNzaWJpbGl0eVVJRWxlbWVudDo6cHJlc3MpOgooV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50 OjpzeW5jUHJlc3MpOgooV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojppc0lnbm9yZWQgY29u c3QpOgooV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjppbnNlcnRUZXh0KToKKFdUUjo6QWNj ZXNzaWJpbGl0eVVJRWxlbWVudDo6cGVyZm9ybUFjdGlvbiBjb25zdCk6Ci0tLQogLi4uL0luamVj dGVkQnVuZGxlL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaCAgIHwgICAyICsKIC4uLi9tYWMvQWNj ZXNzaWJpbGl0eVVJRWxlbWVudE1hYy5tbSAgICAgICAgICB8IDExOSArKysrKysrKysrLS0tLS0t LS0KIDIgZmlsZXMgY2hhbmdlZCwgNjkgaW5zZXJ0aW9ucygrKSwgNTIgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9BY2Nlc3Np YmlsaXR5VUlFbGVtZW50LmggYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxl L0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaAppbmRleCAyMjZhNGE3OGIzNTkuLmJkOTk0MDcyMzA0 YyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9BY2Nl c3NpYmlsaXR5VUlFbGVtZW50LmgKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3Rl ZEJ1bmRsZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmgKQEAgLTEzMyw2ICsxMzMsOCBAQCBwdWJs aWM6CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIFJldGFpblB0cjxpZD4gYXR0cmlidXRlVmFsdWUo TlNTdHJpbmcgKikgY29uc3Q7CiAgICAgdm9pZCBhdHRyaWJ1dGVWYWx1ZUFzeW5jKEpTU3RyaW5n UmVmIGF0dHJpYnV0ZSwgSlNWYWx1ZVJlZiBjYWxsYmFjayk7CisgICAgTlNBcnJheSAqYWN0aW9u TmFtZXMoKSBjb25zdDsKKyAgICB2b2lkIHBlcmZvcm1BY3Rpb24oTlNTdHJpbmcgKikgY29uc3Q7 CiAjZWxzZQogICAgIHZvaWQgYXR0cmlidXRlVmFsdWVBc3luYyhKU1N0cmluZ1JlZiBhdHRyaWJ1 dGUsIEpTVmFsdWVSZWYgY2FsbGJhY2spIHsgfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50 TWFjLm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvQWNjZXNz aWJpbGl0eVVJRWxlbWVudE1hYy5tbQppbmRleCBhMzBiYmMwMjAyY2MuLjdmYmE1MTg4YmVhNyAx MDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvQWNj ZXNzaWJpbGl0eVVJRWxlbWVudE1hYy5tbQorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCkBAIC03MzEsMTMg KzczMSwxNyBAQCBib29sIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmlzQXR0cmlidXRlU3VwcG9y dGVkKEpTU3RyaW5nUmVmIGF0dHJpYnV0ZSkKIAogSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+IEFj Y2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnBhcmFtZXRlcml6ZWRBdHRyaWJ1dGVOYW1lcygpCiB7Ci0g ICAgTlNBcnJheSogc3VwcG9ydGVkUGFyYW1ldGVyaXplZEF0dHJpYnV0ZXMgPSBbbV9lbGVtZW50 IGFjY2Vzc2liaWxpdHlQYXJhbWV0ZXJpemVkQXR0cmlidXRlTmFtZXNdOwotICAgIAotICAgIE5T TXV0YWJsZVN0cmluZyogYXR0cmlidXRlc1N0cmluZyA9IFtOU011dGFibGVTdHJpbmcgc3RyaW5n XTsKLSAgICBmb3IgKE5TVUludGVnZXIgaSA9IDA7IGkgPCBbc3VwcG9ydGVkUGFyYW1ldGVyaXpl ZEF0dHJpYnV0ZXMgY291bnRdOyArK2kpIHsKLSAgICAgICAgW2F0dHJpYnV0ZXNTdHJpbmcgYXBw ZW5kRm9ybWF0OkAiJUBcbiIsIFtzdXBwb3J0ZWRQYXJhbWV0ZXJpemVkQXR0cmlidXRlcyBvYmpl Y3RBdEluZGV4OmldXTsKLSAgICB9Ci0gICAgCisgICAgTlNBcnJheSAqYXR0cmlidXRlcyA9IG5p bDsKKworICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUworICAgIHNfY29udHJvbGxlci0+ZXhl Y3V0ZU9uQVhUaHJlYWRBbmRXYWl0KFsmYXR0cmlidXRlcywgdGhpc10geworICAgICAgICBhdHRy aWJ1dGVzID0gW21fZWxlbWVudCBhY2Nlc3NpYmlsaXR5UGFyYW1ldGVyaXplZEF0dHJpYnV0ZU5h bWVzXTsKKyAgICB9KTsKKyAgICBFTkRfQVhfT0JKQ19FWENFUFRJT05TCisKKyAgICBOU011dGFi bGVTdHJpbmcgKmF0dHJpYnV0ZXNTdHJpbmcgPSBbTlNNdXRhYmxlU3RyaW5nIHN0cmluZ107Cisg ICAgZm9yIChpZCBhdHRyaWJ1dGUgaW4gYXR0cmlidXRlcykKKyAgICAgICAgW2F0dHJpYnV0ZXNT dHJpbmcgYXBwZW5kRm9ybWF0OkAiJUBcbiIsIGF0dHJpYnV0ZV07CiAgICAgcmV0dXJuIFthdHRy aWJ1dGVzU3RyaW5nIGNyZWF0ZUpTU3RyaW5nUmVmXTsKIH0KIApAQCAtOTU1LDMwICs5NTksMjcg QEAgaW50IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Omluc2VydGlvblBvaW50TGluZU51bWJlcigp CiBib29sIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmlzUHJlc3NBY3Rpb25TdXBwb3J0ZWQoKQog ewogICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwotICAgIE5TQXJyYXkqIGFjdGlvbnMgPSBb bV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBY3Rpb25OYW1lc107Ci0gICAgcmV0dXJuIFthY3Rpb25z IGNvbnRhaW5zT2JqZWN0Ok5TQWNjZXNzaWJpbGl0eVByZXNzQWN0aW9uXTsKKyAgICByZXR1cm4g W2FjdGlvbk5hbWVzKCkgY29udGFpbnNPYmplY3Q6TlNBY2Nlc3NpYmlsaXR5UHJlc3NBY3Rpb25d OwogICAgIEVORF9BWF9PQkpDX0VYQ0VQVElPTlMKLSAgICAKKwogICAgIHJldHVybiBmYWxzZTsK IH0KIAogYm9vbCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojppc0luY3JlbWVudEFjdGlvblN1cHBv cnRlZCgpCiB7CiAgICAgQkVHSU5fQVhfT0JKQ19FWENFUFRJT05TCi0gICAgTlNBcnJheSogYWN0 aW9ucyA9IFttX2VsZW1lbnQgYWNjZXNzaWJpbGl0eUFjdGlvbk5hbWVzXTsKLSAgICByZXR1cm4g W2FjdGlvbnMgY29udGFpbnNPYmplY3Q6TlNBY2Nlc3NpYmlsaXR5SW5jcmVtZW50QWN0aW9uXTsK KyAgICByZXR1cm4gW2FjdGlvbk5hbWVzKCkgY29udGFpbnNPYmplY3Q6TlNBY2Nlc3NpYmlsaXR5 SW5jcmVtZW50QWN0aW9uXTsKICAgICBFTkRfQVhfT0JKQ19FWENFUFRJT05TCi0gICAgCisKICAg ICByZXR1cm4gZmFsc2U7CiB9CiAKIGJvb2wgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aXNEZWNy ZW1lbnRBY3Rpb25TdXBwb3J0ZWQoKQogewogICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwot ICAgIE5TQXJyYXkqIGFjdGlvbnMgPSBbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBY3Rpb25OYW1l c107Ci0gICAgcmV0dXJuIFthY3Rpb25zIGNvbnRhaW5zT2JqZWN0Ok5TQWNjZXNzaWJpbGl0eURl Y3JlbWVudEFjdGlvbl07CisgICAgcmV0dXJuIFthY3Rpb25OYW1lcygpIGNvbnRhaW5zT2JqZWN0 Ok5TQWNjZXNzaWJpbGl0eURlY3JlbWVudEFjdGlvbl07CiAgICAgRU5EX0FYX09CSkNfRVhDRVBU SU9OUwotICAgIAorCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCkBAIC0xNDM3LDIyICsxNDM4LDI2 IEBAIFJlZlB0cjxBY2Nlc3NpYmlsaXR5VUlFbGVtZW50PiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50 Ojp2ZXJ0aWNhbFNjcm9sbGJhcigpIGNvbnN0CiAKIHZvaWQgQWNjZXNzaWJpbGl0eVVJRWxlbWVu dDo6c2Nyb2xsVG9NYWtlVmlzaWJsZSgpCiB7Ci0gICAgQkVHSU5fQVhfT0JKQ19FWENFUFRJT05T Ci0gICAgW21fZWxlbWVudCBhY2Nlc3NpYmlsaXR5UGVyZm9ybUFjdGlvbjpAIkFYU2Nyb2xsVG9W aXNpYmxlIl07Ci0gICAgRU5EX0FYX09CSkNfRVhDRVBUSU9OUworICAgIHBlcmZvcm1BY3Rpb24o QCJBWFNjcm9sbFRvVmlzaWJsZSIpOwogfQotICAgIAorCiB2b2lkIEFjY2Vzc2liaWxpdHlVSUVs ZW1lbnQ6OnNjcm9sbFRvR2xvYmFsUG9pbnQoaW50IHgsIGludCB5KQogeworICAgIE5TUG9pbnQg cG9pbnQgPSBOU01ha2VQb2ludCh4LCB5KTsKICAgICBCRUdJTl9BWF9PQkpDX0VYQ0VQVElPTlMK LSAgICBbbV9lbGVtZW50IF9hY2Nlc3NpYmlsaXR5U2Nyb2xsVG9HbG9iYWxQb2ludDpOU01ha2VQ b2ludCh4LCB5KV07CisgICAgc19jb250cm9sbGVyLT5leGVjdXRlT25BWFRocmVhZChbJnBvaW50 LCB0aGlzXSB7CisgICAgICAgIFttX2VsZW1lbnQgX2FjY2Vzc2liaWxpdHlTY3JvbGxUb0dsb2Jh bFBvaW50OnBvaW50XTsKKyAgICB9KTsKICAgICBFTkRfQVhfT0JKQ19FWENFUFRJT05TCiB9CiAK IHZvaWQgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6c2Nyb2xsVG9NYWtlVmlzaWJsZVdpdGhTdWJG b2N1cyhpbnQgeCwgaW50IHksIGludCB3aWR0aCwgaW50IGhlaWdodCkKIHsKKyAgICBOU1JlY3Qg cmVjdCA9IE5TTWFrZVJlY3QoeCwgeSwgd2lkdGgsIGhlaWdodCk7CiAgICAgQkVHSU5fQVhfT0JK Q19FWENFUFRJT05TCi0gICAgW21fZWxlbWVudCBfYWNjZXNzaWJpbGl0eVNjcm9sbFRvTWFrZVZp c2libGVXaXRoU3ViRm9jdXM6TlNNYWtlUmVjdCh4LCB5LCB3aWR0aCwgaGVpZ2h0KV07CisgICAg c19jb250cm9sbGVyLT5leGVjdXRlT25BWFRocmVhZChbJnJlY3QsIHRoaXNdIHsKKyAgICAgICAg W21fZWxlbWVudCBfYWNjZXNzaWJpbGl0eVNjcm9sbFRvTWFrZVZpc2libGVXaXRoU3ViRm9jdXM6 cmVjdF07CisgICAgfSk7CiAgICAgRU5EX0FYX09CSkNfRVhDRVBUSU9OUwogfQogCkBAIC0xNDgx LDkgKzE0ODYsNyBAQCBib29sIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnNldFNlbGVjdGVkVGV4 dFJhbmdlKHVuc2lnbmVkIGxvY2F0aW9uLCB1bnNpZ25lZCBsZQogCiB2b2lkIEFjY2Vzc2liaWxp dHlVSUVsZW1lbnQ6OmRpc21pc3MoKQogewotICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwot ICAgIFttX2VsZW1lbnQgYWNjZXNzaWJpbGl0eVBlcmZvcm1BY3Rpb246QCJBWERpc21pc3NBY3Rp b24iXTsKLSAgICBFTkRfQVhfT0JKQ19FWENFUFRJT05TCisgICAgcGVyZm9ybUFjdGlvbihAIkFY RGlzbWlzc0FjdGlvbiIpOwogfQogCiBib29sIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnNldFNl bGVjdGVkVGV4dE1hcmtlclJhbmdlKEFjY2Vzc2liaWxpdHlUZXh0TWFya2VyUmFuZ2UqIG1hcmtl clJhbmdlKQpAQCAtMTQ5OCw1MSArMTUwMSwzNyBAQCBib29sIEFjY2Vzc2liaWxpdHlVSUVsZW1l bnQ6OnNldFNlbGVjdGVkVGV4dE1hcmtlclJhbmdlKEFjY2Vzc2liaWxpdHlUZXh0TWFya2VyUgog CiB2b2lkIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmluY3JlbWVudCgpCiB7Ci0gICAgQkVHSU5f QVhfT0JKQ19FWENFUFRJT05TCi0gICAgW21fZWxlbWVudCBhY2Nlc3NpYmlsaXR5UGVyZm9ybUFj dGlvbjpAIkFYU3luY0luY3JlbWVudEFjdGlvbiJdOwotICAgIEVORF9BWF9PQkpDX0VYQ0VQVElP TlMKKyAgICBwZXJmb3JtQWN0aW9uKEAiQVhTeW5jSW5jcmVtZW50QWN0aW9uIik7CiB9CiAKIHZv aWQgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6ZGVjcmVtZW50KCkKIHsKLSAgICBCRUdJTl9BWF9P QkpDX0VYQ0VQVElPTlMKLSAgICBbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlQZXJmb3JtQWN0aW9u OkAiQVhTeW5jRGVjcmVtZW50QWN0aW9uIl07Ci0gICAgRU5EX0FYX09CSkNfRVhDRVBUSU9OUwor ICAgIHBlcmZvcm1BY3Rpb24oQCJBWFN5bmNEZWNyZW1lbnRBY3Rpb24iKTsKIH0KIAogdm9pZCBB Y2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojphc3luY0luY3JlbWVudCgpCiB7Ci0gICAgQkVHSU5fQVhf T0JKQ19FWENFUFRJT05TCi0gICAgW21fZWxlbWVudCBhY2Nlc3NpYmlsaXR5UGVyZm9ybUFjdGlv bjpOU0FjY2Vzc2liaWxpdHlJbmNyZW1lbnRBY3Rpb25dOwotICAgIEVORF9BWF9PQkpDX0VYQ0VQ VElPTlMKKyAgICBwZXJmb3JtQWN0aW9uKE5TQWNjZXNzaWJpbGl0eUluY3JlbWVudEFjdGlvbik7 CiB9CiAKIHZvaWQgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6YXN5bmNEZWNyZW1lbnQoKQogewot ICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwotICAgIFttX2VsZW1lbnQgYWNjZXNzaWJpbGl0 eVBlcmZvcm1BY3Rpb246TlNBY2Nlc3NpYmlsaXR5RGVjcmVtZW50QWN0aW9uXTsKLSAgICBFTkRf QVhfT0JKQ19FWENFUFRJT05TCisgICAgcGVyZm9ybUFjdGlvbihOU0FjY2Vzc2liaWxpdHlEZWNy ZW1lbnRBY3Rpb24pOwogfQogCiB2b2lkIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnNob3dNZW51 KCkKIHsKLSAgICBCRUdJTl9BWF9PQkpDX0VYQ0VQVElPTlMKLSAgICBbbV9lbGVtZW50IGFjY2Vz c2liaWxpdHlQZXJmb3JtQWN0aW9uOk5TQWNjZXNzaWJpbGl0eVNob3dNZW51QWN0aW9uXTsKLSAg ICBFTkRfQVhfT0JKQ19FWENFUFRJT05TCisgICAgcGVyZm9ybUFjdGlvbihOU0FjY2Vzc2liaWxp dHlTaG93TWVudUFjdGlvbik7CiB9CiAKIHZvaWQgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6cHJl c3MoKQogewotICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwotICAgIFttX2VsZW1lbnQgYWNj ZXNzaWJpbGl0eVBlcmZvcm1BY3Rpb246TlNBY2Nlc3NpYmlsaXR5UHJlc3NBY3Rpb25dOwotICAg IEVORF9BWF9PQkpDX0VYQ0VQVElPTlMKKyAgICBwZXJmb3JtQWN0aW9uKE5TQWNjZXNzaWJpbGl0 eVByZXNzQWN0aW9uKTsKIH0KIAogdm9pZCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpzeW5jUHJl c3MoKQogewotICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUwotICAgIFttX2VsZW1lbnQgYWNj ZXNzaWJpbGl0eVBlcmZvcm1BY3Rpb246QCJBWFN5bmNQcmVzc0FjdGlvbiJdOwotICAgIEVORF9B WF9PQkpDX0VYQ0VQVElPTlMKKyAgICBwZXJmb3JtQWN0aW9uKEAiQVhTeW5jUHJlc3NBY3Rpb24i KTsKIH0KIAogdm9pZCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpzZXRTZWxlY3RlZENoaWxkKEFj Y2Vzc2liaWxpdHlVSUVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0CkBAIC0xNzEwLDcgKzE2OTksOSBA QCBib29sIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmlzSWdub3JlZCgpIGNvbnN0CiB7CiAgICAg Qk9PTCByZXN1bHQgPSBOTzsKICAgICBCRUdJTl9BWF9PQkpDX0VYQ0VQVElPTlMKLSAgICByZXN1 bHQgPSBbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlJc0lnbm9yZWRdOworICAgIHNfY29udHJvbGxl ci0+ZXhlY3V0ZU9uQVhUaHJlYWRBbmRXYWl0KFsmcmVzdWx0LCB0aGlzXSB7CisgICAgICAgIHJl c3VsdCA9IFttX2VsZW1lbnQgYWNjZXNzaWJpbGl0eUlzSWdub3JlZF07CisgICAgfSk7CiAgICAg RU5EX0FYX09CSkNfRVhDRVBUSU9OUwogICAgIHJldHVybiByZXN1bHQ7CiB9CkBAIC0xOTgyLDgg KzE5NzMsMTEgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpyZXBsYWNlVGV4dEluUmFu Z2UoSlNTdHJpbmdSZWYgc3RyaW5nLCBpbnQgbG9jYXRpb24KIAogYm9vbCBBY2Nlc3NpYmlsaXR5 VUlFbGVtZW50OjppbnNlcnRUZXh0KEpTU3RyaW5nUmVmIHRleHQpCiB7CisgICAgYm9vbCByZXN1 bHQgPSBmYWxzZTsKICAgICBCRUdJTl9BWF9PQkpDX0VYQ0VQVElPTlMKLSAgICByZXR1cm4gW21f ZWxlbWVudCBhY2Nlc3NpYmlsaXR5SW5zZXJ0VGV4dDpbTlNTdHJpbmcgc3RyaW5nV2l0aEpTU3Ry aW5nUmVmOnRleHRdXTsKKyAgICBzX2NvbnRyb2xsZXItPmV4ZWN1dGVPbkFYVGhyZWFkQW5kV2Fp dChbdGV4dCA9IFtOU1N0cmluZyBzdHJpbmdXaXRoSlNTdHJpbmdSZWY6dGV4dF0sICZyZXN1bHQs IHRoaXNdIHsKKyAgICAgICAgcmVzdWx0ID0gW21fZWxlbWVudCBhY2Nlc3NpYmlsaXR5SW5zZXJ0 VGV4dDp0ZXh0XTsKKyAgICB9KTsKICAgICBFTkRfQVhfT0JKQ19FWENFUFRJT05TCiAgICAgcmV0 dXJuIGZhbHNlOwogfQpAQCAtMjM1NiwxNyArMjM1MCwzOCBAQCBKU1JldGFpblB0cjxKU1N0cmlu Z1JlZj4gQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6cGF0aERlc2NyaXB0aW9uKCkgY29uc3QKIAog ICAgIHJldHVybiBudWxscHRyOwogfQotICAgIAorCitOU0FycmF5ICpBY2Nlc3NpYmlsaXR5VUlF bGVtZW50OjphY3Rpb25OYW1lcygpIGNvbnN0Cit7CisgICAgTlNBcnJheSAqYWN0aW9ucyA9IG5p bDsKKworICAgIEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUworICAgIHNfY29udHJvbGxlci0+ZXhl Y3V0ZU9uQVhUaHJlYWRBbmRXYWl0KFt0aGlzLCAmYWN0aW9uc10geworICAgICAgICBhY3Rpb25z ID0gW21fZWxlbWVudCBhY2Nlc3NpYmlsaXR5QWN0aW9uTmFtZXNdOworICAgIH0pOworICAgIEVO RF9BWF9PQkpDX0VYQ0VQVElPTlMKKworICAgIHJldHVybiBhY3Rpb25zOworfQorCiBKU1JldGFp blB0cjxKU1N0cmluZ1JlZj4gQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6c3VwcG9ydGVkQWN0aW9u cygpIGNvbnN0CiB7CiAgICAgQkVHSU5fQVhfT0JKQ19FWENFUFRJT05TCi0gICAgTlNBcnJheSAq bmFtZXMgPSBbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBY3Rpb25OYW1lc107Ci0gICAgcmV0dXJu IFtbbmFtZXMgY29tcG9uZW50c0pvaW5lZEJ5U3RyaW5nOkAiLCJdIGNyZWF0ZUpTU3RyaW5nUmVm XTsKKyAgICByZXR1cm4gW1thY3Rpb25OYW1lcygpIGNvbXBvbmVudHNKb2luZWRCeVN0cmluZzpA IiwiXSBjcmVhdGVKU1N0cmluZ1JlZl07CiAgICAgRU5EX0FYX09CSkNfRVhDRVBUSU9OUwotICAg IAorCiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKK3ZvaWQgQWNjZXNzaWJpbGl0eVVJRWxlbWVu dDo6cGVyZm9ybUFjdGlvbihOU1N0cmluZyAqYWN0aW9uTmFtZSkgY29uc3QKK3sKKyAgICBCRUdJ Tl9BWF9PQkpDX0VYQ0VQVElPTlMKKyAgICBzX2NvbnRyb2xsZXItPmV4ZWN1dGVPbkFYVGhyZWFk KFthY3Rpb25OYW1lLCB0aGlzXSB7CisgICAgICAgIFttX2VsZW1lbnQgYWNjZXNzaWJpbGl0eVBl cmZvcm1BY3Rpb246YWN0aW9uTmFtZV07CisgICAgfSk7CisgICAgRU5EX0FYX09CSkNfRVhDRVBU SU9OUworfQorCiB9IC8vIG5hbWVzcGFjZSBXVFIKIAogI2VuZGlmIC8vIEVOQUJMRShBQ0NFU1NJ QklMSVRZKQotLSAKMi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK