160009 2016-07-20 21:12:15 -0700 AX: aria-label not being used correctly in accessible name calculation of heading 2019-09-26 12:05:46 -0700 1 1 1 Unclassified WebKit Accessibility Safari 9 All All RESOLVED FIXED InRadar P2 Normal --- 1 dylan webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs mario n_wang samuel_white webkit-bug-importer oldest_to_newest 1213021 0 dylan 2016-07-20 21:12:15 -0700 The accessible name calculation algorithm for ARIA https://www.w3.org/TR/wai-aria/roles#textalternativecomputation states that aria-label (step 2A) takes precedence over the content of an element (step 2C) for the calculation of the name of the element when that element's role allows both content or author as the source of the accessible name. This codepen http://codepen.io/anon/pen/dXdEXx shows that VO on both OS X and iOS does not implement that algorithm correctly. In the case of OS X, the rotor displays the correctly calculated text, but the spoken text does not match this. In the case of iOS, the incorrect text (content) is spoken instead of the aria-label text. 1213023 1 webkit-bug-importer 2016-07-20 21:13:20 -0700 <rdar://problem/27464404> 1213370 2 284275 n_wang 2016-07-21 15:57:24 -0700 Created attachment 284275 Patch Webkit is exposing the correct information. We can see that the heading has the correct label in web inspector. So I think on macOS we should let VoiceOver handle what to speak. The patch is for iOS only. 1213376 3 284275 cfleizach 2016-07-21 16:02:22 -0700 Comment on attachment 284275 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=284275&action=review > Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:604 > + if (![wrapper accessibilityLabel].length) the dot pattern looks strange for this method. can you 1) cache axLabel in an ivar then just use [axLabel length] 1213381 4 284278 n_wang 2016-07-21 16:09:36 -0700 Created attachment 284278 Patch Update from review 1213388 5 284278 cfleizach 2016-07-21 16:20:15 -0700 Comment on attachment 284278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=284278&action=review > Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:604 > + NSString* headingLabel = [wrapper accessibilityLabel]; nit: for objc * is on the other side NSString *headingLabel 1213402 6 n_wang 2016-07-21 16:49:52 -0700 Committed in: https://trac.webkit.org/changeset/203538 284275 2016-07-21 15:57:24 -0700 2016-07-21 16:09:36 -0700 Patch patch.txt text/plain 5571 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMzUzMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTA3LTIxICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IGFyaWEtbGFiZWwgbm90IGJlaW5n IHVzZWQgY29ycmVjdGx5IGluIGFjY2Vzc2libGUgbmFtZSBjYWxjdWxhdGlvbiBvZiBoZWFkaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjAwMDkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY3R1YWxs eSB3ZSBhcmUgZXhwb3NpbmcgdGhlIGNvcnJlY3QgaW5mb3JtYXRpb24gZm9yIGhlYWRpbmcgb2Jq ZWN0cy4gT24gbWFjT1MsIAorICAgICAgICBWb2ljZU92ZXIgc2hvdWxkIGhhbmRsZSB0aGUgbG9n aWMgdGhhdCBwaWNrcyB0aGUgcmlnaHQgaW5mb3JtYXRpb24gdG8gc3BlYWsuCisgICAgICAgIE9u IGlPUywgVm9pY2VPdmVyIGlzIHNwZWFraW5nIHRoZSBzdGF0aWMgdGV4dCBjaGlsZCBpbnN0ZWFk IG9mIHRoZSBoZWFkaW5nIG9iamVjdC4KKyAgICAgICAgU28gd2Ugc2hvdWxkIHNldCB0aGUgYWNj ZXNzaWJpbGl0eUxhYmVsIG9mIHRoZSBzdGF0aWMgdGV4dCBiYXNlZCBvbiB0aGUgcGFyZW50J3Mg CisgICAgICAgIGFsdGVybmF0ZSBsYWJlbC4KKworICAgICAgICBUZXN0OiBhY2Nlc3NpYmlsaXR5 L2lvcy1zaW11bGF0b3IvaGVhZGluZy13aXRoLWFyaWEtbGFiZWwuaHRtbAorCisgICAgICAgICog YWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW06Cisg ICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIF9hY2Nlc3NpYmlsaXR5VHJh aXRzRnJvbUFuY2VzdG9yc10pOgorCiAyMDE2LTA3LTIxICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CiAKICAgICAgICAgRml4IG51bGwgaGFuZGxpbmcgb2YgU1ZHQW5nbGUvU1ZHTGVu Z3RoLnZhbHVlQXNTdHJpbmcgYXR0cmlidXRlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlcklPUy5tbQkocmV2aXNpb24gMjAzNDI5KQorKysgU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0JKHdvcmtp bmcgY29weSkKQEAgLTU5OCw4ICs1OTgsMTQgQEAgLSAodWludDY0X3QpX2FjY2Vzc2liaWxpdHlU cmFpdHNGcm9tQW5jZQogICAgICAgICAgICAgICAgIC8vIHRvIHRoZSBoZWFkaW5nIGxldmVsLiBJ ZiBpdCB3YXMgYSBzdGF0aWMgdGV4dCBlbGVtZW50LCB3ZSBuZWVkIHRvIHN0b3JlCiAgICAgICAg ICAgICAgICAgLy8gdGhlIHZhbHVlIGFzIHRoZSBsYWJlbCwgYmVjYXVzZSB0aGUgaGVhZGluZyBs ZXZlbCBuZWVkcyB0byB0aGUgdmFsdWUuCiAgICAgICAgICAgICAgICAgQWNjZXNzaWJpbGl0eU9i amVjdFdyYXBwZXIqIHdyYXBwZXIgPSBwYXJlbnQtPndyYXBwZXIoKTsKLSAgICAgICAgICAgICAg ICBpZiAocm9sZSA9PSBTdGF0aWNUZXh0Um9sZSkgCi0gICAgICAgICAgICAgICAgICAgIFtzZWxm IHNldEFjY2Vzc2liaWxpdHlMYWJlbDptX29iamVjdC0+c3RyaW5nVmFsdWUoKV07ICAgICAgICAg ICAgICAgIAorICAgICAgICAgICAgICAgIGlmIChyb2xlID09IFN0YXRpY1RleHRSb2xlKSB7Cisg ICAgICAgICAgICAgICAgICAgIC8vIFdlIHNob3VsZCBvbmx5IHNldCB0aGUgdGV4dCB2YWx1ZSBh cyB0aGUgbGFiZWwgd2hlbiB0aGVyZSdzIG5vCisgICAgICAgICAgICAgICAgICAgIC8vIGFsdGVy bmF0ZSB0ZXh0IG9uIHRoZSBoZWFkaW5nIHBhcmVudC4KKyAgICAgICAgICAgICAgICAgICAgaWYg KCFbd3JhcHBlciBhY2Nlc3NpYmlsaXR5TGFiZWxdLmxlbmd0aCkKKyAgICAgICAgICAgICAgICAg ICAgICAgIFtzZWxmIHNldEFjY2Vzc2liaWxpdHlMYWJlbDptX29iamVjdC0+c3RyaW5nVmFsdWUo KV07CisgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgIFtz ZWxmIHNldEFjY2Vzc2liaWxpdHlMYWJlbDpbd3JhcHBlciBhY2Nlc3NpYmlsaXR5TGFiZWxdXTsK KyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgW3NlbGYgc2V0QWNjZXNzaWJpbGl0 eVZhbHVlOlt3cmFwcGVyIGFjY2Vzc2liaWxpdHlWYWx1ZV1dOwogICAgICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICAgICAgfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjAzNDI5KQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTYtMDct MjEgIE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogYXJpYS1sYWJl bCBub3QgYmVpbmcgdXNlZCBjb3JyZWN0bHkgaW4gYWNjZXNzaWJsZSBuYW1lIGNhbGN1bGF0aW9u IG9mIGhlYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2MDAwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9yL2hlYWRpbmctd2l0aC1hcmlhLWxhYmVs LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxh dG9yL2hlYWRpbmctd2l0aC1hcmlhLWxhYmVsLmh0bWw6IEFkZGVkLgorCiAyMDE2LTA3LTE5ICBD aHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgYXV0b2NhcGl0YWxpemUg YXR0cmlidXRlIHNob3VsZCBub3QgdXNlIFtUcmVhdE51bGxBcz1MZWdhY3lOdWxsU3RyaW5nXQpJ bmRleDogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9yL2hlYWRpbmctd2l0 aC1hcmlhLWxhYmVsLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9hY2Nl c3NpYmlsaXR5L2lvcy1zaW11bGF0b3IvaGVhZGluZy13aXRoLWFyaWEtbGFiZWwtZXhwZWN0ZWQu dHh0CShub25leGlzdGVudCkKKysrIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvaW9zLXNpbXVs YXRvci9oZWFkaW5nLXdpdGgtYXJpYS1sYWJlbC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkK QEAgLTAsMCArMSwxMyBAQAordmlzaWJsZSB0ZXh0IHZpc2libGUgdGV4dAorVGhpcyB0ZXN0cyB0 aGF0IGlmIGhlYWRpbmcgaGFzIGFyaWEtbGFiZWwsIGl0IHdpbGwgb3ZlcnJpZGUgdGhlIHZpc2li bGUgdGV4dCBhcyBuZWNlc3NhcnkuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmll cyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQ QVNTIGhlYWRpbmcxVGV4dC50cmFpdHMgPT0gaGVhZGluZzJUZXh0LnRyYWl0cyBpcyB0cnVlCitQ QVNTIGhlYWRpbmcxVGV4dC5kZXNjcmlwdGlvbiBpcyAnQVhMYWJlbDogdGVzdCBsYWJlbCcKK1BB U1MgaGVhZGluZzJUZXh0LmRlc2NyaXB0aW9uIGlzICdBWExhYmVsOiB2aXNpYmxlIHRleHQnCitQ QVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDog TGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9yL2hlYWRpbmctd2l0aC1hcmlh LWxhYmVsLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9pb3Mt c2ltdWxhdG9yL2hlYWRpbmctd2l0aC1hcmlhLWxhYmVsLmh0bWwJKG5vbmV4aXN0ZW50KQorKysg TGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9pb3Mtc2ltdWxhdG9yL2hlYWRpbmctd2l0aC1hcmlh LWxhYmVsLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzOSBAQAorPCFET0NUWVBFIEhU TUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxzY3Jp cHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlw dD4KK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPC9oZWFkPgor PGJvZHkgaWQ9ImJvZHkiPgorCis8c3BhbiBpZD0iaGVhZGluZzEiIHJvbGU9ImhlYWRpbmciIGFy aWEtbGFiZWw9InRlc3QgbGFiZWwiPnZpc2libGUgdGV4dDwvc3Bhbj4KKzxzcGFuIGlkPSJoZWFk aW5nMiIgcm9sZT0iaGVhZGluZyI+dmlzaWJsZSB0ZXh0PC9zcGFuPgorCis8cCBpZD0iZGVzY3Jp cHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0PgorCisgICAg ZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCBpZiBoZWFkaW5nIGhhcyBhcmlhLWxhYmVsLCBp dCB3aWxsIG92ZXJyaWRlIHRoZSB2aXNpYmxlIHRleHQgYXMgbmVjZXNzYXJ5LiIpOworCisgICAg aWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworCisgICAgICAgIHZhciBoZWFk aW5nMVRleHQgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQo ImhlYWRpbmcxIikuY2hpbGRBdEluZGV4KDApOworICAgICAgICB2YXIgaGVhZGluZzJUZXh0ID0g YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJoZWFkaW5nMiIp LmNoaWxkQXRJbmRleCgwKTsKKyAgICAgICAgCisgICAgICAgIC8vIEdldCB0aGUgdHJhaXQgc28g dGhhdCB0aGUgbGFiZWwgd2lsbCBiZSBzZXQuCisgICAgICAgIHNob3VsZEJlVHJ1ZSgiaGVhZGlu ZzFUZXh0LnRyYWl0cyA9PSBoZWFkaW5nMlRleHQudHJhaXRzIik7CisgICAgICAgIAorICAgICAg ICBzaG91bGRCZSgiaGVhZGluZzFUZXh0LmRlc2NyaXB0aW9uIiwgIidBWExhYmVsOiB0ZXN0IGxh YmVsJyIpOworICAgICAgICBzaG91bGRCZSgiaGVhZGluZzJUZXh0LmRlc2NyaXB0aW9uIiwgIidB WExhYmVsOiB2aXNpYmxlIHRleHQnIik7CisgICAgfQorCisgICAgc3VjY2Vzc2Z1bGx5UGFyc2Vk ID0gdHJ1ZTsKKzwvc2NyaXB0PgorCis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRl c3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CisK 284278 2016-07-21 16:09:36 -0700 2016-07-21 16:25:47 -0700 Patch patch.txt text/plain 5617 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMzUzMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTA3LTIxICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IGFyaWEtbGFiZWwgbm90IGJlaW5n IHVzZWQgY29ycmVjdGx5IGluIGFjY2Vzc2libGUgbmFtZSBjYWxjdWxhdGlvbiBvZiBoZWFkaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjAwMDkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY3R1YWxs eSB3ZSBhcmUgZXhwb3NpbmcgdGhlIGNvcnJlY3QgaW5mb3JtYXRpb24gZm9yIGhlYWRpbmcgb2Jq ZWN0cy4gT24gbWFjT1MsIAorICAgICAgICBWb2ljZU92ZXIgc2hvdWxkIGhhbmRsZSB0aGUgbG9n aWMgdGhhdCBwaWNrcyB0aGUgcmlnaHQgaW5mb3JtYXRpb24gdG8gc3BlYWsuCisgICAgICAgIE9u IGlPUywgVm9pY2VPdmVyIGlzIHNwZWFraW5nIHRoZSBzdGF0aWMgdGV4dCBjaGlsZCBpbnN0ZWFk IG9mIHRoZSBoZWFkaW5nIG9iamVjdC4KKyAgICAgICAgU28gd2Ugc2hvdWxkIHNldCB0aGUgYWNj ZXNzaWJpbGl0eUxhYmVsIG9mIHRoZSBzdGF0aWMgdGV4dCBiYXNlZCBvbiB0aGUgcGFyZW50J3Mg CisgICAgICAgIGFsdGVybmF0ZSBsYWJlbC4KKworICAgICAgICBUZXN0OiBhY2Nlc3NpYmlsaXR5 L2lvcy1zaW11bGF0b3IvaGVhZGluZy13aXRoLWFyaWEtbGFiZWwuaHRtbAorCisgICAgICAgICog YWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW06Cisg ICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyIF9hY2Nlc3NpYmlsaXR5VHJh aXRzRnJvbUFuY2VzdG9yc10pOgorCiAyMDE2LTA3LTIxICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CiAKICAgICAgICAgRml4IG51bGwgaGFuZGxpbmcgb2YgU1ZHQW5nbGUvU1ZHTGVu Z3RoLnZhbHVlQXNTdHJpbmcgYXR0cmlidXRlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlcklPUy5tbQkocmV2aXNpb24gMjAzNDI5KQorKysgU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0JKHdvcmtp bmcgY29weSkKQEAgLTU5OCw4ICs1OTgsMTUgQEAgLSAodWludDY0X3QpX2FjY2Vzc2liaWxpdHlU cmFpdHNGcm9tQW5jZQogICAgICAgICAgICAgICAgIC8vIHRvIHRoZSBoZWFkaW5nIGxldmVsLiBJ ZiBpdCB3YXMgYSBzdGF0aWMgdGV4dCBlbGVtZW50LCB3ZSBuZWVkIHRvIHN0b3JlCiAgICAgICAg ICAgICAgICAgLy8gdGhlIHZhbHVlIGFzIHRoZSBsYWJlbCwgYmVjYXVzZSB0aGUgaGVhZGluZyBs ZXZlbCBuZWVkcyB0byB0aGUgdmFsdWUuCiAgICAgICAgICAgICAgICAgQWNjZXNzaWJpbGl0eU9i amVjdFdyYXBwZXIqIHdyYXBwZXIgPSBwYXJlbnQtPndyYXBwZXIoKTsKLSAgICAgICAgICAgICAg ICBpZiAocm9sZSA9PSBTdGF0aWNUZXh0Um9sZSkgCi0gICAgICAgICAgICAgICAgICAgIFtzZWxm IHNldEFjY2Vzc2liaWxpdHlMYWJlbDptX29iamVjdC0+c3RyaW5nVmFsdWUoKV07ICAgICAgICAg ICAgICAgIAorICAgICAgICAgICAgICAgIGlmIChyb2xlID09IFN0YXRpY1RleHRSb2xlKSB7Cisg ICAgICAgICAgICAgICAgICAgIC8vIFdlIHNob3VsZCBvbmx5IHNldCB0aGUgdGV4dCB2YWx1ZSBh cyB0aGUgbGFiZWwgd2hlbiB0aGVyZSdzIG5vCisgICAgICAgICAgICAgICAgICAgIC8vIGFsdGVy bmF0ZSB0ZXh0IG9uIHRoZSBoZWFkaW5nIHBhcmVudC4KKyAgICAgICAgICAgICAgICAgICAgTlNT dHJpbmcqIGhlYWRpbmdMYWJlbCA9IFt3cmFwcGVyIGFjY2Vzc2liaWxpdHlMYWJlbF07CisgICAg ICAgICAgICAgICAgICAgIGlmICghW2hlYWRpbmdMYWJlbCBsZW5ndGhdKQorICAgICAgICAgICAg ICAgICAgICAgICAgW3NlbGYgc2V0QWNjZXNzaWJpbGl0eUxhYmVsOm1fb2JqZWN0LT5zdHJpbmdW YWx1ZSgpXTsKKyAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICAg ICAgW3NlbGYgc2V0QWNjZXNzaWJpbGl0eUxhYmVsOmhlYWRpbmdMYWJlbF07CisgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgICAgIFtzZWxmIHNldEFjY2Vzc2liaWxpdHlWYWx1ZTpbd3Jh cHBlciBhY2Nlc3NpYmlsaXR5VmFsdWVdXTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIH0KSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMzQyOSkKKysrIExheW91dFRlc3RzL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE2LTA3LTIxICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IGFyaWEtbGFiZWwgbm90IGJlaW5n IHVzZWQgY29ycmVjdGx5IGluIGFjY2Vzc2libGUgbmFtZSBjYWxjdWxhdGlvbiBvZiBoZWFkaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjAwMDkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGFjY2Vz c2liaWxpdHkvaW9zLXNpbXVsYXRvci9oZWFkaW5nLXdpdGgtYXJpYS1sYWJlbC1leHBlY3RlZC50 eHQ6IEFkZGVkLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci9oZWFkaW5n LXdpdGgtYXJpYS1sYWJlbC5odG1sOiBBZGRlZC4KKwogMjAxNi0wNy0xOSAgQ2hyaXMgRHVtZXog IDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIGF1dG9jYXBpdGFsaXplIGF0dHJpYnV0ZSBz aG91bGQgbm90IHVzZSBbVHJlYXROdWxsQXM9TGVnYWN5TnVsbFN0cmluZ10KSW5kZXg6IExheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci9oZWFkaW5nLXdpdGgtYXJpYS1sYWJl bC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9p b3Mtc2ltdWxhdG9yL2hlYWRpbmctd2l0aC1hcmlhLWxhYmVsLWV4cGVjdGVkLnR4dAkobm9uZXhp c3RlbnQpCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2lvcy1zaW11bGF0b3IvaGVhZGlu Zy13aXRoLWFyaWEtbGFiZWwtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEs MTMgQEAKK3Zpc2libGUgdGV4dCB2aXNpYmxlIHRleHQKK1RoaXMgdGVzdHMgdGhhdCBpZiBoZWFk aW5nIGhhcyBhcmlhLWxhYmVsLCBpdCB3aWxsIG92ZXJyaWRlIHRoZSB2aXNpYmxlIHRleHQgYXMg bmVjZXNzYXJ5LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1Mi IG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBoZWFkaW5n MVRleHQudHJhaXRzID09IGhlYWRpbmcyVGV4dC50cmFpdHMgaXMgdHJ1ZQorUEFTUyBoZWFkaW5n MVRleHQuZGVzY3JpcHRpb24gaXMgJ0FYTGFiZWw6IHRlc3QgbGFiZWwnCitQQVNTIGhlYWRpbmcy VGV4dC5kZXNjcmlwdGlvbiBpcyAnQVhMYWJlbDogdmlzaWJsZSB0ZXh0JworUEFTUyBzdWNjZXNz ZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci9oZWFkaW5nLXdpdGgtYXJpYS1sYWJlbC5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci9o ZWFkaW5nLXdpdGgtYXJpYS1sYWJlbC5odG1sCShub25leGlzdGVudCkKKysrIExheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvaW9zLXNpbXVsYXRvci9oZWFkaW5nLXdpdGgtYXJpYS1sYWJlbC5odG1s CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMzkgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAi LS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4v Li4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+Cit2YXIgc3Vj Y2Vzc2Z1bGx5UGFyc2VkID0gZmFsc2U7Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJi b2R5Ij4KKworPHNwYW4gaWQ9ImhlYWRpbmcxIiByb2xlPSJoZWFkaW5nIiBhcmlhLWxhYmVsPSJ0 ZXN0IGxhYmVsIj52aXNpYmxlIHRleHQ8L3NwYW4+Cis8c3BhbiBpZD0iaGVhZGluZzIiIHJvbGU9 ImhlYWRpbmciPnZpc2libGUgdGV4dDwvc3Bhbj4KKworPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+ Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKworPHNjcmlwdD4KKworICAgIGRlc2NyaXB0aW9u KCJUaGlzIHRlc3RzIHRoYXQgaWYgaGVhZGluZyBoYXMgYXJpYS1sYWJlbCwgaXQgd2lsbCBvdmVy cmlkZSB0aGUgdmlzaWJsZSB0ZXh0IGFzIG5lY2Vzc2FyeS4iKTsKKworICAgIGlmICh3aW5kb3cu YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKworICAgICAgICB2YXIgaGVhZGluZzFUZXh0ID0g YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJoZWFkaW5nMSIp LmNoaWxkQXRJbmRleCgwKTsKKyAgICAgICAgdmFyIGhlYWRpbmcyVGV4dCA9IGFjY2Vzc2liaWxp dHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiaGVhZGluZzIiKS5jaGlsZEF0SW5k ZXgoMCk7CisgICAgICAgIAorICAgICAgICAvLyBHZXQgdGhlIHRyYWl0IHNvIHRoYXQgdGhlIGxh YmVsIHdpbGwgYmUgc2V0LgorICAgICAgICBzaG91bGRCZVRydWUoImhlYWRpbmcxVGV4dC50cmFp dHMgPT0gaGVhZGluZzJUZXh0LnRyYWl0cyIpOworICAgICAgICAKKyAgICAgICAgc2hvdWxkQmUo ImhlYWRpbmcxVGV4dC5kZXNjcmlwdGlvbiIsICInQVhMYWJlbDogdGVzdCBsYWJlbCciKTsKKyAg ICAgICAgc2hvdWxkQmUoImhlYWRpbmcyVGV4dC5kZXNjcmlwdGlvbiIsICInQVhMYWJlbDogdmlz aWJsZSB0ZXh0JyIpOworICAgIH0KKworICAgIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8 L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMi Pjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgorCg==