232759 2021-11-05 10:13:07 -0700 AX: WebKit1 PluginViewBase objects with an associated widget()->platformWidget() should be considered attachments 2021-11-06 21:07:53 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tyler_w tyler_w aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1812162 0 tyler_w 2021-11-05 10:13:07 -0700 This is a regression from https://bugs.webkit.org/show_bug.cgi?id=229556 (AX: Make PDFs loaded via <embed> accessible). 1812164 1 webkit-bug-importer 2021-11-05 10:13:34 -0700 <rdar://problem/85075555> 1812193 2 443420 tyler_w 2021-11-05 11:34:39 -0700 Created attachment 443420 Patch 1812200 3 443420 cfleizach 2021-11-05 11:55:46 -0700 Comment on attachment 443420 Patch Is it possible to have a test for this 1812232 4 andresg_22 2021-11-05 13:42:47 -0700 (In reply to Tyler Wilcock from comment #2) > Created attachment 443420 [details] > Patch --- a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp +++ a/Source/WebCore/accessibility/AccessibilityRenderObject.cpp + bool hasPlatformWidget = widget() && widget()->platformWidget(); + if (is<PluginViewBase>(widget()) && !hasPlatformWidget) { you can write this in just one line like: if (is<PluginViewBase>(widget()) && !widget()->platformWidget()) { 1812266 5 443443 tyler_w 2021-11-05 15:27:55 -0700 Created attachment 443443 Patch 1812267 6 tyler_w 2021-11-05 15:29:04 -0700 (In reply to chris fleizach from comment #3) > Comment on attachment 443420 [details] > Patch > > Is it possible to have a test for this I haven't found a way to create a WK1 platformWidget-based object in a layout test. Do you know of a way? I tried un-skipping the test added by the bug that caused the regression in WK1: https://github.com/WebKit/WebKit/blob/f1f395b977bd8befab5023c5eda2cbde26aa9741/LayoutTests/accessibility/mac/basic-embed-pdf-accessibility.html#L14 But it still times out, so it wasn't this attachment bug causing the WK1 failure (which may mean <embed>s don’t use platformWidget’s in WK1). I manually tested the WK1 WebView linked against a build of WebKit with this patch and confirmed the issue is fixed. I also manually tested both WK2 <embed> and <object> PDFs and confirmed they are still accessible (and the layout test for the WK2 path still passes). I added a test for the renderWidgetChildren + AXEmptyGroup change. 1812456 7 ews-feeder 2021-11-06 21:07:51 -0700 Committed r285389 (243946@main): <https://commits.webkit.org/243946@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443443. 443420 2021-11-05 11:34:39 -0700 2021-11-05 15:27:52 -0700 Patch bug-232759-20211105133438.patch text/plain 4036 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyY2VmZDk1NTRkMTQ1 NWE1NmQzZmI1YTkyNTQ0M2RjZDdjNDYyYS4uMmViYTE3MGM3NmY1ODMxOGEwMTM0ZDkyMDc0NTli MDQwZWQyZTczNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTExLTA1ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFdlYktpdDEgUGx1 Z2luVmlld0Jhc2Ugb2JqZWN0cyB3aXRoIGFuIGFzc29jaWF0ZWQgd2lkZ2V0KCktPnBsYXRmb3Jt V2lkZ2V0KCkgc2hvdWxkIGJlIGNvbnNpZGVyZWQgYXR0YWNobWVudHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc1OQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk1NTYgKEFYOiBNYWtlIFBERnMKKyAgICAgICAgbG9hZGVk IHZpYSA8ZW1iZWQ+IGFjY2Vzc2libGUpLCB3ZSBjaGFuZ2VkIEFjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3Q6OmlzQXR0YWNobWVudAorICAgICAgICB0byByZXR1cm4gZmFsc2UgaWYgdGhlIHVuZGVy bHlpbmcgb2JqZWN0IHJlcHJlc2VudGVkIGEgUGx1Z2luVmlld0Jhc2UKKyAgICAgICAgdW5kZXIg dGhlIGFzc3VtcHRpb24gdGhhdCBpZiBhIFBsdWdpblZpZXdCYXNlIGV4aXN0ZWQsIHRoZSBvYmpl Y3QgbXVzdAorICAgICAgICBiZSBhIFdlYktpdDIgcGx1Z2luLiBUaGF0IGFzc3VtcHRpb24gaXMg d3JvbmcsIGJlY2F1c2UgaW4gY2VydGFpbgorICAgICAgICBzY2VuYXJpb3MgYW4gb2JqZWN0IGNh biBiZSBhIFdlYktpdDEgUGx1Z2luVmlld0Jhc2UgKGUuZy4gYXR0YWNobWVudHMKKyAgICAgICAg aW5zZXJ0ZWQgYnkgV2ViS2l0MSB3ZWJ2aWV3cykuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjaGFu Z2VzIGlzQXR0YWNobWVudCB0byBvbmx5IHJldHVybiBmYWxzZSBpZiB0aGUKKyAgICAgICAgUGx1 Z2luVmlld0Jhc2UgZG9lc24ndCBhbHNvIGhhdmUgYW4gYXNzb2NpYXRlZCBwbGF0Zm9ybVdpZGdl dCwgd2hpY2gKKyAgICAgICAgc2hvdWxkIGJlIHByZXNlbnQgaW4gV2ViS2l0MSBvbmx5LgorCisg ICAgICAgIFRoaXMgcGF0Y2ggYWxzbyBmaXhlcyBhIGJ1ZyBpbiB0aGUgTWFjIC1bV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXIKKyAgICAgICAgc3Vicm9sZV0uIEZvciBvYmplY3RzIHdpdGgg YSByb2xlIG9mIGdyb3VwIGFuZCBubyBjaGlsZHJlbiwgd2UKKyAgICAgICAgcmV0dXJuZWQgYSBz dWJyb2xlIG9mIEFYRW1wdHlHcm91cC4gSG93ZXZlciwgd2UgZGlkbid0IGNoZWNrIGZvciB0aGUK KyAgICAgICAgcHJlc2VuY2Ugb2YgcmVuZGVyV2lkZ2V0Q2hpbGRyZW4gdGhhdCBhIGdyb3VwIG1h eSBoYXZlLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Omlz QXR0YWNobWVudCBjb25zdCk6CisgICAgICAgIENvbnNpZGVyIFBsdWdpblZpZXdCYXNlIG9iamVj dHMgd2l0aCBhbiBhc3NvY2lhdGVkIHBsYXRmb3JtV2lkZ2V0IHRvCisgICAgICAgIGJlIGF0dGFj aG1lbnRzLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyTWFjLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ciBzdWJyb2xlXSk6CisgICAgICAgIERvbid0IHJldHVybiBBWEVtcHR5R3JvdXAgc3Vicm9sZSBm b3Igb2JqZWN0cyB3aXRoCisgICAgICAgIHJlbmRlcldpZGdldENoaWxkcmVuLgorCiAyMDIxLTEx LTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBbY3NzLXZh bHVlcy00XSB2aWV3cG9ydCB1bml0cyBzaG91bGQgYmUgZmxvYXRzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNw cAppbmRleCBkN2E1NWRiNjBhZDI3YTAyMjU2ODAwOTVkZWM3YWFiMjc1YjNlZDI0Li5iNTBhYWE0 MjYxNmFjNTY5NDc0NGZjMGU3M2JjZmYwOWE1MjRmYTcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAK QEAgLTUzNCw5ICs1MzQsMTIgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojppc0F0 dGFjaG1lbnQoKSBjb25zdAogICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAotICAgIC8vIEFsdGhvdWdoIHBsdWdpbnMgYXJlIGFsc28gYSB0eXBlIG9mIHdpZGdldCwg d2UgbmVlZCB0byB0cmVhdCB0aGVtIGRpZmZlcmVudGx5IHRoYW4gYXR0YWNobWVudHMuCi0gICAg aWYgKGlzPFBsdWdpblZpZXdCYXNlPih3aWRnZXQoKSkpCisgICAgYm9vbCBoYXNQbGF0Zm9ybVdp ZGdldCA9IHdpZGdldCgpICYmIHdpZGdldCgpLT5wbGF0Zm9ybVdpZGdldCgpOworICAgIGlmIChp czxQbHVnaW5WaWV3QmFzZT4od2lkZ2V0KCkpICYmICFoYXNQbGF0Zm9ybVdpZGdldCkgeworICAg ICAgICAvLyBXZWJLaXQyIHBsdWdpbnMgbmVlZCB0byBiZSB0cmVhdGVkIGRpZmZlcmVudGx5IHRo YW4gYXR0YWNobWVudHMsIHNvIHJldHVybiBmYWxzZSBoZXJlLgorICAgICAgICAvLyBPbmx5IFdl YktpdDEgcGx1Z2lucyBoYXZlIGFuIGFzc29jaWF0ZWQgcGxhdGZvcm1XaWRnZXQuCiAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICAvLyBXaWRnZXRzIGFyZSB0aGUgcmVwbGFjZWQg ZWxlbWVudHMgdGhhdCB3ZSByZXByZXNlbnQgdG8gQVggYXMgYXR0YWNobWVudHMKICAgICBib29s IGlzV2lkZ2V0ID0gcmVuZGVyZXItPmlzV2lkZ2V0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5t bSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyTWFjLm1tCmluZGV4IDExOGFlNmQ2MGFkZmVlZGEyZDEwN2M3YTgyOThmMTU0NTg4 ZGI0NWUuLjM5NTZjMDVjMzM4MzhkNjgzZmFlYWFiY2Q2YTc0MTRkOWQ2NzIwODIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dl YkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCkBAIC0xODQxLDcgKzE4NDEsNyBAQCBB TExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgICAgICByZXR1cm4gQCJBWE1l dGVyIjsKIAogICAgIC8vIFRyZWF0IGFueSBncm91cCB3aXRob3V0IGV4cG9zZWQgY2hpbGRyZW4g YXMgZW1wdHkuCi0gICAgaWYgKFtbc2VsZiByb2xlXSBpc0VxdWFsOk5TQWNjZXNzaWJpbGl0eUdy b3VwUm9sZV0gJiYgIWJhY2tpbmdPYmplY3QtPmNoaWxkcmVuKCkuc2l6ZSgpKQorICAgIGlmIChb W3NlbGYgcm9sZV0gaXNFcXVhbDpOU0FjY2Vzc2liaWxpdHlHcm91cFJvbGVdICYmICFiYWNraW5n T2JqZWN0LT5jaGlsZHJlbigpLnNpemUoKSAmJiAhW1tzZWxmIHJlbmRlcldpZGdldENoaWxkcmVu XSBjb3VudF0pCiAgICAgICAgIHJldHVybiBAIkFYRW1wdHlHcm91cCI7CiAKICAgICBBY2Nlc3Np YmlsaXR5Um9sZSByb2xlID0gYmFja2luZ09iamVjdC0+cm9sZVZhbHVlKCk7Cg== 443443 2021-11-05 15:27:55 -0700 2021-11-06 21:07:52 -0700 Patch bug-232759-20211105172754.patch text/plain 6601 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyY2VmZDk1NTRkMTQ1 NWE1NmQzZmI1YTkyNTQ0M2RjZDdjNDYyYS4uMmViYTE3MGM3NmY1ODMxOGEwMTM0ZDkyMDc0NTli MDQwZWQyZTczNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTExLTA1ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFdlYktpdDEgUGx1 Z2luVmlld0Jhc2Ugb2JqZWN0cyB3aXRoIGFuIGFzc29jaWF0ZWQgd2lkZ2V0KCktPnBsYXRmb3Jt V2lkZ2V0KCkgc2hvdWxkIGJlIGNvbnNpZGVyZWQgYXR0YWNobWVudHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjc1OQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk1NTYgKEFYOiBNYWtlIFBERnMKKyAgICAgICAgbG9hZGVk IHZpYSA8ZW1iZWQ+IGFjY2Vzc2libGUpLCB3ZSBjaGFuZ2VkIEFjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3Q6OmlzQXR0YWNobWVudAorICAgICAgICB0byByZXR1cm4gZmFsc2UgaWYgdGhlIHVuZGVy bHlpbmcgb2JqZWN0IHJlcHJlc2VudGVkIGEgUGx1Z2luVmlld0Jhc2UKKyAgICAgICAgdW5kZXIg dGhlIGFzc3VtcHRpb24gdGhhdCBpZiBhIFBsdWdpblZpZXdCYXNlIGV4aXN0ZWQsIHRoZSBvYmpl Y3QgbXVzdAorICAgICAgICBiZSBhIFdlYktpdDIgcGx1Z2luLiBUaGF0IGFzc3VtcHRpb24gaXMg d3JvbmcsIGJlY2F1c2UgaW4gY2VydGFpbgorICAgICAgICBzY2VuYXJpb3MgYW4gb2JqZWN0IGNh biBiZSBhIFdlYktpdDEgUGx1Z2luVmlld0Jhc2UgKGUuZy4gYXR0YWNobWVudHMKKyAgICAgICAg aW5zZXJ0ZWQgYnkgV2ViS2l0MSB3ZWJ2aWV3cykuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjaGFu Z2VzIGlzQXR0YWNobWVudCB0byBvbmx5IHJldHVybiBmYWxzZSBpZiB0aGUKKyAgICAgICAgUGx1 Z2luVmlld0Jhc2UgZG9lc24ndCBhbHNvIGhhdmUgYW4gYXNzb2NpYXRlZCBwbGF0Zm9ybVdpZGdl dCwgd2hpY2gKKyAgICAgICAgc2hvdWxkIGJlIHByZXNlbnQgaW4gV2ViS2l0MSBvbmx5LgorCisg ICAgICAgIFRoaXMgcGF0Y2ggYWxzbyBmaXhlcyBhIGJ1ZyBpbiB0aGUgTWFjIC1bV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXIKKyAgICAgICAgc3Vicm9sZV0uIEZvciBvYmplY3RzIHdpdGgg YSByb2xlIG9mIGdyb3VwIGFuZCBubyBjaGlsZHJlbiwgd2UKKyAgICAgICAgcmV0dXJuZWQgYSBz dWJyb2xlIG9mIEFYRW1wdHlHcm91cC4gSG93ZXZlciwgd2UgZGlkbid0IGNoZWNrIGZvciB0aGUK KyAgICAgICAgcHJlc2VuY2Ugb2YgcmVuZGVyV2lkZ2V0Q2hpbGRyZW4gdGhhdCBhIGdyb3VwIG1h eSBoYXZlLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Omlz QXR0YWNobWVudCBjb25zdCk6CisgICAgICAgIENvbnNpZGVyIFBsdWdpblZpZXdCYXNlIG9iamVj dHMgd2l0aCBhbiBhc3NvY2lhdGVkIHBsYXRmb3JtV2lkZ2V0IHRvCisgICAgICAgIGJlIGF0dGFj aG1lbnRzLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyTWFjLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ciBzdWJyb2xlXSk6CisgICAgICAgIERvbid0IHJldHVybiBBWEVtcHR5R3JvdXAgc3Vicm9sZSBm b3Igb2JqZWN0cyB3aXRoCisgICAgICAgIHJlbmRlcldpZGdldENoaWxkcmVuLgorCiAyMDIxLTEx LTA1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBbY3NzLXZh bHVlcy00XSB2aWV3cG9ydCB1bml0cyBzaG91bGQgYmUgZmxvYXRzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNw cAppbmRleCBkN2E1NWRiNjBhZDI3YTAyMjU2ODAwOTVkZWM3YWFiMjc1YjNlZDI0Li42MzcwZGY5 NWNjYjE2MGRlNGQ2OWJiZDNhZDJiMGRhYjQ1NzZlZWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAK QEAgLTUzNCw4ICs1MzQsOSBAQCBib29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmlzQXR0 YWNobWVudCgpIGNvbnN0CiAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCi0gICAgLy8gQWx0aG91Z2ggcGx1Z2lucyBhcmUgYWxzbyBhIHR5cGUgb2Ygd2lkZ2V0LCB3 ZSBuZWVkIHRvIHRyZWF0IHRoZW0gZGlmZmVyZW50bHkgdGhhbiBhdHRhY2htZW50cy4KLSAgICBp ZiAoaXM8UGx1Z2luVmlld0Jhc2U+KHdpZGdldCgpKSkKKyAgICAvLyBXZWJLaXQyIHBsdWdpbnMg bmVlZCB0byBiZSB0cmVhdGVkIGRpZmZlcmVudGx5IHRoYW4gYXR0YWNobWVudHMsIHNvIHJldHVy biBmYWxzZSBoZXJlLgorICAgIC8vIE9ubHkgV2ViS2l0MSBwbHVnaW5zIGhhdmUgYW4gYXNzb2Np YXRlZCBwbGF0Zm9ybVdpZGdldC4KKyAgICBpZiAoaXM8UGx1Z2luVmlld0Jhc2U+KHdpZGdldCgp KSAmJiAhd2lkZ2V0KCktPnBsYXRmb3JtV2lkZ2V0KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIC8vIFdpZGdldHMgYXJlIHRoZSByZXBsYWNlZCBlbGVtZW50cyB0aGF0IHdlIHJlcHJl c2VudCB0byBBWCBhcyBhdHRhY2htZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ck1hYy5tbQppbmRleCAxMThhZTZkNjBhZGZlZWRhMmQxMDdjN2E4Mjk4ZjE1NDU4OGRiNDVlLi4z OTU2YzA1YzMzODM4ZDY4M2ZhZWFhYmNkNmE3NDE0ZDlkNjcyMDgyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtMTg0MSw3ICsxODQxLDcgQEAgQUxMT1dfREVQ UkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICAgICAgcmV0dXJuIEAiQVhNZXRlciI7CiAK ICAgICAvLyBUcmVhdCBhbnkgZ3JvdXAgd2l0aG91dCBleHBvc2VkIGNoaWxkcmVuIGFzIGVtcHR5 LgotICAgIGlmIChbW3NlbGYgcm9sZV0gaXNFcXVhbDpOU0FjY2Vzc2liaWxpdHlHcm91cFJvbGVd ICYmICFiYWNraW5nT2JqZWN0LT5jaGlsZHJlbigpLnNpemUoKSkKKyAgICBpZiAoW1tzZWxmIHJv bGVdIGlzRXF1YWw6TlNBY2Nlc3NpYmlsaXR5R3JvdXBSb2xlXSAmJiAhYmFja2luZ09iamVjdC0+ Y2hpbGRyZW4oKS5zaXplKCkgJiYgIVtbc2VsZiByZW5kZXJXaWRnZXRDaGlsZHJlbl0gY291bnRd KQogICAgICAgICByZXR1cm4gQCJBWEVtcHR5R3JvdXAiOwogCiAgICAgQWNjZXNzaWJpbGl0eVJv bGUgcm9sZSA9IGJhY2tpbmdPYmplY3QtPnJvbGVWYWx1ZSgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDAwNTM0NzM1OTI5 ZjNiMzllMzY2MWJkODhlOTQ4M2I3ZDc0YmZiZjEuLmQzYjU0OTgwYzIzNWY0MTYwYTRlOGFiMWU3 OWU2N2RiNTFmOTE5MTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0xMS0wNSAgVHlsZXIg V2lsY29jayAgPHR5bGVyX3dAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBXZWJLaXQxIFBsdWdp blZpZXdCYXNlIG9iamVjdHMgd2l0aCBhbiBhc3NvY2lhdGVkIHdpZGdldCgpLT5wbGF0Zm9ybVdp ZGdldCgpIHNob3VsZCBiZSBjb25zaWRlcmVkIGF0dGFjaG1lbnRzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI3NTkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIE1h YyBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciB0byBub3QgcmV0dXJuCisgICAgICAgIGFu IEFYRW1wdHlHcm91cCBzdWJyb2xlIGZvciBvYmplY3RzIHdpdGggcmVuZGVyV2lkZ2V0Q2hpbGRy ZW4uCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9iYXNpYy1lbWJlZC1wZGYtYWNjZXNz aWJpbGl0eS1leHBlY3RlZC50eHQ6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvYmFzaWMt ZW1iZWQtcGRmLWFjY2Vzc2liaWxpdHkuaHRtbDoKKyAgICAgICAgQWRkIGV4cGVjdGF0aW9uIHRo YXQgdGhlIGVtYmVkIGNvbnRhaW5lciBkb2Vzbid0IGhhdmUgYW4gQVhFbXB0eUdyb3VwCisgICAg ICAgIHN1YnJvbGUuCisKIDIwMjEtMTEtMDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv bT4KIAogICAgICAgICBSZXN5bmMgd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwgZnJvbSB1cHN0cmVh bQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9tYWMvYmFzaWMtZW1iZWQt cGRmLWFjY2Vzc2liaWxpdHktZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9tYWMvYmFzaWMtZW1iZWQtcGRmLWFjY2Vzc2liaWxpdHktZXhwZWN0ZWQudHh0CmluZGV4IGVh ZDk5NTczYTUwZWNjMzQ0OTk3ZTkzMDhjNGFiNTNmMGQ1ZWM1OTkuLjdjYzQwYWFiZTVhZDA5Y2My YjhhMWVkNjM5OTRmNTZiYWY1MGQ2ZjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2FjY2Vzc2li aWxpdHkvbWFjL2Jhc2ljLWVtYmVkLXBkZi1hY2Nlc3NpYmlsaXR5LWV4cGVjdGVkLnR4dAorKysg Yi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9iYXNpYy1lbWJlZC1wZGYtYWNjZXNzaWJp bGl0eS1leHBlY3RlZC50eHQKQEAgLTUsNiArNSw3IEBAIE9uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNl ZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRF CiAKIFBBU1MgcGRmRW1iZWRFbGVtZW50LmRvbUlkZW50aWZpZXIgaXMgJ3BkZkVtYmVkJwogUEFT UyBwZGZFbWJlZEVsZW1lbnQucm9sZSBpcyAnQVhSb2xlOiBBWEdyb3VwJworUEFTUyBwZGZFbWJl ZEVsZW1lbnQuc3Vicm9sZSBpcyAnQVhTdWJyb2xlOiAnCiBQQVNTIHBkZkVtYmVkRWxlbWVudC5j aGlsZHJlbkNvdW50IGlzIDEKIFBBU1MgcGRmQXhPYmplY3Quc3RyaW5nQXR0cmlidXRlVmFsdWUo J0FYU3Vicm9sZScpIGlzICdBWFBERlBsdWdpblN1YnJvbGUnCiBQQVNTIHBkZkF4T2JqZWN0LmNo aWxkcmVuQ291bnQgaXMgMQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9t YWMvYmFzaWMtZW1iZWQtcGRmLWFjY2Vzc2liaWxpdHkuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvbWFjL2Jhc2ljLWVtYmVkLXBkZi1hY2Nlc3NpYmlsaXR5Lmh0bWwKaW5kZXggNjU5 ZjcxOTNjNDhmNTAwNzYzYjRlNmNmZTVhYzUxOGViMGRmODNiYi4uMDcyYWNkYWJiNjZkZWZiZmUy MTlhYzA4MjY1ODYyZWZlN2E2YjAxMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9tYWMvYmFzaWMtZW1iZWQtcGRmLWFjY2Vzc2liaWxpdHkuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9iYXNpYy1lbWJlZC1wZGYtYWNjZXNzaWJpbGl0eS5odG1s CkBAIC01MSw2ICs1MSw4IEBACiAKICAgICAgICAgICAgIHNob3VsZEJlKCJwZGZFbWJlZEVsZW1l bnQuZG9tSWRlbnRpZmllciIsICIncGRmRW1iZWQnIik7CiAgICAgICAgICAgICBzaG91bGRCZSgi cGRmRW1iZWRFbGVtZW50LnJvbGUiLCAiJ0FYUm9sZTogQVhHcm91cCciKTsKKyAgICAgICAgICAg IC8vIFZlcmlmeSB0aGUgZ3JvdXAgdGhhdCBjb250YWlucyB0aGUgUERGIEFYIG9iamVjdCBpc24n dCBjb25zaWRlcmVkIGVtcHR5IHZpYSBhbiBBWEVtcHR5R3JvdXAgc3Vicm9sZS4KKyAgICAgICAg ICAgIHNob3VsZEJlKCJwZGZFbWJlZEVsZW1lbnQuc3Vicm9sZSIsICInQVhTdWJyb2xlOiAnIik7 CiAgICAgICAgICAgICBzaG91bGRCZSgicGRmRW1iZWRFbGVtZW50LmNoaWxkcmVuQ291bnQiLCAi MSIpOwogCiAgICAgICAgICAgICBzaG91bGRCZSgicGRmQXhPYmplY3Quc3RyaW5nQXR0cmlidXRl VmFsdWUoJ0FYU3Vicm9sZScpIiwgIidBWFBERlBsdWdpblN1YnJvbGUnIik7Cg==