233228 2021-11-16 18:02:37 -0800 Fix for accessibility/notification-listeners.html in isolated tree mode. 2021-11-17 04:50:47 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white tyler_w webkit-bug-importer oldest_to_newest 1815758 0 andresg_22 2021-11-16 18:02:37 -0800 Fix for accessibility/notification-listeners.html in isolated tree mode. 1815759 1 webkit-bug-importer 2021-11-16 18:02:55 -0800 <rdar://problem/85484341> 1815762 2 444462 andresg_22 2021-11-16 18:07:38 -0800 Created attachment 444462 Patch 1815771 3 444462 tyler_w 2021-11-16 18:23:27 -0800 Comment on attachment 444462 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=444462&action=review > LayoutTests/accessibility/notification-listeners.html:23 > + let select = await waitForElementById("select"); Does this need to await waitForElementById instead of accessibilityController.accessibleElementById? The selected item appears to be a static part of the document, so seems like it should be accessible by the latter. 1815774 4 tyler_w 2021-11-16 18:26:17 -0800 (In reply to Tyler Wilcock from comment #3) > Comment on attachment 444462 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=444462&action=review > > > LayoutTests/accessibility/notification-listeners.html:23 > > + let select = await waitForElementById("select"); > > Does this need to await waitForElementById instead of > accessibilityController.accessibleElementById? The selected item appears to > be a static part of the document, so seems like it should be accessible by > the latter. Nevermind, Andres responded elsewhere that using accessibilityController.accessibleElementById in this case results in flakiness (~10 runs of 1000). It's fine to leave as-is. 1815776 5 444465 andresg_22 2021-11-16 18:38:58 -0800 Created attachment 444465 Patch 1815778 6 andresg_22 2021-11-16 18:42:32 -0800 (In reply to Tyler Wilcock from comment #3) > Comment on attachment 444462 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=444462&action=review > > > LayoutTests/accessibility/notification-listeners.html:23 > > + let select = await waitForElementById("select"); > > Does this need to await waitForElementById instead of > accessibilityController.accessibleElementById? The selected item appears to > be a static part of the document, so seems like it should be accessible by > the latter. Thanks for pointing this out. That was my original take as well, but it turns out that if we use accessibleElementByID, the test is flaky. Added details to the ChangeLog. 1815895 7 ews-feeder 2021-11-17 04:50:45 -0800 Committed r285924 (244333@main): <https://commits.webkit.org/244333@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444465. 444462 2021-11-16 18:07:38 -0800 2021-11-16 18:38:55 -0800 Patch bug-233228-20211116210737.patch text/plain 6948 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODgxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNWI3MmMzNWU5NDI2NjFlNjgzMzBl ZDkyN2U0NjQzMDQ5YTAyOTdkMi4uMTNkMWI1ZDBlYTJjM2RlYzUzNWVkZTFjZTEzYmYxOTQ3NWM2 ZjRjMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTExLTE2ICBBbmRyZXMgR29uemFsZXog IDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIGFjY2Vzc2liaWxpdHkv bm90aWZpY2F0aW9uLWxpc3RlbmVycy5odG1sIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzIyOAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vODU0ODQzNDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTWFkZSB0aGlzIHRlc3QgYXN5bmMgaW4gb3JkZXIgdG8gcGFz cyBpbiBpc29sYXRlZCB0cmVlIG1vZGUuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L25vdGlm aWNhdGlvbi1saXN0ZW5lcnMuaHRtbDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJp bGl0eS9ub3RpZmljYXRpb24tbGlzdGVuZXJzLWV4cGVjdGVkLnR4dDoKKwogMjAyMS0xMS0xNiAg VHlsZXIgV2lsY29jayAgPHR5bGVyX3dAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBTaW1wbGlm eSB0ZXN0cyBjaGFuZ2VkIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzMwODUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbm90aWZpY2F0 aW9uLWxpc3RlbmVycy5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ub3RpZmljYXRp b24tbGlzdGVuZXJzLmh0bWwKaW5kZXggMzcxNjE0NzM0MTc3NzUzYjFlNGUyZTVmMDc3NDc4ZWQ0 YTM2OGU4NS4uNzYzYzRkYTg1YWMwMGY1ZjEwYmNhZDIxNzMzNDQ2NTgwMjE5MmUyOCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ub3RpZmljYXRpb24tbGlzdGVuZXJzLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ub3RpZmljYXRpb24tbGlzdGVuZXJz Lmh0bWwKQEAgLTEsNzkgKzEsNjAgQEAKIDxodG1sPgogPGhlYWQ+Ci08c2NyaXB0IHNyYz0iLi4v cmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNv dXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2Fj Y2Vzc2liaWxpdHktaGVscGVyLmpzIj48L3NjcmlwdD4KIDwvaGVhZD4KIDxib2R5PgogCi08cCBp ZD0iZGVzY3JpcHRpb24iPjwvcD4KLQogPHNlbGVjdCBpZD0ic2VsZWN0IiB2YWx1ZT0iU2VsZWN0 Ij48L3NlbGVjdD4KIAogPGRpdiBpZD0ic2xpZGVyIiB0YWJpbmRleD0iMCIgcm9sZT0ic2xpZGVy IiBhcmlhLXZhbHVlbm93PSI1Ij5TbGlkZXI8L2Rpdj4KIAotPGRpdiBpZD0iY29uc29sZSI+PC9k aXY+Ci0KIDxzY3JpcHQ+Ci1kZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyB0aGF0IGEgbm90aWZpY2F0 aW9uIGxpc3RlbmVyIG9uIGFuIGVsZW1lbnQgb25seSBsaXN0ZW5zIHRvIHRoYXQgb25lIGVsZW1l bnQsIGFuZCB0aGF0IGEgZ2xvYmFsIG5vdGlmaWNhdGlvbiBsaXN0ZW5lciBsaXN0ZW5zIHRvIGFs bCBub3RpZmljYXRpb25zLiIpOwotCi1mdW5jdGlvbiBydW5UZXN0KCkgewotICAgIHdpbmRvdy5q c1Rlc3RJc0FzeW5jID0gdHJ1ZTsKLQotICAgIHdpbmRvdy5zZWxlY3ROb3RpZmljYXRpb25Db3Vu dCA9IDA7Ci0gICAgd2luZG93LnNsaWRlck5vdGlmaWNhdGlvbkNvdW50ID0gMDsKLSAgICB3aW5k b3cuZ2xvYmFsTm90aWZpY2F0aW9uQ291bnQgPSAwOworICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRl c3RzIHRoYXQgYSBub3RpZmljYXRpb24gbGlzdGVuZXIgb24gYW4gZWxlbWVudCBvbmx5IGxpc3Rl bnMgdG8gdGhhdCBvbmUgZWxlbWVudCwgYW5kIHRoYXQgYSBnbG9iYWwgbm90aWZpY2F0aW9uIGxp c3RlbmVyIGxpc3RlbnMgdG8gYWxsIG5vdGlmaWNhdGlvbnMuIik7CiAKICAgICBpZiAod2luZG93 LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7Ci0gICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJzZWxlY3QiKS5mb2N1cygpOwotICAgICAgICB3aW5kb3cuc2VsZWN0ID0gYWNjZXNzaWJp bGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQ7Ci0gICAgICAgIHNlbGVjdC5hZGROb3RpZmlj YXRpb25MaXN0ZW5lcihmdW5jdGlvbihub3RpZmljYXRpb24pIHsKLSAgICAgICAgICAgIHNlbGVj dE5vdGlmaWNhdGlvbkNvdW50Kys7Ci0gICAgICAgICAgICBkZWJ1ZygiU0VMRUNUICIgKyBub3Rp ZmljYXRpb24pOwotICAgICAgICB9KTsKLQotICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgic2xpZGVyIikuZm9jdXMoKTsKLSAgICAgICAgd2luZG93LnNsaWRlciA9IGFjY2Vzc2liaWxp dHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50OwotICAgICAgICBzbGlkZXIuYWRkTm90aWZpY2F0 aW9uTGlzdGVuZXIoZnVuY3Rpb24obm90aWZpY2F0aW9uKSB7Ci0gICAgICAgICAgICBzbGlkZXJO b3RpZmljYXRpb25Db3VudCsrOwotICAgICAgICAgICAgZGVidWcoIlNMSURFUiAiICsgbm90aWZp Y2F0aW9uKTsKLSAgICAgICAgfSk7Ci0KLSAgICAgICAgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIu YWRkTm90aWZpY2F0aW9uTGlzdGVuZXIoZnVuY3Rpb24oZWxlbWVudCwgbm90aWZpY2F0aW9uKSB7 Ci0gICAgICAgICAgICBpZiAoZWxlbWVudC5pc0VxdWFsKHNsaWRlcikgfHwgZWxlbWVudC5pc0Vx dWFsKHNlbGVjdCkpIHsKLSAgICAgICAgICAgICAgICBnbG9iYWxOb3RpZmljYXRpb25Db3VudCsr OwotICAgICAgICAgICAgICAgIGRlYnVnKCJHTE9CQUwgIiArIG5vdGlmaWNhdGlvbiArICIgb24g ZWxlbWVudCB3aXRoIHJvbGUgIiArIGVsZW1lbnQucm9sZSk7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH0pOwotICAgIH0KLQotICAgIC8vIEVuc3VyZSB0aGVzZSBlbGVtZW50cyBleGlzdCBpbiB0 aGUgQVggdHJlZSBvdGhlcndpc2Ugbm90aWZpY2F0aW9ucyB3b24ndCBiZSBnZW5lcmF0ZWQuCi0g ICAgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJzZWxlY3Qi KTsKLSAgICBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInNs aWRlciIpOworICAgICAgICB3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisKKyAgICAgICAg c2V0VGltZW91dChhc3luYyAoKSA9PiB7CisgICAgICAgICAgICB3aW5kb3cuc2VsZWN0Tm90aWZp Y2F0aW9uQ291bnQgPSAwOworICAgICAgICAgICAgd2luZG93LnNsaWRlck5vdGlmaWNhdGlvbkNv dW50ID0gMDsKKyAgICAgICAgICAgIHdpbmRvdy5nbG9iYWxOb3RpZmljYXRpb25Db3VudCA9IDA7 CisKKyAgICAgICAgICAgIGxldCBzZWxlY3QgPSBhd2FpdCB3YWl0Rm9yRWxlbWVudEJ5SWQoInNl bGVjdCIpOworICAgICAgICAgICAgc2VsZWN0LmFkZE5vdGlmaWNhdGlvbkxpc3RlbmVyKChub3Rp ZmljYXRpb24pID0+IHsKKyAgICAgICAgICAgICAgICBzZWxlY3ROb3RpZmljYXRpb25Db3VudCsr OworICAgICAgICAgICAgICAgIGRlYnVnKGBTRUxFQ1QgJHtub3RpZmljYXRpb259YCk7CisgICAg ICAgICAgICB9KTsKKworICAgICAgICAgICAgbGV0IHNsaWRlciA9IGFjY2Vzc2liaWxpdHlDb250 cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgic2xpZGVyIik7CisgICAgICAgICAgICBzbGlk ZXIuYWRkTm90aWZpY2F0aW9uTGlzdGVuZXIoKG5vdGlmaWNhdGlvbikgPT4geworICAgICAgICAg ICAgICAgIHNsaWRlck5vdGlmaWNhdGlvbkNvdW50Kys7CisgICAgICAgICAgICAgICAgZGVidWco YFNMSURFUiAke25vdGlmaWNhdGlvbn1gKTsKKyAgICAgICAgICAgIH0pOworCisgICAgICAgICAg ICBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hZGROb3RpZmljYXRpb25MaXN0ZW5lcigoZWxlbWVu dCwgbm90aWZpY2F0aW9uKSA9PiB7CisgICAgICAgICAgICAgICAgaWYgKGVsZW1lbnQuaXNFcXVh bChzbGlkZXIpIHx8IGVsZW1lbnQuaXNFcXVhbChzZWxlY3QpKSB7CisgICAgICAgICAgICAgICAg ICAgIGdsb2JhbE5vdGlmaWNhdGlvbkNvdW50Kys7CisgICAgICAgICAgICAgICAgICAgIGRlYnVn KGBHTE9CQUwgJHtub3RpZmljYXRpb259IG9uIGVsZW1lbnQgd2l0aCByb2xlICR7ZWxlbWVudC5y b2xlfWApOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0pOworCisgICAgICAgICAg ICAvLyBUaGlzIHNob3VsZCB0cmlnZ2VyIGEgImludmFsaWQgc3RhdHVzIGNoYW5nZWQiIG5vdGlm aWNhdGlvbiBvbiB0aGUgc2VsZWN0LgorICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoInNlbGVjdCIpLnNldEF0dHJpYnV0ZSgiYXJpYS1pbnZhbGlkIiwgInRydWUiKTsKKyAgICAg ICAgICAgIGF3YWl0IGV4cGVjdEFzeW5jRXhwcmVzc2lvbigic2VsZWN0Tm90aWZpY2F0aW9uQ291 bnQiLCAxKTsKKworICAgICAgICAgICAgLy8gVGhpcyBzaG91bGQgdHJpZ2dlciBhICJ2YWx1ZSBj aGFuZ2VkIiBub3RpZmljYXRpb24gb24gdGhlIHNsaWRlci4KKyAgICAgICAgICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJzbGlkZXIiKS5zZXRBdHRyaWJ1dGUoImFyaWEtdmFsdWVub3ciLCAi NiIpOworICAgICAgICAgICAgYXdhaXQgZXhwZWN0QXN5bmNFeHByZXNzaW9uKCJzbGlkZXJOb3Rp ZmljYXRpb25Db3VudCIsIDEpOworCisgICAgICAgICAgICBhd2FpdCBleHBlY3RBc3luY0V4cHJl c3Npb24oImdsb2JhbE5vdGlmaWNhdGlvbkNvdW50IiwgMik7CiAKLSAgICAvLyBUaGlzIHNob3Vs ZCB0cmlnZ2VyIGEgImludmFsaWQgc3RhdHVzIGNoYW5nZWQiIG5vdGlmaWNhdGlvbiBvbiB0aGUg c2VsZWN0LgotICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWxlY3QiKS5zZXRBdHRyaWJ1 dGUoImFyaWEtaW52YWxpZCIsICJ0cnVlIik7Ci0KLSAgICAvLyBUaGlzIHNob3VsZCB0cmlnZ2Vy IGEgInZhbHVlIGNoYW5nZWQiIG5vdGlmaWNhdGlvbiBvbiB0aGUgc2xpZGVyLgotICAgIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJzbGlkZXIiKS5zZXRBdHRyaWJ1dGUoImFyaWEtdmFsdWVub3ci LCAiNiIpOwotCi0gICAgd2luZG93LnNldFRpbWVvdXQoZnVuY3Rpb24oKSB7Ci0gICAgICAgIHNo b3VsZEJlKCJzZWxlY3ROb3RpZmljYXRpb25Db3VudCIsICIxIik7Ci0gICAgICAgIHNob3VsZEJl KCJzbGlkZXJOb3RpZmljYXRpb25Db3VudCIsICIxIik7Ci0gICAgICAgIHNob3VsZEJlKCJnbG9i YWxOb3RpZmljYXRpb25Db3VudCIsICIyIik7Ci0KLSAgICAgICAgaWYgKHdpbmRvdy5hY2Nlc3Np YmlsaXR5Q29udHJvbGxlcikgewogICAgICAgICAgICAgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIu cmVtb3ZlTm90aWZpY2F0aW9uTGlzdGVuZXIoKTsKICAgICAgICAgICAgIHNlbGVjdC5yZW1vdmVO b3RpZmljYXRpb25MaXN0ZW5lcigpOwogICAgICAgICAgICAgc2xpZGVyLnJlbW92ZU5vdGlmaWNh dGlvbkxpc3RlbmVyKCk7Ci0gICAgICAgIH0KLQotICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKLSAg ICB9LCAxMCk7Ci19Ci0KLXJ1blRlc3QoKTsKLQorICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7 CisgICAgICAgIH0sIDApOworICAgIH0KIDwvc2NyaXB0PgotCi08c2NyaXB0IHNyYz0iLi4vcmVz b3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+CiA8L2JvZHk+CiA8L2h0bWw+CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9ub3RpZmljYXRp b24tbGlzdGVuZXJzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nl c3NpYmlsaXR5L25vdGlmaWNhdGlvbi1saXN0ZW5lcnMtZXhwZWN0ZWQudHh0CmluZGV4IGQ0Mzc2 YmUxNTM5M2JlMmM2ZWMxMmE0MzVkYmY0ZDliYTA5NjU3ZWUuLmJkNmRmNmRmNWM4NzU3MDViZDQ0 ZWM3ODI4NjhjNTFkODRlMWU3YzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy9hY2Nlc3NpYmlsaXR5L25vdGlmaWNhdGlvbi1saXN0ZW5lcnMtZXhwZWN0ZWQudHh0CisrKyBi L0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L25vdGlmaWNhdGlvbi1saXN0 ZW5lcnMtZXhwZWN0ZWQudHh0CkBAIC0zLDE2ICszLDE1IEBAIFRoaXMgdGVzdHMgdGhhdCBhIG5v dGlmaWNhdGlvbiBsaXN0ZW5lciBvbiBhbiBlbGVtZW50IG9ubHkgbGlzdGVucyB0byB0aGF0IG9u ZSBlCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2Vz LCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCiAKIAotCi1TbGlkZXIKIFNFTEVDVCBBWElu dmFsaWRTdGF0dXNDaGFuZ2VkCiBHTE9CQUwgQVhJbnZhbGlkU3RhdHVzQ2hhbmdlZCBvbiBlbGVt ZW50IHdpdGggcm9sZSBBWFJvbGU6IEFYUG9wVXBCdXR0b24KK1BBU1Mgc2VsZWN0Tm90aWZpY2F0 aW9uQ291bnQgPT09IDEKIFNMSURFUiBBWFZhbHVlQ2hhbmdlZAogR0xPQkFMIEFYVmFsdWVDaGFu Z2VkIG9uIGVsZW1lbnQgd2l0aCByb2xlIEFYUm9sZTogQVhTbGlkZXIKLVBBU1Mgc2VsZWN0Tm90 aWZpY2F0aW9uQ291bnQgaXMgMQotUEFTUyBzbGlkZXJOb3RpZmljYXRpb25Db3VudCBpcyAxCi1Q QVNTIGdsb2JhbE5vdGlmaWNhdGlvbkNvdW50IGlzIDIKK1BBU1Mgc2xpZGVyTm90aWZpY2F0aW9u Q291bnQgPT09IDEKK1BBU1MgZ2xvYmFsTm90aWZpY2F0aW9uQ291bnQgPT09IDIKIFBBU1Mgc3Vj Y2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQogCitTbGlkZXIK 444465 2021-11-16 18:38:58 -0800 2021-11-17 04:50:46 -0800 Patch bug-233228-20211116213857.patch text/plain 7344 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODgxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNWI3MmMzNWU5NDI2NjFlNjgzMzBl ZDkyN2U0NjQzMDQ5YTAyOTdkMi4uZDgyYWQzZDMyNDk2YTkzNGQ5Y2JmZmYxNTEyMGY2NGQ5YWNl ODFhZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTExLTE2ICBBbmRyZXMgR29uemFsZXog IDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIGFjY2Vzc2liaWxpdHkv bm90aWZpY2F0aW9uLWxpc3RlbmVycy5odG1sIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzIyOAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vODU0ODQzNDE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTWFkZSB0aGlzIHRlc3QgYXN5bmMgaW4gb3JkZXIgdG8gcGFz cyBpbiBpc29sYXRlZCB0cmVlIG1vZGUuCisgICAgICAgIFRoZSBmaXJzdCBhY2Nlc3NpYmxlIGVs ZW1lbnQgbmVlZHMgdG8gYmUgcmV0cmlldmVkIHdpdGggd2FpdEZvckVsZW1lbnRCeUlkLAorICAg ICAgICBvdGhlcndpc2UgaWYgd2UgdXNlIGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2li bGVFbGVtZW50QnlJZCwgdGhlCisgICAgICAgIHRlc3Qgd291bGQgZmFpbCByYW5kb21seSAofjEw IG91dCBvZiAxMDAwIGZsYWtpbmVzcykuIEl0IHJlcXVpcmVzCisgICAgICAgIGZ1cnRoZXIgaW52 ZXN0aWdhdGlvbiB0byBkZXRlcm1pbmUgaWYgdGhpcyBpcyBhbiBpc3N1ZSB3aXRoIHRoZSA8c2Vs ZWN0PgorICAgICAgICBlbGVtZW50IG9yIHdpdGggdGhlIGZpcnN0IGFjY2Vzc2libGUgZWxlbWVu dCB0aGUgdGVzdCByZXRyaWV2ZXMuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L25vdGlmaWNh dGlvbi1saXN0ZW5lcnMuaHRtbDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0 eS9ub3RpZmljYXRpb24tbGlzdGVuZXJzLWV4cGVjdGVkLnR4dDoKKwogMjAyMS0xMS0xNiAgVHls ZXIgV2lsY29jayAgPHR5bGVyX3dAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBTaW1wbGlmeSB0 ZXN0cyBjaGFuZ2VkIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzMwODUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbm90aWZpY2F0aW9u LWxpc3RlbmVycy5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ub3RpZmljYXRpb24t bGlzdGVuZXJzLmh0bWwKaW5kZXggMzcxNjE0NzM0MTc3NzUzYjFlNGUyZTVmMDc3NDc4ZWQ0YTM2 OGU4NS4uNzYzYzRkYTg1YWMwMGY1ZjEwYmNhZDIxNzMzNDQ2NTgwMjE5MmUyOCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ub3RpZmljYXRpb24tbGlzdGVuZXJzLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ub3RpZmljYXRpb24tbGlzdGVuZXJzLmh0 bWwKQEAgLTEsNzkgKzEsNjAgQEAKIDxodG1sPgogPGhlYWQ+Ci08c2NyaXB0IHNyYz0iLi4vcmVz b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJj ZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2FjY2Vz c2liaWxpdHktaGVscGVyLmpzIj48L3NjcmlwdD4KIDwvaGVhZD4KIDxib2R5PgogCi08cCBpZD0i ZGVzY3JpcHRpb24iPjwvcD4KLQogPHNlbGVjdCBpZD0ic2VsZWN0IiB2YWx1ZT0iU2VsZWN0Ij48 L3NlbGVjdD4KIAogPGRpdiBpZD0ic2xpZGVyIiB0YWJpbmRleD0iMCIgcm9sZT0ic2xpZGVyIiBh cmlhLXZhbHVlbm93PSI1Ij5TbGlkZXI8L2Rpdj4KIAotPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+ Ci0KIDxzY3JpcHQ+Ci1kZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyB0aGF0IGEgbm90aWZpY2F0aW9u IGxpc3RlbmVyIG9uIGFuIGVsZW1lbnQgb25seSBsaXN0ZW5zIHRvIHRoYXQgb25lIGVsZW1lbnQs IGFuZCB0aGF0IGEgZ2xvYmFsIG5vdGlmaWNhdGlvbiBsaXN0ZW5lciBsaXN0ZW5zIHRvIGFsbCBu b3RpZmljYXRpb25zLiIpOwotCi1mdW5jdGlvbiBydW5UZXN0KCkgewotICAgIHdpbmRvdy5qc1Rl c3RJc0FzeW5jID0gdHJ1ZTsKLQotICAgIHdpbmRvdy5zZWxlY3ROb3RpZmljYXRpb25Db3VudCA9 IDA7Ci0gICAgd2luZG93LnNsaWRlck5vdGlmaWNhdGlvbkNvdW50ID0gMDsKLSAgICB3aW5kb3cu Z2xvYmFsTm90aWZpY2F0aW9uQ291bnQgPSAwOworICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRlc3Rz IHRoYXQgYSBub3RpZmljYXRpb24gbGlzdGVuZXIgb24gYW4gZWxlbWVudCBvbmx5IGxpc3RlbnMg dG8gdGhhdCBvbmUgZWxlbWVudCwgYW5kIHRoYXQgYSBnbG9iYWwgbm90aWZpY2F0aW9uIGxpc3Rl bmVyIGxpc3RlbnMgdG8gYWxsIG5vdGlmaWNhdGlvbnMuIik7CiAKICAgICBpZiAod2luZG93LmFj Y2Vzc2liaWxpdHlDb250cm9sbGVyKSB7Ci0gICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJzZWxlY3QiKS5mb2N1cygpOwotICAgICAgICB3aW5kb3cuc2VsZWN0ID0gYWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQ7Ci0gICAgICAgIHNlbGVjdC5hZGROb3RpZmljYXRp b25MaXN0ZW5lcihmdW5jdGlvbihub3RpZmljYXRpb24pIHsKLSAgICAgICAgICAgIHNlbGVjdE5v dGlmaWNhdGlvbkNvdW50Kys7Ci0gICAgICAgICAgICBkZWJ1ZygiU0VMRUNUICIgKyBub3RpZmlj YXRpb24pOwotICAgICAgICB9KTsKLQotICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi c2xpZGVyIikuZm9jdXMoKTsKLSAgICAgICAgd2luZG93LnNsaWRlciA9IGFjY2Vzc2liaWxpdHlD b250cm9sbGVyLmZvY3VzZWRFbGVtZW50OwotICAgICAgICBzbGlkZXIuYWRkTm90aWZpY2F0aW9u TGlzdGVuZXIoZnVuY3Rpb24obm90aWZpY2F0aW9uKSB7Ci0gICAgICAgICAgICBzbGlkZXJOb3Rp ZmljYXRpb25Db3VudCsrOwotICAgICAgICAgICAgZGVidWcoIlNMSURFUiAiICsgbm90aWZpY2F0 aW9uKTsKLSAgICAgICAgfSk7Ci0KLSAgICAgICAgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWRk Tm90aWZpY2F0aW9uTGlzdGVuZXIoZnVuY3Rpb24oZWxlbWVudCwgbm90aWZpY2F0aW9uKSB7Ci0g ICAgICAgICAgICBpZiAoZWxlbWVudC5pc0VxdWFsKHNsaWRlcikgfHwgZWxlbWVudC5pc0VxdWFs KHNlbGVjdCkpIHsKLSAgICAgICAgICAgICAgICBnbG9iYWxOb3RpZmljYXRpb25Db3VudCsrOwot ICAgICAgICAgICAgICAgIGRlYnVnKCJHTE9CQUwgIiArIG5vdGlmaWNhdGlvbiArICIgb24gZWxl bWVudCB3aXRoIHJvbGUgIiArIGVsZW1lbnQucm9sZSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAg IH0pOwotICAgIH0KLQotICAgIC8vIEVuc3VyZSB0aGVzZSBlbGVtZW50cyBleGlzdCBpbiB0aGUg QVggdHJlZSBvdGhlcndpc2Ugbm90aWZpY2F0aW9ucyB3b24ndCBiZSBnZW5lcmF0ZWQuCi0gICAg YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJzZWxlY3QiKTsK LSAgICBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInNsaWRl ciIpOworICAgICAgICB3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisKKyAgICAgICAgc2V0 VGltZW91dChhc3luYyAoKSA9PiB7CisgICAgICAgICAgICB3aW5kb3cuc2VsZWN0Tm90aWZpY2F0 aW9uQ291bnQgPSAwOworICAgICAgICAgICAgd2luZG93LnNsaWRlck5vdGlmaWNhdGlvbkNvdW50 ID0gMDsKKyAgICAgICAgICAgIHdpbmRvdy5nbG9iYWxOb3RpZmljYXRpb25Db3VudCA9IDA7CisK KyAgICAgICAgICAgIGxldCBzZWxlY3QgPSBhd2FpdCB3YWl0Rm9yRWxlbWVudEJ5SWQoInNlbGVj dCIpOworICAgICAgICAgICAgc2VsZWN0LmFkZE5vdGlmaWNhdGlvbkxpc3RlbmVyKChub3RpZmlj YXRpb24pID0+IHsKKyAgICAgICAgICAgICAgICBzZWxlY3ROb3RpZmljYXRpb25Db3VudCsrOwor ICAgICAgICAgICAgICAgIGRlYnVnKGBTRUxFQ1QgJHtub3RpZmljYXRpb259YCk7CisgICAgICAg ICAgICB9KTsKKworICAgICAgICAgICAgbGV0IHNsaWRlciA9IGFjY2Vzc2liaWxpdHlDb250cm9s bGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgic2xpZGVyIik7CisgICAgICAgICAgICBzbGlkZXIu YWRkTm90aWZpY2F0aW9uTGlzdGVuZXIoKG5vdGlmaWNhdGlvbikgPT4geworICAgICAgICAgICAg ICAgIHNsaWRlck5vdGlmaWNhdGlvbkNvdW50Kys7CisgICAgICAgICAgICAgICAgZGVidWcoYFNM SURFUiAke25vdGlmaWNhdGlvbn1gKTsKKyAgICAgICAgICAgIH0pOworCisgICAgICAgICAgICBh Y2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hZGROb3RpZmljYXRpb25MaXN0ZW5lcigoZWxlbWVudCwg bm90aWZpY2F0aW9uKSA9PiB7CisgICAgICAgICAgICAgICAgaWYgKGVsZW1lbnQuaXNFcXVhbChz bGlkZXIpIHx8IGVsZW1lbnQuaXNFcXVhbChzZWxlY3QpKSB7CisgICAgICAgICAgICAgICAgICAg IGdsb2JhbE5vdGlmaWNhdGlvbkNvdW50Kys7CisgICAgICAgICAgICAgICAgICAgIGRlYnVnKGBH TE9CQUwgJHtub3RpZmljYXRpb259IG9uIGVsZW1lbnQgd2l0aCByb2xlICR7ZWxlbWVudC5yb2xl fWApOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0pOworCisgICAgICAgICAgICAv LyBUaGlzIHNob3VsZCB0cmlnZ2VyIGEgImludmFsaWQgc3RhdHVzIGNoYW5nZWQiIG5vdGlmaWNh dGlvbiBvbiB0aGUgc2VsZWN0LgorICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo InNlbGVjdCIpLnNldEF0dHJpYnV0ZSgiYXJpYS1pbnZhbGlkIiwgInRydWUiKTsKKyAgICAgICAg ICAgIGF3YWl0IGV4cGVjdEFzeW5jRXhwcmVzc2lvbigic2VsZWN0Tm90aWZpY2F0aW9uQ291bnQi LCAxKTsKKworICAgICAgICAgICAgLy8gVGhpcyBzaG91bGQgdHJpZ2dlciBhICJ2YWx1ZSBjaGFu Z2VkIiBub3RpZmljYXRpb24gb24gdGhlIHNsaWRlci4KKyAgICAgICAgICAgIGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJzbGlkZXIiKS5zZXRBdHRyaWJ1dGUoImFyaWEtdmFsdWVub3ciLCAiNiIp OworICAgICAgICAgICAgYXdhaXQgZXhwZWN0QXN5bmNFeHByZXNzaW9uKCJzbGlkZXJOb3RpZmlj YXRpb25Db3VudCIsIDEpOworCisgICAgICAgICAgICBhd2FpdCBleHBlY3RBc3luY0V4cHJlc3Np b24oImdsb2JhbE5vdGlmaWNhdGlvbkNvdW50IiwgMik7CiAKLSAgICAvLyBUaGlzIHNob3VsZCB0 cmlnZ2VyIGEgImludmFsaWQgc3RhdHVzIGNoYW5nZWQiIG5vdGlmaWNhdGlvbiBvbiB0aGUgc2Vs ZWN0LgotICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWxlY3QiKS5zZXRBdHRyaWJ1dGUo ImFyaWEtaW52YWxpZCIsICJ0cnVlIik7Ci0KLSAgICAvLyBUaGlzIHNob3VsZCB0cmlnZ2VyIGEg InZhbHVlIGNoYW5nZWQiIG5vdGlmaWNhdGlvbiBvbiB0aGUgc2xpZGVyLgotICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJzbGlkZXIiKS5zZXRBdHRyaWJ1dGUoImFyaWEtdmFsdWVub3ciLCAi NiIpOwotCi0gICAgd2luZG93LnNldFRpbWVvdXQoZnVuY3Rpb24oKSB7Ci0gICAgICAgIHNob3Vs ZEJlKCJzZWxlY3ROb3RpZmljYXRpb25Db3VudCIsICIxIik7Ci0gICAgICAgIHNob3VsZEJlKCJz bGlkZXJOb3RpZmljYXRpb25Db3VudCIsICIxIik7Ci0gICAgICAgIHNob3VsZEJlKCJnbG9iYWxO b3RpZmljYXRpb25Db3VudCIsICIyIik7Ci0KLSAgICAgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmls aXR5Q29udHJvbGxlcikgewogICAgICAgICAgICAgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIucmVt b3ZlTm90aWZpY2F0aW9uTGlzdGVuZXIoKTsKICAgICAgICAgICAgIHNlbGVjdC5yZW1vdmVOb3Rp ZmljYXRpb25MaXN0ZW5lcigpOwogICAgICAgICAgICAgc2xpZGVyLnJlbW92ZU5vdGlmaWNhdGlv bkxpc3RlbmVyKCk7Ci0gICAgICAgIH0KLQotICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKLSAgICB9 LCAxMCk7Ci19Ci0KLXJ1blRlc3QoKTsKLQorICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7Cisg ICAgICAgIH0sIDApOworICAgIH0KIDwvc2NyaXB0PgotCi08c2NyaXB0IHNyYz0iLi4vcmVzb3Vy Y2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+CiA8L2JvZHk+CiA8L2h0bWw+CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9ub3RpZmljYXRpb24t bGlzdGVuZXJzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3Np YmlsaXR5L25vdGlmaWNhdGlvbi1saXN0ZW5lcnMtZXhwZWN0ZWQudHh0CmluZGV4IGQ0Mzc2YmUx NTM5M2JlMmM2ZWMxMmE0MzVkYmY0ZDliYTA5NjU3ZWUuLmJkNmRmNmRmNWM4NzU3MDViZDQ0ZWM3 ODI4NjhjNTFkODRlMWU3YzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9h Y2Nlc3NpYmlsaXR5L25vdGlmaWNhdGlvbi1saXN0ZW5lcnMtZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L25vdGlmaWNhdGlvbi1saXN0ZW5l cnMtZXhwZWN0ZWQudHh0CkBAIC0zLDE2ICszLDE1IEBAIFRoaXMgdGVzdHMgdGhhdCBhIG5vdGlm aWNhdGlvbiBsaXN0ZW5lciBvbiBhbiBlbGVtZW50IG9ubHkgbGlzdGVucyB0byB0aGF0IG9uZSBl CiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBm b2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCiAKIAotCi1TbGlkZXIKIFNFTEVDVCBBWEludmFs aWRTdGF0dXNDaGFuZ2VkCiBHTE9CQUwgQVhJbnZhbGlkU3RhdHVzQ2hhbmdlZCBvbiBlbGVtZW50 IHdpdGggcm9sZSBBWFJvbGU6IEFYUG9wVXBCdXR0b24KK1BBU1Mgc2VsZWN0Tm90aWZpY2F0aW9u Q291bnQgPT09IDEKIFNMSURFUiBBWFZhbHVlQ2hhbmdlZAogR0xPQkFMIEFYVmFsdWVDaGFuZ2Vk IG9uIGVsZW1lbnQgd2l0aCByb2xlIEFYUm9sZTogQVhTbGlkZXIKLVBBU1Mgc2VsZWN0Tm90aWZp Y2F0aW9uQ291bnQgaXMgMQotUEFTUyBzbGlkZXJOb3RpZmljYXRpb25Db3VudCBpcyAxCi1QQVNT IGdsb2JhbE5vdGlmaWNhdGlvbkNvdW50IGlzIDIKK1BBU1Mgc2xpZGVyTm90aWZpY2F0aW9uQ291 bnQgPT09IDEKK1BBU1MgZ2xvYmFsTm90aWZpY2F0aW9uQ291bnQgPT09IDIKIFBBU1Mgc3VjY2Vz c2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQogCitTbGlkZXIK