233519 2021-11-26 03:52:01 -0800 [GTK][a11y] MenuListPopup elements should implement selection interface too when building with ATSPI 2021-11-26 05:35:16 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 230253 1 cgarcia webkit-unassigned aboxhall andresg_22 aperez apinheiro bugs-noreply cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white oldest_to_newest 1817941 0 cgarcia 2021-11-26 03:52:01 -0800 We don't currently implement selection for MenuListPopup because canHaveSelectedChildren() returns false. 1817942 1 445188 cgarcia 2021-11-26 03:55:33 -0800 Created attachment 445188 Patch 1817951 2 cgarcia 2021-11-26 05:35:16 -0800 Committed r286177 (244560@main): <https://commits.webkit.org/244560@main> 445188 2021-11-26 03:55:33 -0800 2021-11-26 03:59:14 -0800 Patch wcore-atspi-menulist.diff text/plain 10957 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZmNmOTFmMWU4ZWIuLmE2MTA5YWFmMDIxZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIxIEBACisyMDIxLTExLTI2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVthMTF5XSBNZW51TGlzdFBvcHVwIGVsZW1lbnRz IHNob3VsZCBpbXBsZW1lbnQgc2VsZWN0aW9uIGludGVyZmFjZSB0b28gd2hlbiBidWlsZGluZyB3 aXRoIEFUU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzM1MTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgYW4gaW1wbGVtZW50YXRpb24gb2YgY2FuSGF2ZVNlbGVjdGVkQ2hpbGRyZW4oKSB0byBB Y2Nlc3NpYmlsaXR5TWVudUxpc3RQb3B1cCB0aGF0IHJldHVybnMgdHJ1ZSBmb3IKKyAgICAgICAg QVRTUEkuIEFsc28gaW1wbGVtZW50IHNlbGVjdGVkQ2hpbGRyZW4oKSB3aGljaCBpcyBlbm91Z2gg dG8gc2hhcmUgdGhlIHNhbWUgc2VsZWN0aW9uIGludGVyZmFjZSBpbXBsZW1lbnRhdGlvbgorICAg ICAgICB3aXRoIGxpc3QgYm94IGVsZW1lbnRzLiBUaGlzIGlzIGNvbnNpc3RlbnQgd2l0aCBjaHJv bWl1bS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9w dXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXA6OmNh bkhhdmVTZWxlY3RlZENoaWxkcmVuIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2li aWxpdHlNZW51TGlzdFBvcHVwOjpzZWxlY3RlZENoaWxkcmVuKToKKyAgICAgICAgKiBhY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmg6CisgICAgICAgICogYWNjZXNzaWJp bGl0eS9hdHNwaS9BWE9iamVjdENhY2hlQXRzcGkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhP YmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKToKKwogMjAyMS0xMS0yNSAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11b YTExeV0gQWRkIGltcGxlbWVudGF0aW9uIG9mIHNlbGVjdGlvbiBpbnRlcmZhY2Ugd2hlbiBidWls ZGluZyB3aXRoIEFUU1BJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuY3BwCmluZGV4IDQ2OWRmOGYzMDhlOS4u N2VjMjI1NTgyZjFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmNwcApAQCAtNjgsNiArNjgsMzAgQEAg Ym9vbCBBY2Nlc3NpYmlsaXR5TWVudUxpc3RQb3B1cDo6Y29tcHV0ZUFjY2Vzc2liaWxpdHlJc0ln bm9yZWQoKSBjb25zdAogICAgIHJldHVybiBhY2Nlc3NpYmlsaXR5SXNJZ25vcmVkQnlEZWZhdWx0 KCk7CiB9CiAKK2Jvb2wgQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXA6OmNhbkhhdmVTZWxlY3Rl ZENoaWxkcmVuKCkgY29uc3QKK3sKKyNpZiBVU0UoQVRTUEkpCisgICAgcmV0dXJuIHRydWU7Cisj ZWxzZQorICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgorfQorCit2b2lkIEFjY2Vzc2liaWxpdHlN ZW51TGlzdFBvcHVwOjpzZWxlY3RlZENoaWxkcmVuKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3Rv ciYgcmVzdWx0KQoreworICAgIEFTU0VSVChyZXN1bHQuaXNFbXB0eSgpKTsKKyAgICBpZiAoIWNh bkhhdmVTZWxlY3RlZENoaWxkcmVuKCkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICghY2hp bGRyZW5Jbml0aWFsaXplZCgpKQorICAgICAgICBhZGRDaGlsZHJlbigpOworCisgICAgZm9yIChj b25zdCBhdXRvJiBjaGlsZCA6IG1fY2hpbGRyZW4pIHsKKyAgICAgICAgaWYgKGNoaWxkLT5pc01l bnVMaXN0T3B0aW9uKCkgJiYgY2hpbGQtPmlzU2VsZWN0ZWQoKSkKKyAgICAgICAgICAgIHJlc3Vs dC5hcHBlbmQoY2hpbGQuZ2V0KCkpOworICAgIH0KK30KKwogQWNjZXNzaWJpbGl0eU1lbnVMaXN0 T3B0aW9uKiBBY2Nlc3NpYmlsaXR5TWVudUxpc3RQb3B1cDo6bWVudUxpc3RPcHRpb25BY2Nlc3Np YmlsaXR5T2JqZWN0KEhUTUxFbGVtZW50KiBlbGVtZW50KSBjb25zdAogewogICAgIGlmICghZWxl bWVudCB8fCAhZWxlbWVudC0+aW5SZW5kZXJlZERvY3VtZW50KCkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmggYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmgK aW5kZXggZjM0MzQyZTc0MjQ2Li4xNWIxYjA1ZjY2NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwLmgKQEAg LTU2LDYgKzU2LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGFkZENoaWxkcmVuKCkgb3ZlcnJpZGU7 CiAgICAgdm9pZCBoYW5kbGVDaGlsZHJlbkNoYW5nZWQoKTsKICAgICBib29sIGNvbXB1dGVBY2Nl c3NpYmlsaXR5SXNJZ25vcmVkKCkgY29uc3Qgb3ZlcnJpZGU7CisgICAgYm9vbCBjYW5IYXZlU2Vs ZWN0ZWRDaGlsZHJlbigpIGNvbnN0IG92ZXJyaWRlOworICAgIHZvaWQgc2VsZWN0ZWRDaGlsZHJl bihBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImKSBvdmVycmlkZTsKIAogICAgIEFjY2Vzc2li aWxpdHlNZW51TGlzdE9wdGlvbiogbWVudUxpc3RPcHRpb25BY2Nlc3NpYmlsaXR5T2JqZWN0KEhU TUxFbGVtZW50KikgY29uc3Q7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9hdHNwaS9BWE9iamVjdENhY2hlQXRzcGkuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9hdHNwaS9BWE9iamVjdENhY2hlQXRzcGkuY3BwCmluZGV4IGUwM2Q3NGZjNDQz Yi4uNmI4MWM2ZjQyMjM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2F0c3BpL0FYT2JqZWN0Q2FjaGVBdHNwaS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9hdHNwaS9BWE9iamVjdENhY2hlQXRzcGkuY3BwCkBAIC04MCwxMiArODAsMjAgQEAg dm9pZCBBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24oQVhDb3JlT2JqZWN0 KiBjb3JlT2JqZWN0LCBBWE5vdGlmaWMKICAgICAgICAgICAgIHdyYXBwZXItPnN0YXRlQ2hhbmdl ZCgiY2hlY2tlZCIsIGNvcmVPYmplY3QtPmlzQ2hlY2tlZCgpKTsKICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBBWFNlbGVjdGVkU3RhdGVDaGFuZ2VkOgorICAgIGNhc2UgQVhNZW51TGlzdEl0ZW1T ZWxlY3RlZDoKICAgICAgICAgd3JhcHBlci0+c3RhdGVDaGFuZ2VkKCJzZWxlY3RlZCIsIGNvcmVP YmplY3QtPmlzU2VsZWN0ZWQoKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQVhTZWxlY3Rl ZENoaWxkcmVuQ2hhbmdlZDoKLSAgICBjYXNlIEFYTWVudUxpc3RWYWx1ZUNoYW5nZWQ6CiAgICAg ICAgIHdyYXBwZXItPnNlbGVjdGlvbkNoYW5nZWQoKTsKICAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBBWE1lbnVMaXN0VmFsdWVDaGFuZ2VkOiB7CisgICAgICAgIGNvbnN0IGF1dG8mIGNoaWxkcmVu ID0gY29yZU9iamVjdC0+Y2hpbGRyZW4oKTsKKyAgICAgICAgaWYgKGNoaWxkcmVuLnNpemUoKSA9 PSAxKSB7CisgICAgICAgICAgICBpZiAoYXV0byogY2hpbGRXcmFwcGVyID0gY2hpbGRyZW5bMF0t PndyYXBwZXIoKSkKKyAgICAgICAgICAgICAgICBjaGlsZFdyYXBwZXItPnNlbGVjdGlvbkNoYW5n ZWQoKTsKKyAgICAgICAgfQorICAgICAgICBicmVhazsKKyAgICB9CiAgICAgY2FzZSBBWFZhbHVl Q2hhbmdlZDoKICAgICAgICAgaWYgKHdyYXBwZXItPmludGVyZmFjZXMoKS5jb250YWlucyhBY2Nl c3NpYmlsaXR5T2JqZWN0QXRzcGk6OkludGVyZmFjZTo6VmFsdWUpKQogICAgICAgICAgICAgd3Jh cHBlci0+dmFsdWVDaGFuZ2VkKGNvcmVPYmplY3QtPnZhbHVlRm9yUmFuZ2UoKSk7CkBAIC0xNjAs OCArMTY4LDYgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24o QVhDb3JlT2JqZWN0KiBjb3JlT2JqZWN0LCBBWE5vdGlmaWMKICAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBBWExpdmVSZWdpb25DaGFuZ2VkOgogICAgICAgICBicmVhazsKLSAgICBjYXNlIEFYTWVu dUxpc3RJdGVtU2VsZWN0ZWQ6Ci0gICAgICAgIGJyZWFrOwogICAgIGNhc2UgQVhNZW51Q2xvc2Vk OgogICAgICAgICBicmVhazsKICAgICBjYXNlIEFYTWVudU9wZW5lZDoKZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5ZjMyNzFlMTQxYjUuLjA3MTdh MTg2ZDIyNCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTExLTI2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVthMTF5XSBNZW51TGlzdFBvcHVwIGVs ZW1lbnRzIHNob3VsZCBpbXBsZW1lbnQgc2VsZWN0aW9uIGludGVyZmFjZSB0b28gd2hlbiBidWls ZGluZyB3aXRoIEFUU1BJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzM1MTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgYSB0ZXN0IGNhc2UgZm9yIG1lbnUgbGlzdC4KKworICAgICAgICAqIFRlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcDoKKyAg ICAgICAgKHRlc3RTZWxlY3Rpb25MaXN0Qm94KToKKyAgICAgICAgKHRlc3RTZWxlY3Rpb25NZW51 TGlzdCk6CisgICAgICAgIChiZWZvcmVBbGwpOgorCiAyMDIxLTExLTI1ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVthMTF5XSBBZGQg aW1wbGVtZW50YXRpb24gb2Ygc2VsZWN0aW9uIGludGVyZmFjZSB3aGVuIGJ1aWxkaW5nIHdpdGgg QVRTUEkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rl c3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcAppbmRleCBjMjMyYWI2YjA2MWIuLjVl ZmI0NDNmMjIxMCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRH dGsvVGVzdFdlYktpdEFjY2Vzc2liaWxpdHkuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcApAQCAtMjA0OSw3ICsy MDQ5LDYgQEAgc3RhdGljIHZvaWQgdGVzdEltYWdlQmFzaWMoQWNjZXNzaWJpbGl0eVRlc3QqIHRl c3QsIGdjb25zdHBvaW50ZXIpCiBzdGF0aWMgdm9pZCB0ZXN0U2VsZWN0aW9uTGlzdEJveChBY2Nl c3NpYmlsaXR5VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKIHsKICAgICB0ZXN0LT5zaG93SW5X aW5kb3coODAwLCA2MDApOwotICAgIEdVbmlxdWVQdHI8Y2hhcj4gYmFzZURpcihnX3N0cmR1cF9w cmludGYoImZpbGU6Ly8lcy8iLCBUZXN0OjpnZXRSZXNvdXJjZXNEaXIoKS5kYXRhKCkpKTsKICAg ICB0ZXN0LT5sb2FkSHRtbCgKICAgICAgICAgIjxodG1sPiIKICAgICAgICAgIiAgPGJvZHk+IgpA QCAtMjA2NSw3ICsyMDY0LDcgQEAgc3RhdGljIHZvaWQgdGVzdFNlbGVjdGlvbkxpc3RCb3goQWNj ZXNzaWJpbGl0eVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgICAgICIgICAgPC9zZWxl Y3Q+IgogICAgICAgICAiICA8L2JvZHk+IgogICAgICAgICAiPC9odG1sPiIsCi0gICAgICAgIGJh c2VEaXIuZ2V0KCkpOworICAgICAgICBudWxscHRyKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2Fk RmluaXNoZWQoKTsKIAogICAgIGF1dG8gdGVzdEFwcCA9IHRlc3QtPmZpbmRUZXN0QXBwbGljYXRp b24oKTsKQEAgLTIxNzksNiArMjE3OCw3NCBAQCBzdGF0aWMgdm9pZCB0ZXN0U2VsZWN0aW9uTGlz dEJveChBY2Nlc3NpYmlsaXR5VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICBnX2Fzc2Vy dF9mYWxzZShhdHNwaV9zZWxlY3Rpb25faXNfY2hpbGRfc2VsZWN0ZWQoQVRTUElfU0VMRUNUSU9O KGxpc3RCb3guZ2V0KCkpLCAyLCBudWxscHRyKSk7CiB9CiAKK3N0YXRpYyB2b2lkIHRlc3RTZWxl Y3Rpb25NZW51TGlzdChBY2Nlc3NpYmlsaXR5VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKK3sK KyNpZiAhVVNFKEFUU1BJKQorICAgIGdfdGVzdF9za2lwKCJNZW51TGlzdCB3b3JrIGRpZmZlcmVu dGx5IHdpdGggQVRLIik7CisjZWxzZQorICAgIHRlc3QtPnNob3dJbldpbmRvdyg4MDAsIDYwMCk7 CisgICAgdGVzdC0+bG9hZEh0bWwoCisgICAgICAgICI8aHRtbD4iCisgICAgICAgICIgIDxib2R5 PiIKKyAgICAgICAgIiAgICA8c2VsZWN0IGlkPSdjb21ibyc+IgorICAgICAgICAiICAgICAgPG9w dGlvbj5PcHRpb24gMTwvb3B0aW9uPiIKKyAgICAgICAgIiAgICAgIDxvcHRpb24gc2VsZWN0ZWQ+ T3B0aW9uIDI8L29wdGlvbj4iCisgICAgICAgICIgICAgICA8b3B0aW9uPk9wdGlvbiAzPC9vcHRp b24+IgorICAgICAgICAiICAgICAgPG9wdGlvbiBkaXNhYmxlZD5PcHRpb24gNDwvb3B0aW9uPiIK KyAgICAgICAgIiAgICAgIDxvcHRpb24+T3B0aW9uIDU8L29wdGlvbj4iCisgICAgICAgICIgICAg PC9zZWxlY3Q+IgorICAgICAgICAiICA8L2JvZHk+IgorICAgICAgICAiPC9odG1sPiIsCisgICAg ICAgIG51bGxwdHIpOworICAgIHRlc3QtPndhaXRVbnRpbExvYWRGaW5pc2hlZCgpOworCisgICAg YXV0byB0ZXN0QXBwID0gdGVzdC0+ZmluZFRlc3RBcHBsaWNhdGlvbigpOworICAgIGdfYXNzZXJ0 X3RydWUoQVRTUElfSVNfQUNDRVNTSUJMRSh0ZXN0QXBwLmdldCgpKSk7CisKKyAgICBhdXRvIGRv Y3VtZW50V2ViID0gdGVzdC0+ZmluZERvY3VtZW50V2ViKHRlc3RBcHAuZ2V0KCkpOworICAgIGdf YXNzZXJ0X3RydWUoQVRTUElfSVNfQUNDRVNTSUJMRShkb2N1bWVudFdlYi5nZXQoKSkpOworICAg IGdfYXNzZXJ0X2NtcGludChhdHNwaV9hY2Nlc3NpYmxlX2dldF9jaGlsZF9jb3VudChkb2N1bWVu dFdlYi5nZXQoKSwgbnVsbHB0ciksID09LCAxKTsKKworICAgIGF1dG8gcGFuZWwgPSBhZG9wdEdS ZWYoYXRzcGlfYWNjZXNzaWJsZV9nZXRfY2hpbGRfYXRfaW5kZXgoZG9jdW1lbnRXZWIuZ2V0KCks IDAsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF90cnVlKEFUU1BJX0lTX0FDQ0VTU0lCTEUocGFu ZWwuZ2V0KCkpKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoYXRzcGlfYWNjZXNzaWJsZV9nZXRfcm9s ZShwYW5lbC5nZXQoKSwgbnVsbHB0ciksID09LCBBVFNQSV9ST0xFX1BBTkVMKTsKKyAgICBnX2Fz c2VydF9jbXBpbnQoYXRzcGlfYWNjZXNzaWJsZV9nZXRfY2hpbGRfY291bnQocGFuZWwuZ2V0KCks IG51bGxwdHIpLCA9PSwgMSk7CisKKyAgICBhdXRvIGNvbWJvID0gYWRvcHRHUmVmKGF0c3BpX2Fj Y2Vzc2libGVfZ2V0X2NoaWxkX2F0X2luZGV4KHBhbmVsLmdldCgpLCAwLCBudWxscHRyKSk7Cisg ICAgZ19hc3NlcnRfdHJ1ZShBVFNQSV9JU19BQ0NFU1NJQkxFKGNvbWJvLmdldCgpKSk7CisgICAg Z19hc3NlcnRfY21waW50KGF0c3BpX2FjY2Vzc2libGVfZ2V0X3JvbGUoY29tYm8uZ2V0KCksIG51 bGxwdHIpLCA9PSwgQVRTUElfUk9MRV9DT01CT19CT1gpOworICAgIGdfYXNzZXJ0X2NtcGludChh dHNwaV9hY2Nlc3NpYmxlX2dldF9jaGlsZF9jb3VudChjb21iby5nZXQoKSwgbnVsbHB0ciksID09 LCAxKTsKKworICAgIGF1dG8gbWVudUxpc3QgPSBhZG9wdEdSZWYoYXRzcGlfYWNjZXNzaWJsZV9n ZXRfY2hpbGRfYXRfaW5kZXgoY29tYm8uZ2V0KCksIDAsIG51bGxwdHIpKTsKKyAgICBnX2Fzc2Vy dF90cnVlKEFUU1BJX0lTX1NFTEVDVElPTihtZW51TGlzdC5nZXQoKSkpOworICAgIGdfYXNzZXJ0 X2NtcGludChhdHNwaV9hY2Nlc3NpYmxlX2dldF9yb2xlKG1lbnVMaXN0LmdldCgpLCBudWxscHRy KSwgPT0sIEFUU1BJX1JPTEVfTUVOVSk7CisgICAgZ19hc3NlcnRfY21waW50KGF0c3BpX2FjY2Vz c2libGVfZ2V0X2NoaWxkX2NvdW50KG1lbnVMaXN0LmdldCgpLCBudWxscHRyKSwgPT0sIDUpOwor CisgICAgZ19hc3NlcnRfY21waW50KGF0c3BpX3NlbGVjdGlvbl9nZXRfbl9zZWxlY3RlZF9jaGls ZHJlbihBVFNQSV9TRUxFQ1RJT04obWVudUxpc3QuZ2V0KCkpLCBudWxscHRyKSwgPT0sIDEpOwor ICAgIGdfYXNzZXJ0X2ZhbHNlKGF0c3BpX3NlbGVjdGlvbl9pc19jaGlsZF9zZWxlY3RlZChBVFNQ SV9TRUxFQ1RJT04obWVudUxpc3QuZ2V0KCkpLCAwLCBudWxscHRyKSk7CisgICAgZ19hc3NlcnRf dHJ1ZShhdHNwaV9zZWxlY3Rpb25faXNfY2hpbGRfc2VsZWN0ZWQoQVRTUElfU0VMRUNUSU9OKG1l bnVMaXN0LmdldCgpKSwgMSwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X2ZhbHNlKGF0c3BpX3Nl bGVjdGlvbl9pc19jaGlsZF9zZWxlY3RlZChBVFNQSV9TRUxFQ1RJT04obWVudUxpc3QuZ2V0KCkp LCAyLCBudWxscHRyKSk7CisgICAgZ19hc3NlcnRfZmFsc2UoYXRzcGlfc2VsZWN0aW9uX2lzX2No aWxkX3NlbGVjdGVkKEFUU1BJX1NFTEVDVElPTihtZW51TGlzdC5nZXQoKSksIDMsIG51bGxwdHIp KTsKKyAgICBnX2Fzc2VydF9mYWxzZShhdHNwaV9zZWxlY3Rpb25faXNfY2hpbGRfc2VsZWN0ZWQo QVRTUElfU0VMRUNUSU9OKG1lbnVMaXN0LmdldCgpKSwgNCwgbnVsbHB0cikpOworICAgIGF1dG8g c2VsZWN0ZWRDaGlsZCA9IGFkb3B0R1JlZihhdHNwaV9zZWxlY3Rpb25fZ2V0X3NlbGVjdGVkX2No aWxkKEFUU1BJX1NFTEVDVElPTihtZW51TGlzdC5nZXQoKSksIDAsIG51bGxwdHIpKTsKKyAgICBn X2Fzc2VydF90cnVlKEFUU1BJX0lTX0FDQ0VTU0lCTEUoc2VsZWN0ZWRDaGlsZC5nZXQoKSkpOwor ICAgIGF1dG8gb3B0aW9uMiA9IGFkb3B0R1JlZihhdHNwaV9hY2Nlc3NpYmxlX2dldF9jaGlsZF9h dF9pbmRleChtZW51TGlzdC5nZXQoKSwgMSwgbnVsbHB0cikpOworICAgIGdfYXNzZXJ0X3RydWUo c2VsZWN0ZWRDaGlsZC5nZXQoKSA9PSBvcHRpb24yLmdldCgpKTsKKyAgICBnX2Fzc2VydF9mYWxz ZShhdHNwaV9zZWxlY3Rpb25fc2VsZWN0X2NoaWxkKEFUU1BJX1NFTEVDVElPTihtZW51TGlzdC5n ZXQoKSksIDMsIG51bGxwdHIpKTsKKyAgICB0ZXN0LT5zdGFydEV2ZW50TW9uaXRvcihtZW51TGlz dC5nZXQoKSwgeyAib2JqZWN0OnNlbGVjdGlvbi1jaGFuZ2VkIiB9KTsKKyAgICBnX2Fzc2VydF90 cnVlKGF0c3BpX3NlbGVjdGlvbl9zZWxlY3RfY2hpbGQoQVRTUElfU0VMRUNUSU9OKG1lbnVMaXN0 LmdldCgpKSwgMCwgbnVsbHB0cikpOworICAgIGF1dG8gZXZlbnRzID0gdGVzdC0+c3RvcEV2ZW50 TW9uaXRvcigxKTsKKyAgICBnX2Fzc2VydF9jbXB1aW50KGV2ZW50cy5zaXplKCksID09LCAxKTsK KyAgICBnX2Fzc2VydF9jbXBzdHIoZXZlbnRzWzBdLT50eXBlLCA9PSwgIm9iamVjdDpzZWxlY3Rp b24tY2hhbmdlZCIpOworICAgIGV2ZW50cyA9IHsgfTsKKyAgICBnX2Fzc2VydF90cnVlKGF0c3Bp X3NlbGVjdGlvbl9pc19jaGlsZF9zZWxlY3RlZChBVFNQSV9TRUxFQ1RJT04obWVudUxpc3QuZ2V0 KCkpLCAwLCBudWxscHRyKSk7CisgICAgZ19hc3NlcnRfZmFsc2UoYXRzcGlfc2VsZWN0aW9uX2Rl c2VsZWN0X3NlbGVjdGVkX2NoaWxkKEFUU1BJX1NFTEVDVElPTihtZW51TGlzdC5nZXQoKSksIDAs IG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF9mYWxzZShhdHNwaV9zZWxlY3Rpb25fZGVzZWxlY3Rf Y2hpbGQoQVRTUElfU0VMRUNUSU9OKG1lbnVMaXN0LmdldCgpKSwgMCwgbnVsbHB0cikpOworICAg IGdfYXNzZXJ0X2ZhbHNlKGF0c3BpX3NlbGVjdGlvbl9zZWxlY3RfYWxsKEFUU1BJX1NFTEVDVElP TihtZW51TGlzdC5nZXQoKSksIG51bGxwdHIpKTsKKyAgICBnX2Fzc2VydF9mYWxzZShhdHNwaV9z ZWxlY3Rpb25fY2xlYXJfc2VsZWN0aW9uKEFUU1BJX1NFTEVDVElPTihtZW51TGlzdC5nZXQoKSks IG51bGxwdHIpKTsKKyNlbmRpZgorfQorCiB2b2lkIGJlZm9yZUFsbCgpCiB7CiAgICAgQWNjZXNz aWJpbGl0eVRlc3Q6OmFkZCgiV2ViS2l0QWNjZXNzaWJpbGl0eSIsICJhY2Nlc3NpYmxlL2Jhc2lj LWhpZXJhcmNoeSIsIHRlc3RBY2Nlc3NpYmxlQmFzaWNIaWVyYXJjaHkpOwpAQCAtMjIwNiw2ICsy MjczLDcgQEAgdm9pZCBiZWZvcmVBbGwoKQogICAgIEFjY2Vzc2liaWxpdHlUZXN0OjphZGQoIldl YktpdEFjY2Vzc2liaWxpdHkiLCAiZG9jdW1lbnQvYmFzaWMiLCB0ZXN0RG9jdW1lbnRCYXNpYyk7 CiAgICAgQWNjZXNzaWJpbGl0eVRlc3Q6OmFkZCgiV2ViS2l0QWNjZXNzaWJpbGl0eSIsICJpbWFn ZS9iYXNpYyIsIHRlc3RJbWFnZUJhc2ljKTsKICAgICBBY2Nlc3NpYmlsaXR5VGVzdDo6YWRkKCJX ZWJLaXRBY2Nlc3NpYmlsaXR5IiwgInNlbGVjdGlvbi9saXN0Ym94IiwgdGVzdFNlbGVjdGlvbkxp c3RCb3gpOworICAgIEFjY2Vzc2liaWxpdHlUZXN0OjphZGQoIldlYktpdEFjY2Vzc2liaWxpdHki LCAic2VsZWN0aW9uL21lbnVsaXN0IiwgdGVzdFNlbGVjdGlvbk1lbnVMaXN0KTsKIH0KIAogdm9p ZCBhZnRlckFsbCgpCg==