327541 2026-10-14 08:53:08 -0700 AX: [ATSPI] The popup of a native dropdown box does not expose its optgroups 2026-10-14 08:53:17 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All NEW InRadar P2 Normal --- 1 annevk webkit-unassigned andresg_22 webkit-bug-importer oldest_to_newest 2263854 0 481803 annevk 2026-10-14 08:53:08 -0700 Created attachment 481803 AI patch <select> <option>None</option> <optgroup label="Fruit"> <option>Apple</option> <option selected>Banana</option> </optgroup> <optgroup label="Vegetables" disabled> <option>Carrot</option> </optgroup> </select> With ATSPI, the popup (menu) of this select has four menu items: None, Apple, Banana, and Carrot. The optgroups are missing, and Carrot is reported as enabled. The native GTK popup (WebPopupMenuProxyGtk) shows the label of an optgroup as a row that cannot be selected, with the options of the group under it, and disables the options of a disabled optgroup. WPE gives applications the same structure through WebKitOptionMenuItem (is_group_label, is_group_child). Native list boxes, and base appearance pickers since 323412@main, expose an optgroup as a disabled item with its label, before its options and as their sibling. Causes: - AXObjectCache::getOrCreateSlow() creates no object for an optgroup of a native dropdown box, as that branch returns early without an option element. So AccessibilityMenuListPopup::addChildren() skips optgroups. - AccessibilityMenuListOption::isEnabled() only checks HTMLOptionElement::ownElementDisabled(), rather than isDisabledFormControl(), which includes a disabled optgroup. A fix also has to change AccessibilityMenuListPopup::didUpdateActiveOption(). It uses the option index it gets as an index into the children of the popup, which only works while those are options alone; it could look the option up with HTMLSelectElement::item() instead. Only ATSPI is affected. Mac ignores menu list popups and their options (AccessibilityObject::accessibilityPlatformIncludesObject()), as VoiceOver reads the NSMenu that the UI process builds. iOS doesn't make them accessibility elements. A draft patch is attached. It creates an AccessibilityMenuListOption for an optgroup too, with groupLabelText() as its value, disabled and not selectable. It changes isEnabled() and didUpdateActiveOption() as above, and adds accessibility/gtk/menu-list-popup-optgroups.html. It compiles on Mac, but has not been built or run on GTK or WPE. 2263855 1 webkit-bug-importer 2026-10-14 08:53:17 -0700 <rdar://problem/190024989> 481803 2026-10-14 08:53:08 -0700 2026-10-14 08:53:08 -0700 AI patch ax-native-popup-optgroups.patch text/plain 10096 annevk ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZ3RrL21lbnUtbGlzdC1wb3B1 cC1vcHRncm91cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ndGsv bWVudS1saXN0LXBvcHVwLW9wdGdyb3Vwcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwLi4yNjdkOWFjZTE5NDYKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2d0ay9tZW51LWxpc3QtcG9wdXAtb3B0Z3JvdXBzLWV4 cGVjdGVkLnR4dApAQCAtMCwwICsxLDE2IEBACitUaGlzIHRlc3QgZW5zdXJlcyB0aGF0IHRoZSBw b3B1cCBvZiBhIG5hdGl2ZSBkcm9wZG93biBib3ggZXhwb3NlcyBhbiBvcHRncm91cCBhcyBhIGRp c2FibGVkIG1lbnUgaXRlbSB3aXRoIGl0cyBsYWJlbCwgYmVmb3JlIGl0cyBvcHRpb25zLCBhcyB0 aGUgbmF0aXZlIHBvcHVwIHNob3dzIGl0LgorCitBWFJvbGU6IEFYTWVudUl0ZW0gQVhUaXRsZTog Tm9uZSBlbmFibGVkCitBWFJvbGU6IEFYTWVudUl0ZW0gQVhUaXRsZTogRnJ1aXQgZGlzYWJsZWQK K0FYUm9sZTogQVhNZW51SXRlbSBBWFRpdGxlOiBBcHBsZSBlbmFibGVkCitBWFJvbGU6IEFYTWVu dUl0ZW0gQVhUaXRsZTogQmFuYW5hIGVuYWJsZWQKK0FYUm9sZTogQVhNZW51SXRlbSBBWFRpdGxl OiBWZWdldGFibGVzIGRpc2FibGVkCitBWFJvbGU6IEFYTWVudUl0ZW0gQVhUaXRsZTogQ2Fycm90 IGRpc2FibGVkCisKK1BBU1M6IGF4TWVudT8uc2VsZWN0ZWRDaGlsZEF0SW5kZXgoMCk/LnRpdGxl ID09PSAnQVhUaXRsZTogQmFuYW5hJworUEFTUzogYXhNZW51Py5zZWxlY3RlZENoaWxkQXRJbmRl eCgwKT8udGl0bGUgPT09ICdBWFRpdGxlOiBBcHBsZScKKworUEFTUyBzdWNjZXNzZnVsbHlQYXJz ZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvZ3RrL21lbnUtbGlzdC1wb3B1cC1vcHRncm91cHMuaHRtbCBiL0xheW91dFRl c3RzL2FjY2Vzc2liaWxpdHkvZ3RrL21lbnUtbGlzdC1wb3B1cC1vcHRncm91cHMuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmY3NmRkMjFkZWFlYgotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvZ3RrL21lbnUtbGlzdC1wb3B1 cC1vcHRncm91cHMuaHRtbApAQCAtMCwwICsxLDQ2IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s PgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2FjY2Vzc2liaWxpdHktaGVs cGVyLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC5q cyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKworPHNlbGVjdCBpZD0ic2VsZWN0Ij4KKyAg ICA8b3B0aW9uPk5vbmU8L29wdGlvbj4KKyAgICA8b3B0Z3JvdXAgbGFiZWw9IkZydWl0Ij4KKyAg ICAgICAgPG9wdGlvbj5BcHBsZTwvb3B0aW9uPgorICAgICAgICA8b3B0aW9uIHNlbGVjdGVkPkJh bmFuYTwvb3B0aW9uPgorICAgIDwvb3B0Z3JvdXA+CisgICAgPG9wdGdyb3VwIGxhYmVsPSJWZWdl dGFibGVzIiBkaXNhYmxlZD4KKyAgICAgICAgPG9wdGlvbj5DYXJyb3Q8L29wdGlvbj4KKyAgICA8 L29wdGdyb3VwPgorPC9zZWxlY3Q+CisKKzxzY3JpcHQ+Cit2YXIgb3V0cHV0ID0gIlRoaXMgdGVz dCBlbnN1cmVzIHRoYXQgdGhlIHBvcHVwIG9mIGEgbmF0aXZlIGRyb3Bkb3duIGJveCBleHBvc2Vz IGFuIG9wdGdyb3VwIGFzIGEgZGlzYWJsZWQgbWVudSBpdGVtIHdpdGggaXRzIGxhYmVsLCBiZWZv cmUgaXRzIG9wdGlvbnMsIGFzIHRoZSBuYXRpdmUgcG9wdXAgc2hvd3MgaXQuXG5cbiI7CisKK2lm ICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICB3aW5kb3cuanNUZXN0SXNB c3luYyA9IHRydWU7CisKKyAgICBzZXRUaW1lb3V0KGFzeW5jIGZ1bmN0aW9uKCkgeworICAgICAg ICB3aW5kb3cuYXhTZWxlY3QgPSBhd2FpdCB3YWl0Rm9yRWxlbWVudEJ5SWQoInNlbGVjdCIpOwor ICAgICAgICB3aW5kb3cuYXhNZW51ID0gYXhTZWxlY3Q/LmNoaWxkQXRJbmRleCgwKTsKKyAgICAg ICAgZm9yIChsZXQgaSA9IDA7IGkgPCBheE1lbnU/LmNoaWxkcmVuQ291bnQ7IGkrKykgeworICAg ICAgICAgICAgY29uc3QgaXRlbSA9IGF4TWVudS5jaGlsZEF0SW5kZXgoaSk7CisgICAgICAgICAg ICBvdXRwdXQgKz0gYCR7aXRlbT8ucm9sZX0gJHtpdGVtPy50aXRsZX0gJHtpdGVtPy5pc0VuYWJs ZWQgPyAiZW5hYmxlZCIgOiAiZGlzYWJsZWQifVxuYDsKKyAgICAgICAgfQorICAgICAgICBvdXRw dXQgKz0gIlxuIjsKKworICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJheE1lbnU/LnNlbGVjdGVk Q2hpbGRBdEluZGV4KDApPy50aXRsZSIsICInQVhUaXRsZTogQmFuYW5hJyIpOworICAgICAgICBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2VsZWN0Iikuc2VsZWN0ZWRJbmRleCA9IDE7CisgICAg ICAgIG91dHB1dCArPSBhd2FpdCBleHBlY3RBc3luYygiYXhNZW51Py5zZWxlY3RlZENoaWxkQXRJ bmRleCgwKT8udGl0bGUiLCAiJ0FYVGl0bGU6IEFwcGxlJyIpOworCisgICAgICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJzZWxlY3QiKS5zdHlsZS5kaXNwbGF5ID0gIm5vbmUiOworICAgICAg ICBkZWJ1ZyhvdXRwdXQpOworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICB9LCAwKTsKK30K Kzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKaW5kZXggM2Y3YjUzNjdmNTg0Li41ZGFiY2I1OTUxYjYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcApA QCAtMTIyMyw5ICsxMjIzLDkgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQVhPYmplY3RDYWNoZTo6 Z2V0T3JDcmVhdGVTbG93KE5vZGUmIG5vZGUsIElzUGFydE9mUmVsYXRpb24KICAgICAgICAgICAg IHJldHVybiBudWxscHRyOwogICAgICAgICBSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4gb2Jq ZWN0OwogICAgICAgICBpZiAoc2VsZWN0LT5pc0Ryb3Bkb3duQm94KCkgJiYgIXNlbGVjdC0+dXNl c0Jhc2VBcHBlYXJhbmNlUGlja2VyKCkpIHsKLSAgICAgICAgICAgIGlmICghb3B0aW9uRWxlbWVu dCB8fCAhc2VsZWN0LT5yZW5kZXJlcigpKQorICAgICAgICAgICAgaWYgKCFzZWxlY3QtPnJlbmRl cmVyKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAgICAgICBvYmpl Y3QgPSBBY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb246OmNyZWF0ZShBWElEOjpnZW5lcmF0ZSgp LCAqb3B0aW9uRWxlbWVudCwgKnRoaXMpOworICAgICAgICAgICAgb2JqZWN0ID0gQWNjZXNzaWJp bGl0eU1lbnVMaXN0T3B0aW9uOjpjcmVhdGUoQVhJRDo6Z2VuZXJhdGUoKSwgZG93bmNhc3Q8SFRN TEVsZW1lbnQ+KG5vZGUpLCAqdGhpcyk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgb2Jq ZWN0ID0gQWNjZXNzaWJpbGl0eUxpc3RCb3hPcHRpb246OmNyZWF0ZShBWElEOjpnZW5lcmF0ZSgp LCBkb3duY2FzdDxIVE1MRWxlbWVudD4obm9kZSksICp0aGlzKTsKICAgICAgICAgY2FjaGVBbmRJ bml0aWFsaXplV3JhcHBlcigqb2JqZWN0LCAmbm9kZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbi5jcHAK aW5kZXggN2QyZGZlNjcyMTQ4Li5kYjk4OWIxOGY3N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbi5j cHAKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5T2JqZWN0SW5saW5l cy5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCisjaW5j bHVkZSAiSFRNTE9wdEdyb3VwRWxlbWVudC5oIgogI2luY2x1ZGUgIkhUTUxPcHRpb25FbGVtZW50 LmgiCiAjaW5jbHVkZSAiSFRNTFNlbGVjdEVsZW1lbnQuaCIKIApAQCAtMzksMjAgKzQwLDI5IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAotQWNj ZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uOjpBY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24oQVhJ RCBheElELCBIVE1MT3B0aW9uRWxlbWVudCYgZWxlbWVudCwgQVhPYmplY3RDYWNoZSYgY2FjaGUp CitBY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb246OkFjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlv bihBWElEIGF4SUQsIEhUTUxFbGVtZW50JiBlbGVtZW50LCBBWE9iamVjdENhY2hlJiBjYWNoZSkK ICAgICA6IEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0KGF4SUQsICZlbGVtZW50LCBjYWNoZSkKICAg ICAsIG1fcGFyZW50KG51bGxwdHIpCiB7CiB9CiAKLVJlZjxBY2Nlc3NpYmlsaXR5TWVudUxpc3RP cHRpb24+IEFjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbjo6Y3JlYXRlKEFYSUQgYXhJRCwgSFRN TE9wdGlvbkVsZW1lbnQmIGVsZW1lbnQsIEFYT2JqZWN0Q2FjaGUmIGNhY2hlKQorUmVmPEFjY2Vz c2liaWxpdHlNZW51TGlzdE9wdGlvbj4gQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uOjpjcmVh dGUoQVhJRCBheElELCBIVE1MRWxlbWVudCYgZWxlbWVudCwgQVhPYmplY3RDYWNoZSYgY2FjaGUp CiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9u KGF4SUQsIGVsZW1lbnQsIGNhY2hlKSk7CiB9CiAKIEhUTUxPcHRpb25FbGVtZW50KiBBY2Nlc3Np YmlsaXR5TWVudUxpc3RPcHRpb246Om9wdGlvbkVsZW1lbnQoKSBjb25zdAogewotICAgIHJldHVy biBkb3duY2FzdDxIVE1MT3B0aW9uRWxlbWVudD4obm9kZSgpKTsKKyAgICByZXR1cm4gZHluYW1p Y0Rvd25jYXN0PEhUTUxPcHRpb25FbGVtZW50Pihub2RlKCkpOworfQorCitIVE1MU2VsZWN0RWxl bWVudCogQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uOjpzZWxlY3RFbGVtZW50KCkgY29uc3QK K3sKKyAgICBpZiAoUmVmUHRyIG9wdGlvbkVsZW1lbnQgPSB0aGlzLT5vcHRpb25FbGVtZW50KCkp CisgICAgICAgIHJldHVybiBvcHRpb25FbGVtZW50LT5vd25lclNlbGVjdEVsZW1lbnQoKTsKKyAg ICBpZiAoUmVmUHRyIG9wdEdyb3VwRWxlbWVudCA9IGR5bmFtaWNEb3duY2FzdDxIVE1MT3B0R3Jv dXBFbGVtZW50Pihub2RlKCkpKQorICAgICAgICByZXR1cm4gb3B0R3JvdXBFbGVtZW50LT5vd25l clNlbGVjdEVsZW1lbnQoKTsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAogRWxlbWVudCogQWNj ZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uOjphY3Rpb25FbGVtZW50KCkgY29uc3QKQEAgLTYzLDE3 ICs3MywxNyBAQCBFbGVtZW50KiBBY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb246OmFjdGlvbkVs ZW1lbnQoKSBjb25zdAogYm9vbCBBY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb246OmlzRW5hYmxl ZCgpIGNvbnN0CiB7CiAgICAgYXV0byogb3B0aW9uRWxlbWVudCA9IHRoaXMtPm9wdGlvbkVsZW1l bnQoKTsKLSAgICByZXR1cm4gb3B0aW9uRWxlbWVudCAmJiAhb3B0aW9uRWxlbWVudC0+b3duRWxl bWVudERpc2FibGVkKCk7CisgICAgcmV0dXJuIG9wdGlvbkVsZW1lbnQgJiYgIW9wdGlvbkVsZW1l bnQtPmlzRGlzYWJsZWRGb3JtQ29udHJvbCgpOwogfQogCiBib29sIEFjY2Vzc2liaWxpdHlNZW51 TGlzdE9wdGlvbjo6aXNWaXNpYmxlKCkgY29uc3QKIHsKLSAgICBXZWFrUHRyIG9wdGlvbkVsZW1l bnQgPSB0aGlzLT5vcHRpb25FbGVtZW50KCk7Ci0gICAgaWYgKCFvcHRpb25FbGVtZW50KQorICAg IFJlZlB0ciBzZWxlY3RFbGVtZW50ID0gdGhpcy0+c2VsZWN0RWxlbWVudCgpOworICAgIGlmICgh c2VsZWN0RWxlbWVudCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gSW4gYSBzaW5n bGUtb3B0aW9uIHNlbGVjdCB3aXRoIHRoZSBwb3B1cCBjb2xsYXBzZWQsIG9ubHkgdGhlIHNlbGVj dGVkIGl0ZW0gaXMgY29uc2lkZXJlZCB2aXNpYmxlLgotICAgIFJlZlB0ciBvd25lclNlbGVjdEVs ZW1lbnQgPSBwcm90ZWN0KHByb3RlY3Qob3B0aW9uRWxlbWVudC0+ZG9jdW1lbnQoKSktPmF4T2Jq ZWN0Q2FjaGUoKSktPmdldE9yQ3JlYXRlKHByb3RlY3Qob3B0aW9uRWxlbWVudC0+b3duZXJTZWxl Y3RFbGVtZW50KCkpKTsKKyAgICBSZWZQdHIgb3duZXJTZWxlY3RFbGVtZW50ID0gcHJvdGVjdChw cm90ZWN0KHNlbGVjdEVsZW1lbnQtPmRvY3VtZW50KCkpLT5heE9iamVjdENhY2hlKCkpLT5nZXRP ckNyZWF0ZSgqc2VsZWN0RWxlbWVudCk7CiAgICAgcmV0dXJuIG93bmVyU2VsZWN0RWxlbWVudCAm JiAoIW93bmVyU2VsZWN0RWxlbWVudC0+aXNPZmZTY3JlZW4oKSB8fCBpc1NlbGVjdGVkKCkpOwog fQogCkBAIC0xMjEsOCArMTMxLDExIEBAIExheW91dFJlY3QgQWNjZXNzaWJpbGl0eU1lbnVMaXN0 T3B0aW9uOjplbGVtZW50UmVjdCgpIGNvbnN0CiAKIFN0cmluZyBBY2Nlc3NpYmlsaXR5TWVudUxp c3RPcHRpb246OnN0cmluZ1ZhbHVlKCkgY29uc3QKIHsKLSAgICBSZWZQdHIgb3B0aW9uRWxlbWVu dCA9IHRoaXMtPm9wdGlvbkVsZW1lbnQoKTsKLSAgICByZXR1cm4gb3B0aW9uRWxlbWVudCA/IG9w dGlvbkVsZW1lbnQtPmxhYmVsKCkgOiBTdHJpbmcoKTsKKyAgICBpZiAoUmVmUHRyIG9wdGlvbkVs ZW1lbnQgPSB0aGlzLT5vcHRpb25FbGVtZW50KCkpCisgICAgICAgIHJldHVybiBvcHRpb25FbGVt ZW50LT5sYWJlbCgpOworICAgIGlmIChSZWZQdHIgb3B0R3JvdXBFbGVtZW50ID0gZHluYW1pY0Rv d25jYXN0PEhUTUxPcHRHcm91cEVsZW1lbnQ+KG5vZGUoKSkpCisgICAgICAgIHJldHVybiBvcHRH cm91cEVsZW1lbnQtPmdyb3VwTGFiZWxUZXh0KCk7CisgICAgcmV0dXJuIHsgfTsKIH0KIAogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uLmgKaW5kZXggNjA1OGEzZDhkNDVj Li5iZTRiOWE3YzViY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24uaApAQCAtMzAsMTUgKzMwLDE3IEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgSFRNTEVsZW1lbnQ7CiBjbGFzcyBIVE1M T3B0aW9uRWxlbWVudDsKK2NsYXNzIEhUTUxTZWxlY3RFbGVtZW50OwogCiBjbGFzcyBBY2Nlc3Np YmlsaXR5TWVudUxpc3RPcHRpb24gZmluYWwgOiBwdWJsaWMgQWNjZXNzaWJpbGl0eU5vZGVPYmpl Y3QgewogcHVibGljOgotICAgIHN0YXRpYyBSZWY8QWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9u PiBjcmVhdGUoQVhJRCwgSFRNTE9wdGlvbkVsZW1lbnQmLCBBWE9iamVjdENhY2hlJik7CisgICAg c3RhdGljIFJlZjxBY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24+IGNyZWF0ZShBWElELCBIVE1M RWxlbWVudCYsIEFYT2JqZWN0Q2FjaGUmKTsKICAgICB2b2lkIHNldFBhcmVudChBY2Nlc3NpYmls aXR5T2JqZWN0KiBwYXJlbnQpIHsgbV9wYXJlbnQgPSBwYXJlbnQ7IH0KIAogcHJpdmF0ZToKLSAg ICBleHBsaWNpdCBBY2Nlc3NpYmlsaXR5TWVudUxpc3RPcHRpb24oQVhJRCwgSFRNTE9wdGlvbkVs ZW1lbnQmLCBBWE9iamVjdENhY2hlJik7CisgICAgZXhwbGljaXQgQWNjZXNzaWJpbGl0eU1lbnVM aXN0T3B0aW9uKEFYSUQsIEhUTUxFbGVtZW50JiwgQVhPYmplY3RDYWNoZSYpOwogCiAgICAgYm9v bCBpc01lbnVMaXN0T3B0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gdHJ1ZTsgfQogCkBAIC00 Nyw2ICs0OSw3IEBAIHByaXZhdGU6CiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogcGFyZW50T2Jq ZWN0KCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9wYXJlbnQuZ2V0KCk7IH0KIAogICAgIEhUTUxP cHRpb25FbGVtZW50KiBMRUdBQ1lfTk9ERUxFVEUgb3B0aW9uRWxlbWVudCgpIGNvbnN0OworICAg IEhUTUxTZWxlY3RFbGVtZW50KiBMRUdBQ1lfTk9ERUxFVEUgc2VsZWN0RWxlbWVudCgpIGNvbnN0 OwogICAgIEVsZW1lbnQqIGFjdGlvbkVsZW1lbnQoKSBjb25zdCBmaW5hbDsKICAgICBib29sIGlz RW5hYmxlZCgpIGNvbnN0IGZpbmFsOwogICAgIGJvb2wgaXNWaXNpYmxlKCkgY29uc3QgZmluYWw7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlN ZW51TGlzdFBvcHVwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU1lbnVMaXN0UG9wdXAuY3BwCmluZGV4IDVjZjExMWRjMzBiOS4uYzllNGRmOGE1MDA4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51 TGlzdFBvcHVwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlNZW51TGlzdFBvcHVwLmNwcApAQCAtMTM5LDE2ICsxMzksMjEgQEAgdm9pZCBBY2Nlc3Np YmlsaXR5TWVudUxpc3RQb3B1cDo6aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkKCkKIHZvaWQgQWNjZXNz aWJpbGl0eU1lbnVMaXN0UG9wdXA6OmRpZFVwZGF0ZUFjdGl2ZU9wdGlvbihpbnQgb3B0aW9uSW5k ZXgpCiB7CiAgICAgQVNTRVJUX0FSRyhvcHRpb25JbmRleCwgb3B0aW9uSW5kZXggPj0gMCk7Ci0g ICAgY29uc3QgYXV0byYgY2hpbGRyZW4gPSB1bmlnbm9yZWRDaGlsZHJlbigpOwotICAgIEFTU0VS VF9BUkcob3B0aW9uSW5kZXgsIG9wdGlvbkluZGV4IDwgc3RhdGljX2Nhc3Q8aW50PihjaGlsZHJl bi5zaXplKCkpKTsKKyAgICBSZWZQdHIgc2VsZWN0ID0gbV9wYXJlbnQgPyBkeW5hbWljRG93bmNh c3Q8SFRNTFNlbGVjdEVsZW1lbnQ+KG1fcGFyZW50LT5ub2RlKCkpIDogbnVsbHB0cjsKKyAgICBS ZWZQdHIgb3B0aW9uID0gc2VsZWN0ID8gc2VsZWN0LT5pdGVtKG9wdGlvbkluZGV4KSA6IG51bGxw dHI7CisgICAgaWYgKCFvcHRpb24pCisgICAgICAgIHJldHVybjsKIAogICAgIENoZWNrZWRQdHIg Y2FjaGUgPSBheE9iamVjdENhY2hlKCk7CiAgICAgaWYgKCFjYWNoZSkKICAgICAgICAgcmV0dXJu OwogCi0gICAgUmVmIGNoaWxkID0gZG93bmNhc3Q8QWNjZXNzaWJpbGl0eU9iamVjdD4oY2hpbGRy ZW5bb3B0aW9uSW5kZXhdLmdldCgpKTsKLSAgICBjYWNoZS0+cG9zdE5vdGlmaWNhdGlvbihjaGls ZC5wdHIoKSwgcHJvdGVjdChkb2N1bWVudCgpKSwgQVhOb3RpZmljYXRpb246OkZvY3VzZWRVSUVs ZW1lbnRDaGFuZ2VkKTsKLSAgICBjYWNoZS0+cG9zdE5vdGlmaWNhdGlvbihjaGlsZC5wdHIoKSwg cHJvdGVjdChkb2N1bWVudCgpKSwgQVhOb3RpZmljYXRpb246Ok1lbnVMaXN0SXRlbVNlbGVjdGVk KTsKKyAgICBSZWZQdHIgY2hpbGQgPSBjYWNoZS0+Z2V0KCpvcHRpb24pOworICAgIGlmICghY2hp bGQgfHwgY2hpbGQtPnBhcmVudE9iamVjdCgpICE9IHRoaXMpCisgICAgICAgIHJldHVybjsKKwor ICAgIGNhY2hlLT5wb3N0Tm90aWZpY2F0aW9uKGNoaWxkLmdldCgpLCBwcm90ZWN0KGRvY3VtZW50 KCkpLCBBWE5vdGlmaWNhdGlvbjo6Rm9jdXNlZFVJRWxlbWVudENoYW5nZWQpOworICAgIGNhY2hl LT5wb3N0Tm90aWZpY2F0aW9uKGNoaWxkLmdldCgpLCBwcm90ZWN0KGRvY3VtZW50KCkpLCBBWE5v dGlmaWNhdGlvbjo6TWVudUxpc3RJdGVtU2VsZWN0ZWQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCg==