271287 2024-03-19 17:40:23 -0700 AX: Mac combo boxes should expose aria-activedescendant as AXSelectedChildren 2024-03-25 09:18:28 -0700 1 1 1 Unclassified WebKit Accessibility Safari Technology Preview All All RESOLVED FIXED InRadar P2 Normal --- 231724 1 dm_mazzoni dm_mazzoni aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig samuel_white tyler_w webkit-bug-importer oldest_to_newest 2022323 0 dm_mazzoni 2024-03-19 17:40:23 -0700 This is necessary, but probably not sufficient, to support https://bugs.webkit.org/show_bug.cgi?id=231724 (AX: VoiceOver doesn't announce aria-activedescendant value for select-only combobox specification). There are other bugs preventing VoiceOver from working but exposing the active descendant is pretty fundamental so I'd like to get that in first. Part of the bug is that an element can be both a combo box and a text field, so the supported attribute logic needed to be updated to take that into account. 2022325 1 webkit-bug-importer 2024-03-19 17:40:36 -0700 <rdar://problem/125050867> 2022336 2 470439 dm_mazzoni 2024-03-19 18:01:17 -0700 Created attachment 470439 Patch 2022919 3 470439 tyler_w 2024-03-21 16:01:06 -0700 Comment on attachment 470439 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=470439&action=review Thanks Dominic! > LayoutTests/accessibility/mac/aria-combobox-activedescendant.html:11 > +<div role="list" id="list" aria-label="List1"> > + <div role="listitem" id="item1" aria-label="item1">item1</div> Are the id attributes on these elements used? If not, could make the test a bit more concise by removing them? > LayoutTests/accessibility/mac/aria-combobox-activedescendant.html:25 > + var output = "On macOS, a combobox should map aria-activedescendant to AXSelectedChildren.\n"; > + > + if (window.accessibilityController) { > + var combobox = accessibilityController.accessibleElementById("combobox"); > + output += expect("combobox.selectedChildrenCount", "1"); > + activeDescendant = combobox.selectedChildAtIndex(0); > + output += expect("activeDescendant.role", "'AXRole: AXGroup'"); > + output += expect("activeDescendant.title", "'AXTitle: item2'"); > + debug(output); > + } Minor nit, but our layout test style has been moving towards not indenting one level inside script tags (so everything here can be shifted left). 2023200 4 470516 dm_mazzoni 2024-03-22 12:02:09 -0700 Created attachment 470516 Patch 2023676 5 ews-feeder 2024-03-25 09:18:26 -0700 Committed 276627@main (d87f5d670518): <https://commits.webkit.org/276627@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 470516. 470439 2024-03-19 18:01:17 -0700 2024-03-22 12:02:07 -0700 Patch bug-271287-20240319180116.patch text/plain 8728 dm_mazzoni RnJvbSBlNDliMDkxMWYyNWZkYzBmNmY1ZjFhMjQ5ZjY3MjRlOTdlMGZlZDc0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEb21pbmljIE1henpvbmkgPGRtX21henpvbmlAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDE5IE1hciAyMDI0IDE3OjU4OjI3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IE1hYyBjb21ibyBib3hlcyBzaG91bGQgZXhwb3NlIGFyaWEtYWN0aXZlZGVzY2VuZGFudCBh cwogQVhTZWxlY3RlZENoaWxkcmVuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNzEyODcKIHJkYXI6Ly9wcm9ibGVtLzEyNTA1MDg2NwoKUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCgpUaGlzIGlzIG5lY2Vzc2FyeSwgYnV0IHByb2JhYmx5IG5vdCBzdWZmaWNpZW50 LCB0byBzdXBwb3J0Cmh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE3 MjQgKEFYOiBWb2ljZU92ZXIgZG9lc24ndAphbm5vdW5jZSBhcmlhLWFjdGl2ZWRlc2NlbmRhbnQg dmFsdWUgZm9yIHNlbGVjdC1vbmx5IGNvbWJvYm94CnNwZWNpZmljYXRpb24pLiBUaGVyZSBhcmUg b3RoZXIgYnVncyBwcmV2ZW50aW5nIFZvaWNlT3ZlciBmcm9tIHdvcmtpbmcKYnV0IGV4cG9zaW5n IHRoZSBhY3RpdmUgZGVzY2VuZGFudCBpcyBwcmV0dHkgZnVuZGFtZW50YWwgc28gSSdkIGxpa2UK dG8gZ2V0IHRoYXQgaW4gZmlyc3QuCgpQYXJ0IG9mIHRoZSBidWcgaXMgdGhhdCBhbiBlbGVtZW50 IGNhbiBiZSBib3RoIGEgY29tYm8gYm94IGFuZCBhIHRleHQKZmllbGQsIHNvIHRoZSBzdXBwb3J0 ZWQgYXR0cmlidXRlIGxvZ2ljIG5lZWRlZCB0byBiZSB1cGRhdGVkIHRvIHRha2UKdGhhdCBpbnRv IGFjY291bnQuCgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2FyaWEtY29tYm9ib3gt YWN0aXZlZGVzY2VuZGFudC1leHBlY3RlZC50eHQ6IEFkZGVkLgoqIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvbWFjL2FyaWEtY29tYm9ib3gtYWN0aXZlZGVzY2VuZGFudC5odG1sOiBBZGRlZC4K KiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5jcHA6CihXZWJDb3Jl OjpBWENvcmVPYmplY3Q6OmNhbkhhdmVTZWxlY3RlZENoaWxkcmVuIGNvbnN0KToKKiBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgooV2ViQ29yZTo6 QWNjZXNzaWJpbGl0eU9iamVjdDo6c2VsZWN0ZWRDaGlsZHJlbik6CiogU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06Cigt W1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5U QVRJT05TX0VORF0pOgotLS0KIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhDb3JlT2Jq ZWN0LmNwcCB8ICAxICsKIC4uLi9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3Bw ICAgICB8ICA0ICsrKwogLi4uL21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5t bSAgIHwgMzEgKysrKysrKysrKysrKystLS0tLQogLi4ucmlhLWNvbWJvYm94LWFjdGl2ZWRlc2Nl bmRhbnQtZXhwZWN0ZWQudHh0IHwgMTEgKysrKysrKwogLi4uL21hYy9hcmlhLWNvbWJvYm94LWFj dGl2ZWRlc2NlbmRhbnQuaHRtbCAgIHwgMjggKysrKysrKysrKysrKysrKysKIDUgZmlsZXMgY2hh bmdlZCwgNjcgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0 NCBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hcmlhLWNvbWJvYm94LWFjdGl2ZWRlc2Nl bmRhbnQtZXhwZWN0ZWQudHh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9tYWMvYXJpYS1jb21ib2JveC1hY3RpdmVkZXNjZW5kYW50Lmh0bWwKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5jcHAKaW5kZXggOWM5NDQ2MWQ2 M2NiLi43ZWJhNDA1NDg5YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhDb3JlT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FY Q29yZU9iamVjdC5jcHAKQEAgLTEzMiw2ICsxMzIsNyBAQCBib29sIEFYQ29yZU9iamVjdDo6Y2Fu SGF2ZVNlbGVjdGVkQ2hpbGRyZW4oKSBjb25zdAogICAgIC8vIGZvY3VzZWQgZWxlbWVudC4KICAg ICBjYXNlIEFjY2Vzc2liaWxpdHlSb2xlOjpNZW51OgogICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJv bGU6Ok1lbnVCYXI6CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5Um9sZTo6Q29tYm9Cb3g6CiAjaWYg VVNFKEFUU1BJKQogICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJvbGU6Ok1lbnVMaXN0UG9wdXA6CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3QuY3BwCmluZGV4IDRlZjE1MDFlNDFjNy4uMjE0ZmE2ZTFiNjY5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAK QEAgLTQzMDEsNiArNDMwMSwxMCBAQCBBWENvcmVPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpzZWxlY3RlZENoaWxkcmVuKAogCiAgICAgQWNj ZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIHJlc3VsdDsKICAgICBzd2l0Y2ggKHJvbGVWYWx1ZSgp KSB7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5Um9sZTo6Q29tYm9Cb3g6CisgICAgICAgIGlmIChh dXRvKiBkZXNjZW5kYW50ID0gYWN0aXZlRGVzY2VuZGFudCgpKQorICAgICAgICAgICAgcmVzdWx0 ID0geyBkZXNjZW5kYW50IH07CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQWNjZXNzaWJpbGl0 eVJvbGU6Okxpc3RCb3g6CiAgICAgICAgIC8vIG5hdGl2ZSBsaXN0IGJveGVzIHdvdWxkIGJlIEFj Y2Vzc2liaWxpdHlMaXN0Qm94ZXMsIHNvIG9ubHkgY2hlY2sgZm9yIGFyaWEgbGlzdCBib3hlcwog ICAgICAgICByZXN1bHQgPSBhcmlhTGlzdGJveFNlbGVjdGVkQ2hpbGRyZW4oKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KaW5kZXggMGE3Nzc2MWFmZmRhLi44MDM1MWEw NzIyNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCkBAIC0xMDQy LDEyICsxMDQyLDIwIEBAIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogICAg ICAgICBOU0FjY2Vzc2liaWxpdHlUaXRsZUF0dHJpYnV0ZSwKICAgICAgICAgTlNBY2Nlc3NpYmls aXR5Q2hpbGRyZW5BdHRyaWJ1dGUsCiAgICAgXTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 UmV0YWluUHRyPE5TQXJyYXk+PiBzaGFyZWRDb250cm9sQXR0cnMgPSBAWworICAgICAgICBOU0Fj Y2Vzc2liaWxpdHlUaXRsZVVJRWxlbWVudEF0dHJpYnV0ZSwKKyAgICAgICAgTlNBY2Nlc3NpYmls aXR5QWNjZXNzS2V5QXR0cmlidXRlLAorICAgICAgICBOU0FjY2Vzc2liaWxpdHlSZXF1aXJlZEF0 dHJpYnV0ZSwKKyAgICAgICAgTlNBY2Nlc3NpYmlsaXR5SW52YWxpZEF0dHJpYnV0ZSwKKyAgICBd OworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxSZXRhaW5QdHI8TlNBcnJheT4+IHNoYXJlZENv bWJvQm94QXR0cnMgPSBAWworICAgICAgICBOU0FjY2Vzc2liaWxpdHlTZWxlY3RlZENoaWxkcmVu QXR0cmlidXRlLAorICAgICAgICBOU0FjY2Vzc2liaWxpdHlFeHBhbmRlZEF0dHJpYnV0ZSwKKyAg ICAgICAgTlNBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb25BdHRyaWJ1dGUsCisgICAgXTsKICAgICBz dGF0aWMgTmV2ZXJEZXN0cm95ZWQgY29udHJvbEF0dHJzID0gW10gewogICAgICAgICBhdXRvIHRl bXBBcnJheSA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdFdpdGhBcnJheTph dHRyaWJ1dGVzLmdldCgpLmdldCgpXSk7Ci0gICAgICAgIFt0ZW1wQXJyYXkgYWRkT2JqZWN0Ok5T QWNjZXNzaWJpbGl0eVRpdGxlVUlFbGVtZW50QXR0cmlidXRlXTsKLSAgICAgICAgW3RlbXBBcnJh eSBhZGRPYmplY3Q6TlNBY2Nlc3NpYmlsaXR5QWNjZXNzS2V5QXR0cmlidXRlXTsKLSAgICAgICAg W3RlbXBBcnJheSBhZGRPYmplY3Q6TlNBY2Nlc3NpYmlsaXR5UmVxdWlyZWRBdHRyaWJ1dGVdOwot ICAgICAgICBbdGVtcEFycmF5IGFkZE9iamVjdDpOU0FjY2Vzc2liaWxpdHlJbnZhbGlkQXR0cmli dXRlXTsKKyAgICAgICAgW3RlbXBBcnJheSBhZGRPYmplY3RzRnJvbUFycmF5OnNoYXJlZENvbnRy b2xBdHRycy5nZXQoKS5nZXQoKV07CiAgICAgICAgIHJldHVybiB0ZW1wQXJyYXk7CiAgICAgfSgp OwogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZCBidXR0b25BdHRycyA9IFtdIHsKQEAgLTEwNjAs OCArMTA2OCwxMyBAQCBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICB9 KCk7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkIGNvbWJvQm94QXR0cnMgPSBbXSB7CiAgICAg ICAgIGF1dG8gdGVtcEFycmF5ID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0 V2l0aEFycmF5OmNvbnRyb2xBdHRycy5nZXQoKS5nZXQoKV0pOwotICAgICAgICBbdGVtcEFycmF5 IGFkZE9iamVjdDpOU0FjY2Vzc2liaWxpdHlFeHBhbmRlZEF0dHJpYnV0ZV07Ci0gICAgICAgIFt0 ZW1wQXJyYXkgYWRkT2JqZWN0Ok5TQWNjZXNzaWJpbGl0eU9yaWVudGF0aW9uQXR0cmlidXRlXTsK KyAgICAgICAgW3RlbXBBcnJheSBhZGRPYmplY3RzRnJvbUFycmF5OnNoYXJlZENvbWJvQm94QXR0 cnMuZ2V0KCkuZ2V0KCldOworICAgICAgICByZXR1cm4gdGVtcEFycmF5OworICAgIH0oKTsKKyAg ICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQgdGV4dENvbWJvQm94QXR0cnMgPSBbXSB7CisgICAgICAg IGF1dG8gdGVtcEFycmF5ID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0V2l0 aEFycmF5OnRleHRBdHRycy5nZXQoKS5nZXQoKV0pOworICAgICAgICBbdGVtcEFycmF5IGFkZE9i amVjdHNGcm9tQXJyYXk6c2hhcmVkQ29udHJvbEF0dHJzLmdldCgpLmdldCgpXTsKKyAgICAgICAg W3RlbXBBcnJheSBhZGRPYmplY3RzRnJvbUFycmF5OnNoYXJlZENvbWJvQm94QXR0cnMuZ2V0KCku Z2V0KCldOwogICAgICAgICByZXR1cm4gdGVtcEFycmF5OwogICAgIH0oKTsKICAgICBzdGF0aWMg TmV2ZXJEZXN0cm95ZWQgdGFibGVBdHRycyA9IFtdIHsKQEAgLTExODAsNiArMTE5MywxMCBAQCBB TExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICAgICAgb2JqZWN0QXR0cmli dXRlcyA9IHdlYkFyZWFBdHRycy5nZXQoKS5nZXQoKTsKICAgICBlbHNlIGlmIChiYWNraW5nT2Jq ZWN0LT5pc1N0YXRpY1RleHQoKSkKICAgICAgICAgb2JqZWN0QXR0cmlidXRlcyA9IHN0YXRpY1Rl eHRBdHRycy5nZXQoKS5nZXQoKTsKKyAgICBlbHNlIGlmIChiYWNraW5nT2JqZWN0LT5pc0NvbWJv Qm94KCkgJiYgYmFja2luZ09iamVjdC0+aXNUZXh0Q29udHJvbCgpKQorICAgICAgICBvYmplY3RB dHRyaWJ1dGVzID0gdGV4dENvbWJvQm94QXR0cnMuZ2V0KCkuZ2V0KCk7CisgICAgZWxzZSBpZiAo YmFja2luZ09iamVjdC0+aXNDb21ib0JveCgpKQorICAgICAgICBvYmplY3RBdHRyaWJ1dGVzID0g Y29tYm9Cb3hBdHRycy5nZXQoKS5nZXQoKTsKICAgICBlbHNlIGlmIChiYWNraW5nT2JqZWN0LT5p c1RleHRDb250cm9sKCkpCiAgICAgICAgIG9iamVjdEF0dHJpYnV0ZXMgPSB0ZXh0QXR0cnMuZ2V0 KCkuZ2V0KCk7CiAgICAgZWxzZSBpZiAoYmFja2luZ09iamVjdC0+aXNMaW5rKCkpCkBAIC0xMjEw LDggKzEyMjcsNiBAQCBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICAg ICAgb2JqZWN0QXR0cmlidXRlcyA9IGxpc3RCb3hBdHRycy5nZXQoKS5nZXQoKTsKICAgICBlbHNl IGlmIChiYWNraW5nT2JqZWN0LT5pc0xpc3QoKSkKICAgICAgICAgb2JqZWN0QXR0cmlidXRlcyA9 IGxpc3RBdHRycy5nZXQoKS5nZXQoKTsKLSAgICBlbHNlIGlmIChiYWNraW5nT2JqZWN0LT5pc0Nv bWJvQm94KCkpCi0gICAgICAgIG9iamVjdEF0dHJpYnV0ZXMgPSBjb21ib0JveEF0dHJzLmdldCgp LmdldCgpOwogICAgIGVsc2UgaWYgKGJhY2tpbmdPYmplY3QtPmlzUHJvZ3Jlc3NJbmRpY2F0b3Io KSB8fCBiYWNraW5nT2JqZWN0LT5pc1NsaWRlcigpKQogICAgICAgICBvYmplY3RBdHRyaWJ1dGVz ID0gcmFuZ2VBdHRycy5nZXQoKS5nZXQoKTsKICAgICAvLyBUaGVzZSBhcmUgcHJvY2Vzc2VkIGlu IG9yZGVyIGJlY2F1c2UgYW4gaW5wdXQgaW1hZ2UgaXMgYSBidXR0b24sIGFuZCBhIGJ1dHRvbiBp cyBhIGNvbnRyb2wuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9h cmlhLWNvbWJvYm94LWFjdGl2ZWRlc2NlbmRhbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS9tYWMvYXJpYS1jb21ib2JveC1hY3RpdmVkZXNjZW5kYW50LWV4cGVjdGVk LnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjY1YmRjOTY3ZTU1 MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2FyaWEt Y29tYm9ib3gtYWN0aXZlZGVzY2VuZGFudC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMSBAQAor T24gbWFjT1MsIGEgY29tYm9ib3ggc2hvdWxkIG1hcCBhcmlhLWFjdGl2ZWRlc2NlbmRhbnQgdG8g QVhTZWxlY3RlZENoaWxkcmVuLgorUEFTUzogY29tYm9ib3guc2VsZWN0ZWRDaGlsZHJlbkNvdW50 ID09PSAxCitQQVNTOiBhY3RpdmVEZXNjZW5kYW50LnJvbGUgPT09ICdBWFJvbGU6IEFYR3JvdXAn CitQQVNTOiBhY3RpdmVEZXNjZW5kYW50LnRpdGxlID09PSAnQVhUaXRsZTogaXRlbTInCisKK1BB U1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCitpdGVtMQor aXRlbTIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2FyaWEtY29t Ym9ib3gtYWN0aXZlZGVzY2VuZGFudC5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9t YWMvYXJpYS1jb21ib2JveC1hY3RpdmVkZXNjZW5kYW50Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5kYjkyM2EzMDAwYzUKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hcmlhLWNvbWJvYm94LWFjdGl2ZWRlc2NlbmRh bnQuaHRtbApAQCAtMCwwICsxLDI4IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYv L0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291 cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMv YWNjZXNzaWJpbGl0eS1oZWxwZXIuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisKKzxp bnB1dCB0eXBlPSJ0ZXh0IiByb2xlPSJjb21ib2JveCIgaWQ9ImNvbWJvYm94IiBhcmlhLWxhYmVs PSJDb21ib2JveCIgYXJpYS1hY3RpdmVkZXNjZW5kYW50PSJpdGVtMiI+Cis8ZGl2IHJvbGU9Imxp c3QiIGlkPSJsaXN0IiBhcmlhLWxhYmVsPSJMaXN0MSI+CisgIDxkaXYgcm9sZT0ibGlzdGl0ZW0i IGlkPSJpdGVtMSIgYXJpYS1sYWJlbD0iaXRlbTEiPml0ZW0xPC9kaXY+CisgIDxkaXYgcm9sZT0i bGlzdGl0ZW0iIGlkPSJpdGVtMiIgYXJpYS1sYWJlbD0iaXRlbTIiPml0ZW0yPC9kaXY+Cis8L2Rp dj4KKworPHNjcmlwdD4KKyAgICB2YXIgb3V0cHV0ID0gIk9uIG1hY09TLCBhIGNvbWJvYm94IHNo b3VsZCBtYXAgYXJpYS1hY3RpdmVkZXNjZW5kYW50IHRvIEFYU2VsZWN0ZWRDaGlsZHJlbi5cbiI7 CisKKyAgICBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgICAgIHZh ciBjb21ib2JveCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJ ZCgiY29tYm9ib3giKTsKKyAgICAgICAgb3V0cHV0ICs9IGV4cGVjdCgiY29tYm9ib3guc2VsZWN0 ZWRDaGlsZHJlbkNvdW50IiwgIjEiKTsKKyAgICAgICAgYWN0aXZlRGVzY2VuZGFudCA9IGNvbWJv Ym94LnNlbGVjdGVkQ2hpbGRBdEluZGV4KDApOworICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJh Y3RpdmVEZXNjZW5kYW50LnJvbGUiLCAiJ0FYUm9sZTogQVhHcm91cCciKTsKKyAgICAgICAgb3V0 cHV0ICs9IGV4cGVjdCgiYWN0aXZlRGVzY2VuZGFudC50aXRsZSIsICInQVhUaXRsZTogaXRlbTIn Iik7CisgICAgICAgIGRlYnVnKG91dHB1dCk7CisgICAgfQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8 L2h0bWw+Cg== 470516 2024-03-22 12:02:09 -0700 2024-03-25 16:18:27 -0700 Patch bug-271287-20240322120208.patch text/plain 8633 dm_mazzoni RnJvbSBhZDdhNjY5ZjE4ZjNjYjlkYmMzZTBkYjg1ZTg1ZTQ0YWM3NTM1OGU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEb21pbmljIE1henpvbmkgPGRtX21henpvbmlAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDE5IE1hciAyMDI0IDE3OjU4OjI3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IE1hYyBjb21ibyBib3hlcyBzaG91bGQgZXhwb3NlIGFyaWEtYWN0aXZlZGVzY2VuZGFudCBh cwogQVhTZWxlY3RlZENoaWxkcmVuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNzEyODcKIHJkYXI6Ly9wcm9ibGVtLzEyNTA1MDg2NwoKUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCgpUaGlzIGlzIG5lY2Vzc2FyeSwgYnV0IHByb2JhYmx5IG5vdCBzdWZmaWNpZW50 LCB0byBzdXBwb3J0Cmh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE3 MjQgKEFYOiBWb2ljZU92ZXIgZG9lc24ndAphbm5vdW5jZSBhcmlhLWFjdGl2ZWRlc2NlbmRhbnQg dmFsdWUgZm9yIHNlbGVjdC1vbmx5IGNvbWJvYm94CnNwZWNpZmljYXRpb24pLiBUaGVyZSBhcmUg b3RoZXIgYnVncyBwcmV2ZW50aW5nIFZvaWNlT3ZlciBmcm9tIHdvcmtpbmcKYnV0IGV4cG9zaW5n IHRoZSBhY3RpdmUgZGVzY2VuZGFudCBpcyBwcmV0dHkgZnVuZGFtZW50YWwgc28gSSdkIGxpa2UK dG8gZ2V0IHRoYXQgaW4gZmlyc3QuCgpQYXJ0IG9mIHRoZSBidWcgaXMgdGhhdCBhbiBlbGVtZW50 IGNhbiBiZSBib3RoIGEgY29tYm8gYm94IGFuZCBhIHRleHQKZmllbGQsIHNvIHRoZSBzdXBwb3J0 ZWQgYXR0cmlidXRlIGxvZ2ljIG5lZWRlZCB0byBiZSB1cGRhdGVkIHRvIHRha2UKdGhhdCBpbnRv IGFjY291bnQuCgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2FyaWEtY29tYm9ib3gt YWN0aXZlZGVzY2VuZGFudC1leHBlY3RlZC50eHQ6IEFkZGVkLgoqIExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvbWFjL2FyaWEtY29tYm9ib3gtYWN0aXZlZGVzY2VuZGFudC5odG1sOiBBZGRlZC4K KiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5jcHA6CihXZWJDb3Jl OjpBWENvcmVPYmplY3Q6OmNhbkhhdmVTZWxlY3RlZENoaWxkcmVuIGNvbnN0KToKKiBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgooV2ViQ29yZTo6 QWNjZXNzaWJpbGl0eU9iamVjdDo6c2VsZWN0ZWRDaGlsZHJlbik6CiogU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06Cigt W1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5U QVRJT05TX0VORF0pOgotLS0KIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhDb3JlT2Jq ZWN0LmNwcCB8ICAxICsKIC4uLi9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3Bw ICAgICB8ICA0ICsrKwogLi4uL21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5t bSAgIHwgMzEgKysrKysrKysrKysrKystLS0tLQogLi4ucmlhLWNvbWJvYm94LWFjdGl2ZWRlc2Nl bmRhbnQtZXhwZWN0ZWQudHh0IHwgMTEgKysrKysrKwogLi4uL21hYy9hcmlhLWNvbWJvYm94LWFj dGl2ZWRlc2NlbmRhbnQuaHRtbCAgIHwgMjggKysrKysrKysrKysrKysrKysKIDUgZmlsZXMgY2hh bmdlZCwgNjcgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0 NCBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hcmlhLWNvbWJvYm94LWFjdGl2ZWRlc2Nl bmRhbnQtZXhwZWN0ZWQudHh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9tYWMvYXJpYS1jb21ib2JveC1hY3RpdmVkZXNjZW5kYW50Lmh0bWwKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5jcHAKaW5kZXggOWM5NDQ2MWQ2 M2NiLi43ZWJhNDA1NDg5YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhDb3JlT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FY Q29yZU9iamVjdC5jcHAKQEAgLTEzMiw2ICsxMzIsNyBAQCBib29sIEFYQ29yZU9iamVjdDo6Y2Fu SGF2ZVNlbGVjdGVkQ2hpbGRyZW4oKSBjb25zdAogICAgIC8vIGZvY3VzZWQgZWxlbWVudC4KICAg ICBjYXNlIEFjY2Vzc2liaWxpdHlSb2xlOjpNZW51OgogICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJv bGU6Ok1lbnVCYXI6CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5Um9sZTo6Q29tYm9Cb3g6CiAjaWYg VVNFKEFUU1BJKQogICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJvbGU6Ok1lbnVMaXN0UG9wdXA6CiAj ZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3QuY3BwCmluZGV4IDRlZjE1MDFlNDFjNy4uMjE0ZmE2ZTFiNjY5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAK QEAgLTQzMDEsNiArNDMwMSwxMCBAQCBBWENvcmVPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpzZWxlY3RlZENoaWxkcmVuKAogCiAgICAgQWNj ZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIHJlc3VsdDsKICAgICBzd2l0Y2ggKHJvbGVWYWx1ZSgp KSB7CisgICAgY2FzZSBBY2Nlc3NpYmlsaXR5Um9sZTo6Q29tYm9Cb3g6CisgICAgICAgIGlmIChh dXRvKiBkZXNjZW5kYW50ID0gYWN0aXZlRGVzY2VuZGFudCgpKQorICAgICAgICAgICAgcmVzdWx0 ID0geyBkZXNjZW5kYW50IH07CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQWNjZXNzaWJpbGl0 eVJvbGU6Okxpc3RCb3g6CiAgICAgICAgIC8vIG5hdGl2ZSBsaXN0IGJveGVzIHdvdWxkIGJlIEFj Y2Vzc2liaWxpdHlMaXN0Qm94ZXMsIHNvIG9ubHkgY2hlY2sgZm9yIGFyaWEgbGlzdCBib3hlcwog ICAgICAgICByZXN1bHQgPSBhcmlhTGlzdGJveFNlbGVjdGVkQ2hpbGRyZW4oKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KaW5kZXggMGE3Nzc2MWFmZmRhLi44MDM1MWEw NzIyNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCkBAIC0xMDQy LDEyICsxMDQyLDIwIEBAIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogICAg ICAgICBOU0FjY2Vzc2liaWxpdHlUaXRsZUF0dHJpYnV0ZSwKICAgICAgICAgTlNBY2Nlc3NpYmls aXR5Q2hpbGRyZW5BdHRyaWJ1dGUsCiAgICAgXTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 UmV0YWluUHRyPE5TQXJyYXk+PiBzaGFyZWRDb250cm9sQXR0cnMgPSBAWworICAgICAgICBOU0Fj Y2Vzc2liaWxpdHlUaXRsZVVJRWxlbWVudEF0dHJpYnV0ZSwKKyAgICAgICAgTlNBY2Nlc3NpYmls aXR5QWNjZXNzS2V5QXR0cmlidXRlLAorICAgICAgICBOU0FjY2Vzc2liaWxpdHlSZXF1aXJlZEF0 dHJpYnV0ZSwKKyAgICAgICAgTlNBY2Nlc3NpYmlsaXR5SW52YWxpZEF0dHJpYnV0ZSwKKyAgICBd OworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxSZXRhaW5QdHI8TlNBcnJheT4+IHNoYXJlZENv bWJvQm94QXR0cnMgPSBAWworICAgICAgICBOU0FjY2Vzc2liaWxpdHlTZWxlY3RlZENoaWxkcmVu QXR0cmlidXRlLAorICAgICAgICBOU0FjY2Vzc2liaWxpdHlFeHBhbmRlZEF0dHJpYnV0ZSwKKyAg ICAgICAgTlNBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb25BdHRyaWJ1dGUsCisgICAgXTsKICAgICBz dGF0aWMgTmV2ZXJEZXN0cm95ZWQgY29udHJvbEF0dHJzID0gW10gewogICAgICAgICBhdXRvIHRl bXBBcnJheSA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdFdpdGhBcnJheTph dHRyaWJ1dGVzLmdldCgpLmdldCgpXSk7Ci0gICAgICAgIFt0ZW1wQXJyYXkgYWRkT2JqZWN0Ok5T QWNjZXNzaWJpbGl0eVRpdGxlVUlFbGVtZW50QXR0cmlidXRlXTsKLSAgICAgICAgW3RlbXBBcnJh eSBhZGRPYmplY3Q6TlNBY2Nlc3NpYmlsaXR5QWNjZXNzS2V5QXR0cmlidXRlXTsKLSAgICAgICAg W3RlbXBBcnJheSBhZGRPYmplY3Q6TlNBY2Nlc3NpYmlsaXR5UmVxdWlyZWRBdHRyaWJ1dGVdOwot ICAgICAgICBbdGVtcEFycmF5IGFkZE9iamVjdDpOU0FjY2Vzc2liaWxpdHlJbnZhbGlkQXR0cmli dXRlXTsKKyAgICAgICAgW3RlbXBBcnJheSBhZGRPYmplY3RzRnJvbUFycmF5OnNoYXJlZENvbnRy b2xBdHRycy5nZXQoKS5nZXQoKV07CiAgICAgICAgIHJldHVybiB0ZW1wQXJyYXk7CiAgICAgfSgp OwogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZCBidXR0b25BdHRycyA9IFtdIHsKQEAgLTEwNjAs OCArMTA2OCwxMyBAQCBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICB9 KCk7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkIGNvbWJvQm94QXR0cnMgPSBbXSB7CiAgICAg ICAgIGF1dG8gdGVtcEFycmF5ID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0 V2l0aEFycmF5OmNvbnRyb2xBdHRycy5nZXQoKS5nZXQoKV0pOwotICAgICAgICBbdGVtcEFycmF5 IGFkZE9iamVjdDpOU0FjY2Vzc2liaWxpdHlFeHBhbmRlZEF0dHJpYnV0ZV07Ci0gICAgICAgIFt0 ZW1wQXJyYXkgYWRkT2JqZWN0Ok5TQWNjZXNzaWJpbGl0eU9yaWVudGF0aW9uQXR0cmlidXRlXTsK KyAgICAgICAgW3RlbXBBcnJheSBhZGRPYmplY3RzRnJvbUFycmF5OnNoYXJlZENvbWJvQm94QXR0 cnMuZ2V0KCkuZ2V0KCldOworICAgICAgICByZXR1cm4gdGVtcEFycmF5OworICAgIH0oKTsKKyAg ICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQgdGV4dENvbWJvQm94QXR0cnMgPSBbXSB7CisgICAgICAg IGF1dG8gdGVtcEFycmF5ID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0V2l0 aEFycmF5OnRleHRBdHRycy5nZXQoKS5nZXQoKV0pOworICAgICAgICBbdGVtcEFycmF5IGFkZE9i amVjdHNGcm9tQXJyYXk6c2hhcmVkQ29udHJvbEF0dHJzLmdldCgpLmdldCgpXTsKKyAgICAgICAg W3RlbXBBcnJheSBhZGRPYmplY3RzRnJvbUFycmF5OnNoYXJlZENvbWJvQm94QXR0cnMuZ2V0KCku Z2V0KCldOwogICAgICAgICByZXR1cm4gdGVtcEFycmF5OwogICAgIH0oKTsKICAgICBzdGF0aWMg TmV2ZXJEZXN0cm95ZWQgdGFibGVBdHRycyA9IFtdIHsKQEAgLTExODAsNiArMTE5MywxMCBAQCBB TExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICAgICAgb2JqZWN0QXR0cmli dXRlcyA9IHdlYkFyZWFBdHRycy5nZXQoKS5nZXQoKTsKICAgICBlbHNlIGlmIChiYWNraW5nT2Jq ZWN0LT5pc1N0YXRpY1RleHQoKSkKICAgICAgICAgb2JqZWN0QXR0cmlidXRlcyA9IHN0YXRpY1Rl eHRBdHRycy5nZXQoKS5nZXQoKTsKKyAgICBlbHNlIGlmIChiYWNraW5nT2JqZWN0LT5pc0NvbWJv Qm94KCkgJiYgYmFja2luZ09iamVjdC0+aXNUZXh0Q29udHJvbCgpKQorICAgICAgICBvYmplY3RB dHRyaWJ1dGVzID0gdGV4dENvbWJvQm94QXR0cnMuZ2V0KCkuZ2V0KCk7CisgICAgZWxzZSBpZiAo YmFja2luZ09iamVjdC0+aXNDb21ib0JveCgpKQorICAgICAgICBvYmplY3RBdHRyaWJ1dGVzID0g Y29tYm9Cb3hBdHRycy5nZXQoKS5nZXQoKTsKICAgICBlbHNlIGlmIChiYWNraW5nT2JqZWN0LT5p c1RleHRDb250cm9sKCkpCiAgICAgICAgIG9iamVjdEF0dHJpYnV0ZXMgPSB0ZXh0QXR0cnMuZ2V0 KCkuZ2V0KCk7CiAgICAgZWxzZSBpZiAoYmFja2luZ09iamVjdC0+aXNMaW5rKCkpCkBAIC0xMjEw LDggKzEyMjcsNiBAQCBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICAg ICAgb2JqZWN0QXR0cmlidXRlcyA9IGxpc3RCb3hBdHRycy5nZXQoKS5nZXQoKTsKICAgICBlbHNl IGlmIChiYWNraW5nT2JqZWN0LT5pc0xpc3QoKSkKICAgICAgICAgb2JqZWN0QXR0cmlidXRlcyA9 IGxpc3RBdHRycy5nZXQoKS5nZXQoKTsKLSAgICBlbHNlIGlmIChiYWNraW5nT2JqZWN0LT5pc0Nv bWJvQm94KCkpCi0gICAgICAgIG9iamVjdEF0dHJpYnV0ZXMgPSBjb21ib0JveEF0dHJzLmdldCgp LmdldCgpOwogICAgIGVsc2UgaWYgKGJhY2tpbmdPYmplY3QtPmlzUHJvZ3Jlc3NJbmRpY2F0b3Io KSB8fCBiYWNraW5nT2JqZWN0LT5pc1NsaWRlcigpKQogICAgICAgICBvYmplY3RBdHRyaWJ1dGVz ID0gcmFuZ2VBdHRycy5nZXQoKS5nZXQoKTsKICAgICAvLyBUaGVzZSBhcmUgcHJvY2Vzc2VkIGlu IG9yZGVyIGJlY2F1c2UgYW4gaW5wdXQgaW1hZ2UgaXMgYSBidXR0b24sIGFuZCBhIGJ1dHRvbiBp cyBhIGNvbnRyb2wuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9h cmlhLWNvbWJvYm94LWFjdGl2ZWRlc2NlbmRhbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS9tYWMvYXJpYS1jb21ib2JveC1hY3RpdmVkZXNjZW5kYW50LWV4cGVjdGVk LnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjY1YmRjOTY3ZTU1 MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2FyaWEt Y29tYm9ib3gtYWN0aXZlZGVzY2VuZGFudC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMSBAQAor T24gbWFjT1MsIGEgY29tYm9ib3ggc2hvdWxkIG1hcCBhcmlhLWFjdGl2ZWRlc2NlbmRhbnQgdG8g QVhTZWxlY3RlZENoaWxkcmVuLgorUEFTUzogY29tYm9ib3guc2VsZWN0ZWRDaGlsZHJlbkNvdW50 ID09PSAxCitQQVNTOiBhY3RpdmVEZXNjZW5kYW50LnJvbGUgPT09ICdBWFJvbGU6IEFYR3JvdXAn CitQQVNTOiBhY3RpdmVEZXNjZW5kYW50LnRpdGxlID09PSAnQVhUaXRsZTogaXRlbTInCisKK1BB U1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCitpdGVtMQor aXRlbTIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL2FyaWEtY29t Ym9ib3gtYWN0aXZlZGVzY2VuZGFudC5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9t YWMvYXJpYS1jb21ib2JveC1hY3RpdmVkZXNjZW5kYW50Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwLi4wYzI5ZDBiNWEzYmYKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9hcmlhLWNvbWJvYm94LWFjdGl2ZWRlc2NlbmRh bnQuaHRtbApAQCAtMCwwICsxLDI4IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYv L0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291 cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMv YWNjZXNzaWJpbGl0eS1oZWxwZXIuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisKKzxp bnB1dCB0eXBlPSJ0ZXh0IiByb2xlPSJjb21ib2JveCIgaWQ9ImNvbWJvYm94IiBhcmlhLWxhYmVs PSJDb21ib2JveCIgYXJpYS1hY3RpdmVkZXNjZW5kYW50PSJpdGVtMiI+Cis8ZGl2IHJvbGU9Imxp c3QiPgorICA8ZGl2IHJvbGU9Imxpc3RpdGVtIj5pdGVtMTwvZGl2PgorICA8ZGl2IHJvbGU9Imxp c3RpdGVtIiBpZD0iaXRlbTIiIGFyaWEtbGFiZWw9Iml0ZW0yIj5pdGVtMjwvZGl2PgorPC9kaXY+ CisKKzxzY3JpcHQ+Cit2YXIgb3V0cHV0ID0gIk9uIG1hY09TLCBhIGNvbWJvYm94IHNob3VsZCBt YXAgYXJpYS1hY3RpdmVkZXNjZW5kYW50IHRvIEFYU2VsZWN0ZWRDaGlsZHJlbi5cbiI7CisKK2lm ICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICB2YXIgY29tYm9ib3ggPSBh Y2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImNvbWJvYm94Iik7 CisgICAgb3V0cHV0ICs9IGV4cGVjdCgiY29tYm9ib3guc2VsZWN0ZWRDaGlsZHJlbkNvdW50Iiwg IjEiKTsKKyAgICBhY3RpdmVEZXNjZW5kYW50ID0gY29tYm9ib3guc2VsZWN0ZWRDaGlsZEF0SW5k ZXgoMCk7CisgICAgb3V0cHV0ICs9IGV4cGVjdCgiYWN0aXZlRGVzY2VuZGFudC5yb2xlIiwgIidB WFJvbGU6IEFYR3JvdXAnIik7CisgICAgb3V0cHV0ICs9IGV4cGVjdCgiYWN0aXZlRGVzY2VuZGFu dC50aXRsZSIsICInQVhUaXRsZTogaXRlbTInIik7CisgICAgZGVidWcob3V0cHV0KTsKK30KKzwv c2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=