163647 2016-10-18 20:18:45 -0700 AX: don't expose empty roledescription 2017-05-17 17:48:25 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 jcraig jdiggs aboxhall apinheiro buildbot cfleizach commit-queue dmazzoni jdiggs samuel_white webkit-bug-importer oldest_to_newest 1241789 0 jcraig 2016-10-18 20:18:45 -0700 ARIA 1.1 include the following restriction on @aria-roledescription > User agents must not expose the aria-roledescription property if … The value of aria-roledescription is empty or contains only whitespace characters. Which seems fine. Please implement. Also note the following restriction in the same section: > User agents must not expose the aria-roledescription property if … The element to which aria-roledescription is applied does not have a valid WAI-ARIA role or does not have an implicit WAI-ARIA role semantic. Which seems overly restrictive and I asked for it to be removed. FWIW, I doubt we'd want to implement this restriction even if the WG declines the spec change. ARIA ISSUE-1048 https://www.w3.org/WAI/ARIA/track/issues/1048 1247159 1 webkit-bug-importer 2016-11-01 17:05:37 -0700 <rdar://problem/29055630> 1304411 2 jdiggs 2017-05-03 17:19:09 -0700 (In reply to James Craig from comment #0) > Also note the following restriction in the same section: > > User agents must not expose the aria-roledescription property if … The element to which aria-roledescription is applied does not have a valid WAI-ARIA role or does not have an implicit WAI-ARIA role semantic. > > Which seems overly restrictive and I asked for it to be removed. FWIW, I > doubt we'd want to implement this restriction even if the WG declines the > spec change. James: Do you still think it's acceptable to do what you stated in the related github issue [1], namely: <quote> What if you only included this stipulation on generic elements like <div> and <span>? I'd be okay with that restriction. The goal seems to be to avoid problem cases like <div aria-roledescription="button"> and restricting usage on generics would be one way to do that, without penalizing appropriate use on another type of element. </quote> If so, are you ok with my proceeding with that in Safari and WebKitGtk, independent of when the WG adopts the change? [1] https://github.com/w3c/aria/issues/500#issuecomment-266968158 1305977 3 309390 jdiggs 2017-05-08 12:00:49 -0700 Created attachment 309390 Patch 1305978 4 309390 cfleizach 2017-05-08 12:04:30 -0700 Comment on attachment 309390 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=309390&action=review > Source/WebCore/accessibility/AccessibilityObject.cpp:2336 > + return !roleDescription.containsOnlyWhitespace() ? roleDescription : String(); should we just trim the whitespace, so that someone putting role=" button" will also work? then you can return the result directly after trimming 1306014 5 309399 jdiggs 2017-05-08 13:08:29 -0700 Created attachment 309399 Patch 1306044 6 jdiggs 2017-05-08 14:07:22 -0700 (In reply to chris fleizach from comment #4) > Comment on attachment 309390 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=309390&action=review > > > Source/WebCore/accessibility/AccessibilityObject.cpp:2336 > > + return !roleDescription.containsOnlyWhitespace() ? roleDescription : String(); > > should we just trim the whitespace, so that someone putting > > role=" button" will also work? > > then you can return the result directly after trimming Done. 1306085 7 309399 commit-queue 2017-05-08 15:16:30 -0700 Comment on attachment 309399 Patch Clearing flags on attachment: 309399 Committed r216457: <http://trac.webkit.org/changeset/216457> 1306086 8 commit-queue 2017-05-08 15:16:31 -0700 All reviewed patches have been landed. Closing bug. 1309946 9 jcraig 2017-05-17 17:48:25 -0700 (In reply to Joanmarie Diggs (irc: joanie) from comment #2) > James: Do you still think it's acceptable to do what you stated in the > related github issue [1], namely: […snip…] > > If so, are you ok with my proceeding with that in Safari and WebKitGtk, > independent of when the WG adopts the change? Yes, that's fine with me. 309390 2017-05-08 12:00:49 -0700 2017-05-08 13:08:27 -0700 Patch bug-163647-20170508150048.patch text/plain 5558 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2NDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjg0NTdiMjQxOGZhZDQ5 NDRmYzNkMjA2NjM2MGVlMTM0ODJmZmRjZC4uOTk3ZWU2MDdkYTgzODRkMDA0MjU2NmQ3NjQ1MDMx MThlZWFkNzhiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTA1LTA4ICBKb2Fu bWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKworICAgICAgICBBWDogZG9uJ3QgZXhw b3NlIGVtcHR5IHJvbGVkZXNjcmlwdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTYzNjQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSWYgdGhlIHZhbHVlIG9mIGFyaWEtcm9sZWRlc2NyaXB0aW9uIGlz IGVtcHR5IG9yIGNvbnRhaW5zIG9ubHkgd2hpdGVzcGFjZQorICAgICAgICBjaGFyYWN0ZXJzLCBp Z25vcmUgdGhlIHZhbHVlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0czogV2UgYWxyZWFkeSBoYWQg Y292ZXJhZ2UgZm9yIGFuIGVtcHR5IGFyaWEtcm9sZWRlc2NyaXB0aW9uIHZhbHVlLgorICAgICAg ICBUaGF0IHRlc3Qgd2FzIHVwZGF0ZWQgdG8gcmVmbGVjdCB0aGUgbmV3IGJlaGF2aW9yLiBBIG5l dyB0ZXN0IGNhc2Ugd2FzIGFkZGVkCisgICAgICAgIHRvIGNvdmVyIGEgdmFsdWUgdGhhdCBjb250 YWlucyBvbmx5IHdoaXRlc3BhY2UgY2hhcmFjdGVycy4KKworICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmls aXR5T2JqZWN0Ojpyb2xlRGVzY3JpcHRpb24pOgorCiAyMDE3LTA1LTA4ICBNYXJrIExhbSAgPG1h cmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBJbnRyb2R1Y2UgRXhjZXB0aW9uU2NvcGU6OmFz c2VydE5vRXhjZXB0aW9uKCkgYW5kIHJlbGVhc2VBc3NlcnROb0V4Y2VwdGlvbigpLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAK aW5kZXggZjAyZjZiNDRjYjZkMTU4ZTVjMWQ3ZWM1ZjQwMjVhNWJjMTU1NzJiYy4uMTNjOGVhZmQ0 ZDJjMTk2ZGI2ZTkxMjhiN2YwMmQyOWUzMjRjZWQ2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0yMzMyLDcgKzIz MzIsOCBAQCBib29sIEFjY2Vzc2liaWxpdHlPYmplY3Q6Omhhc0hpZ2hsaWdodGluZygpIGNvbnN0 CiAKIFN0cmluZyBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojpyb2xlRGVzY3JpcHRpb24oKSBjb25zdAog ewotICAgIHJldHVybiBnZXRBdHRyaWJ1dGUoYXJpYV9yb2xlZGVzY3JpcHRpb25BdHRyKTsKKyAg ICBTdHJpbmcgcm9sZURlc2NyaXB0aW9uID0gZ2V0QXR0cmlidXRlKGFyaWFfcm9sZWRlc2NyaXB0 aW9uQXR0cik7CisgICAgcmV0dXJuICFyb2xlRGVzY3JpcHRpb24uY29udGFpbnNPbmx5V2hpdGVz cGFjZSgpID8gcm9sZURlc2NyaXB0aW9uIDogU3RyaW5nKCk7CiB9CiAgICAgCiBzdGF0aWMgYm9v bCBub2RlSGFzUHJlc2VudGF0aW9uUm9sZShOb2RlKiBub2RlKQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDA1Mjk2M2I2Y2Zk ZDlmM2Q1ODA5NDYwMmY5Y2Y5MzU5NmU1NWFmYWEuLjBjZWFjYzEzZTMzMzFmZGU4MzVjMzU0YjZi MjE4YjM0YWIyYjljMmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNy0wNS0wOCAgSm9hbm1h cmllIERpZ2dzICA8amRpZ2dzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQVg6IGRvbid0IGV4cG9z ZSBlbXB0eSByb2xlZGVzY3JpcHRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2MzY0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hcmlhLXJvbGVkZXNjcmlwdGlvbi1leHBl Y3RlZC50eHQ6IE5ldyB0ZXN0IGNhc2UsIHVwZGF0ZWQgZXhwZWN0YXRpb25zLgorICAgICAgICAq IGFjY2Vzc2liaWxpdHkvYXJpYS1yb2xlZGVzY3JpcHRpb24uaHRtbDogTmV3IHRlc3QgY2FzZSwg dXBkYXRlZCBleHBlY3RhdGlvbnMuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxp dHkvYXJpYS1yb2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0OiBOZXcgdGVzdCBjYXNlLCB1cGRh dGVkIGV4cGVjdGF0aW9ucy4KKwogMjAxNy0wNS0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgogCiAgICAgICAgIE1vdmUgJ3N0eWxlJyBmcm9tIEVsZW1lbnQgdG8gSFRNTEVsZW1l bnQgLyBTVkdFbGVtZW50IGFuZCBtYWtlIGl0IHNldHRhYmxlCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtcm9sZWRlc2NyaXB0aW9uLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1yb2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0 CmluZGV4IDFjYzg0ODQ5MDU1NTc1ZGM2Zjc2NDliMTgwYTA0NTVjOWE5MDI2YjYuLjY0NGY1NTg4 NmZjM2IxMzRmMjVlN2RmNTdkNThiYjJhYWMyZjIyYjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvYXJpYS1yb2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1yb2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0 CkBAIC01LDcgKzUsOCBAQCBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBB U1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURQogCiAKIFJvbGUgZGVzY3Jp cHRpb246IEFYUm9sZURlc2NyaXB0aW9uOiBTdXBlciBCdXR0b24KLVJvbGUgZGVzY3JpcHRpb246 IEFYUm9sZURlc2NyaXB0aW9uOiAKK1JvbGUgZGVzY3JpcHRpb246IEFYUm9sZURlc2NyaXB0aW9u OiBidXR0b24KK1JvbGUgZGVzY3JpcHRpb246IEFYUm9sZURlc2NyaXB0aW9uOiBidXR0b24KIFJv bGUgZGVzY3JpcHRpb246IEFYUm9sZURlc2NyaXB0aW9uOiBidXR0b24KIFBBU1Mgc3VjY2Vzc2Z1 bGx5UGFyc2VkIGlzIHRydWUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9hcmlhLXJvbGVkZXNjcmlwdGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9h cmlhLXJvbGVkZXNjcmlwdGlvbi5odG1sCmluZGV4IGQ3ZWUyZmU0OGZhZTI3NGVjYjM1MTVkNWJm OGE3ZDc0MDQ5OTMyYzcuLjY2ZGVhOWM3OWY3NDU1ZTZiM2JlNGUzYjNlOGQ3OWIzNTQzN2IxOTYg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1yb2xlZGVzY3JpcHRp b24uaHRtbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtcm9sZWRlc2NyaXB0 aW9uLmh0bWwKQEAgLTE5LDEwICsxOSwxNCBAQCBmdW5jdGlvbiBydW5UZXN0KCkgewogICAgICAg ICAvLyBDb25maXJtIHdlIGNhbiBvdmVycmlkZSBvdXIgcm9sZSBkZXNjcmlwdGlvbi4KICAgICAg ICAgZGVidWcoIlJvbGUgZGVzY3JpcHRpb246ICIgKyBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5h Y2Nlc3NpYmxlRWxlbWVudEJ5SWQoImJ0biIpLnJvbGVEZXNjcmlwdGlvbik7CiAKLSAgICAgICAg Ly8gQ29uZmlybSBvdXIgcm9sZSBkZXNjcmlwdGlvbiBpcyBlbXB0eSB3aGVuIHNldCB0byB6ZXJv IGxlbmd0aC4KKyAgICAgICAgLy8gQ29uZmlybSBvdXIgcm9sZSBkZXNjcmlwdGlvbiByZXR1cm5z IHRvIGRlZmF1bHQgd2hlbiBzZXQgdG8gemVybyBsZW5ndGguCiAgICAgICAgIGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJidG4iKS5zZXRBdHRyaWJ1dGUoImFyaWEtcm9sZWRlc2NyaXB0aW9uIiwg IiIpOwogICAgICAgICBkZWJ1ZygiUm9sZSBkZXNjcmlwdGlvbjogIiArIGFjY2Vzc2liaWxpdHlD b250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiYnRuIikucm9sZURlc2NyaXB0aW9uKTsK IAorICAgICAgICAvLyBDb25maXJtIG91ciByb2xlIGRlc2NyaXB0aW9uIHJldHVybnMgdG8gZGVm YXVsdCB3aGVuIHNldCB0byB3aGl0ZXNwYWNlIG9ubHkuCisgICAgICAgIGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJidG4iKS5zZXRBdHRyaWJ1dGUoImFyaWEtcm9sZWRlc2NyaXB0aW9uIiwgIiAg ICAgIik7CisgICAgICAgIGRlYnVnKCJSb2xlIGRlc2NyaXB0aW9uOiAiICsgYWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJidG4iKS5yb2xlRGVzY3JpcHRpb24p OworCiAgICAgICAgIC8vIENvbmZpcm0gb3VyIHJvbGUgZGVzY3JpcHRpb24gcmV0dXJucyB0byBk ZWZhdWx0IHdoZW4gcmVtb3ZlZC4KICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJ0 biIpLnJlbW92ZUF0dHJpYnV0ZSgiYXJpYS1yb2xlZGVzY3JpcHRpb24iKTsKICAgICAgICAgZGVi dWcoIlJvbGUgZGVzY3JpcHRpb246ICIgKyBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3Np YmxlRWxlbWVudEJ5SWQoImJ0biIpLnJvbGVEZXNjcmlwdGlvbik7CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9hcmlhLXJvbGVkZXNjcmlwdGlvbi1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9hcmlh LXJvbGVkZXNjcmlwdGlvbi1leHBlY3RlZC50eHQKaW5kZXggOTU5MDJmNDMyYTQ1NWU5NjA2ZTIw MjRhNzk5Yjg2MjYxZGEzNTA1OC4uYWZkYTRjMzQ2YWM0ZDliZDc0OTA4MTFmNzQwZWI3ZDVkMmM3 ZDFlOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkv YXJpYS1yb2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2FyaWEtcm9sZWRlc2NyaXB0aW9uLWV4cGVjdGVkLnR4dApA QCAtNyw2ICs3LDcgQEAgT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNT IiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUKIFJvbGUgZGVzY3JpcHRpb246 IEFYUm9sZURlc2NyaXB0aW9uOiBTdXBlciBCdXR0b24KIFJvbGUgZGVzY3JpcHRpb246IEFYUm9s ZURlc2NyaXB0aW9uOiAKIFJvbGUgZGVzY3JpcHRpb246IEFYUm9sZURlc2NyaXB0aW9uOiAKK1Jv bGUgZGVzY3JpcHRpb246IEFYUm9sZURlc2NyaXB0aW9uOiAKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFy c2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQo= 309399 2017-05-08 13:08:29 -0700 2017-05-08 15:16:30 -0700 Patch bug-163647-20170508160828.patch text/plain 7749 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2NDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjg0NTdiMjQxOGZhZDQ5 NDRmYzNkMjA2NjM2MGVlMTM0ODJmZmRjZC4uOTU3ZjljZjg0ZWY3MjZiMTFkMDQ2Y2E0ZmEzY2Ji Y2QyYzIyZTE3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTA1LTA4ICBKb2Fu bWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKworICAgICAgICBBWDogZG9uJ3QgZXhw b3NlIGVtcHR5IHJvbGVkZXNjcmlwdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTYzNjQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSWYgdGhlIHZhbHVlIG9mIGFyaWEtcm9sZWRlc2NyaXB0aW9uIGlz IGVtcHR5IG9yIGNvbnRhaW5zIG9ubHkgd2hpdGVzcGFjZQorICAgICAgICBjaGFyYWN0ZXJzLCBp Z25vcmUgdGhlIHZhbHVlLiBBbHNvIHN0cmlwIG91dCBsZWFkaW5nIG9yIHRyYWlsaW5nIHdoaXRl c3BhY2UKKyAgICAgICAgY2hhcmFjdGVycyBpbiB0aGUgdmFsdWUuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzOiBXZSBhbHJlYWR5IGhhZCBjb3ZlcmFnZSBmb3IgYW4gZW1wdHkgYXJpYS1yb2xlZGVz Y3JpcHRpb24gdmFsdWUuCisgICAgICAgIFRoYXQgdGVzdCB3YXMgdXBkYXRlZCB0byByZWZsZWN0 IHRoZSBuZXcgYmVoYXZpb3IuIE5ldyB0ZXN0IGNhc2VzIHdlcmUgYWRkZWQKKyAgICAgICAgdG8g Y292ZXIgYSB2YWx1ZSB0aGF0IGNvbnRhaW5zIG9ubHkgd2hpdGVzcGFjZSBjaGFyYWN0ZXJzLCBh bmQgYSB2YWx1ZSB3aXRoCisgICAgICAgIGxlYWRpbmcgYW5kIHRyYWlsaW5nIHdoaXRlc3BhY2Ug Y2hhcmFjdGVycy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0Ojpyb2xlRGVzY3Jp cHRpb24pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyTWFjLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ciByb2xlRGVzY3JpcHRpb25dKToKKwogMjAxNy0wNS0wOCAgTWFyayBMYW0gIDxtYXJrLmxhbUBh cHBsZS5jb20+CiAKICAgICAgICAgSW50cm9kdWNlIEV4Y2VwdGlvblNjb3BlOjphc3NlcnROb0V4 Y2VwdGlvbigpIGFuZCByZWxlYXNlQXNzZXJ0Tm9FeGNlcHRpb24oKS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCmluZGV4IGYw MmY2YjQ0Y2I2ZDE1OGU1YzFkN2VjNWY0MDI1YTViYzE1NTcyYmMuLjY0MjI0ZTMzMDRjMmY4ZTZj NGYyODg2ZTUyN2MzZmNlZDQwMTUwZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcApAQCAtMjMzMiw3ICsyMzMyLDcgQEAg Ym9vbCBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpoYXNIaWdobGlnaHRpbmcoKSBjb25zdAogCiBTdHJp bmcgQWNjZXNzaWJpbGl0eU9iamVjdDo6cm9sZURlc2NyaXB0aW9uKCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gZ2V0QXR0cmlidXRlKGFyaWFfcm9sZWRlc2NyaXB0aW9uQXR0cik7CisgICAgcmV0dXJu IHN0cmlwTGVhZGluZ0FuZFRyYWlsaW5nSFRNTFNwYWNlcyhnZXRBdHRyaWJ1dGUoYXJpYV9yb2xl ZGVzY3JpcHRpb25BdHRyKSk7CiB9CiAgICAgCiBzdGF0aWMgYm9vbCBub2RlSGFzUHJlc2VudGF0 aW9uUm9sZShOb2RlKiBub2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0gYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5t bQppbmRleCBmODE1Nzk1MDI3NGQyNjE2ZDhjMDM5NWIyNDMwYzNiMmM3ZmRhMjQ3Li5mZDAzYTlk NTUyNjA0ODExMWQxYThhYjA3MGZmNTYxMzlhYTgwNjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtMjIwNyw3ICsyMjA3LDcgQEAgc3RhdGljIE5TU3RyaW5n KiByb2xlVmFsdWVUb05TU3RyaW5nKEFjY2Vzc2liaWxpdHlSb2xlIHZhbHVlKQogI3ByYWdtYSBj bGFuZyBkaWFnbm9zdGljIHBvcAogCiAgICAgY29uc3QgQXRvbWljU3RyaW5nJiBvdmVycmlkZVJv bGVEZXNjcmlwdGlvbiA9IG1fb2JqZWN0LT5yb2xlRGVzY3JpcHRpb24oKTsKLSAgICBpZiAoIW92 ZXJyaWRlUm9sZURlc2NyaXB0aW9uLmlzTnVsbCgpKQorICAgIGlmICghb3ZlcnJpZGVSb2xlRGVz Y3JpcHRpb24uaXNOdWxsKCkgJiYgIW92ZXJyaWRlUm9sZURlc2NyaXB0aW9uLmlzRW1wdHkoKSkK ICAgICAgICAgcmV0dXJuIG92ZXJyaWRlUm9sZURlc2NyaXB0aW9uOwogICAgIAogICAgIE5TU3Ry aW5nKiBheFJvbGUgPSBbc2VsZiByb2xlXTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwNTI5NjNiNmNmZGQ5ZjNkNTgwOTQ2 MDJmOWNmOTM1OTZlNTVhZmFhLi5iOTQ3ZWVlNjNhYzRjMzA0M2ZlNDc5ZmJlMTExY2NhYmM3MDEw MTllIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTctMDUtMDggIEpvYW5tYXJpZSBEaWdncyAg PGpkaWdnc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEFYOiBkb24ndCBleHBvc2UgZW1wdHkgcm9s ZWRlc2NyaXB0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNjM2NDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvYXJpYS1yb2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0OiBO ZXcgdGVzdCBjYXNlcywgdXBkYXRlZCBleHBlY3RhdGlvbnMuCisgICAgICAgICogYWNjZXNzaWJp bGl0eS9hcmlhLXJvbGVkZXNjcmlwdGlvbi5odG1sOiBOZXcgdGVzdCBjYXNlcywgdXBkYXRlZCBl eHBlY3RhdGlvbnMuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1y b2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0OiBOZXcgdGVzdCBjYXNlcywgdXBkYXRlZCBleHBl Y3RhdGlvbnMuCisKIDIwMTctMDUtMDggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBNb3ZlICdzdHlsZScgZnJvbSBFbGVtZW50IHRvIEhUTUxFbGVtZW50IC8gU1ZH RWxlbWVudCBhbmQgbWFrZSBpdCBzZXR0YWJsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNj ZXNzaWJpbGl0eS9hcmlhLXJvbGVkZXNjcmlwdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9hY2Nlc3NpYmlsaXR5L2FyaWEtcm9sZWRlc2NyaXB0aW9uLWV4cGVjdGVkLnR4dAppbmRleCAx Y2M4NDg0OTA1NTU3NWRjNmY3NjQ5YjE4MGEwNDU1YzlhOTAyNmI2Li4wZTFiOTc3NzBmMjA4NWEy ZmNiNGQ2MDkwOGI1NWI4MjcxMGRkMGY3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9hY2Nlc3Np YmlsaXR5L2FyaWEtcm9sZWRlc2NyaXB0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9hY2Nlc3NpYmlsaXR5L2FyaWEtcm9sZWRlc2NyaXB0aW9uLWV4cGVjdGVkLnR4dApAQCAtNCw5 ICs0LDExIEBAIFRoaXMgdGVzdHMgdGhhdCBhcmlhLXJvbGVkZXNjcmlwdGlvbiB3b3Jrcy4KIE9u IHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxv d2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KIAogCi1Sb2xlIGRlc2NyaXB0aW9uOiBBWFJvbGVEZXNj cmlwdGlvbjogU3VwZXIgQnV0dG9uCi1Sb2xlIGRlc2NyaXB0aW9uOiBBWFJvbGVEZXNjcmlwdGlv bjogCi1Sb2xlIGRlc2NyaXB0aW9uOiBBWFJvbGVEZXNjcmlwdGlvbjogYnV0dG9uCitSb2xlIGRl c2NyaXB0aW9uOiBBWFJvbGVEZXNjcmlwdGlvbjogU3VwZXIgQnV0dG9uLgorUm9sZSBkZXNjcmlw dGlvbjogQVhSb2xlRGVzY3JpcHRpb246IGJ1dHRvbi4KK1JvbGUgZGVzY3JpcHRpb246IEFYUm9s ZURlc2NyaXB0aW9uOiBidXR0b24uCitSb2xlIGRlc2NyaXB0aW9uOiBBWFJvbGVEZXNjcmlwdGlv bjogU3VwZXIgQnV0dG9uLgorUm9sZSBkZXNjcmlwdGlvbjogQVhSb2xlRGVzY3JpcHRpb246IGJ1 dHRvbi4KIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIAogVEVTVCBDT01QTEVURQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLXJvbGVkZXNjcmlwdGlv bi5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLXJvbGVkZXNjcmlwdGlvbi5o dG1sCmluZGV4IGQ3ZWUyZmU0OGZhZTI3NGVjYjM1MTVkNWJmOGE3ZDc0MDQ5OTMyYzcuLmIwNjM2 NGRiNTIwMGY2NDhmNWViYTRjMGJkYjlmMGIyOGNmOWM4ZjggMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1yb2xlZGVzY3JpcHRpb24uaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtcm9sZWRlc2NyaXB0aW9uLmh0bWwKQEAgLTE3LDE1ICsx NywyMyBAQCBmdW5jdGlvbiBydW5UZXN0KCkgewogICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXIpIHsKIAogICAgICAgICAvLyBDb25maXJtIHdlIGNhbiBvdmVycmlkZSBvdXIg cm9sZSBkZXNjcmlwdGlvbi4KLSAgICAgICAgZGVidWcoIlJvbGUgZGVzY3JpcHRpb246ICIgKyBh Y2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImJ0biIpLnJvbGVE ZXNjcmlwdGlvbik7CisgICAgICAgIGRlYnVnKCJSb2xlIGRlc2NyaXB0aW9uOiAiICsgYWNjZXNz aWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJidG4iKS5yb2xlRGVzY3Jp cHRpb24gKyAiLiIpOwogCi0gICAgICAgIC8vIENvbmZpcm0gb3VyIHJvbGUgZGVzY3JpcHRpb24g aXMgZW1wdHkgd2hlbiBzZXQgdG8gemVybyBsZW5ndGguCisgICAgICAgIC8vIENvbmZpcm0gb3Vy IHJvbGUgZGVzY3JpcHRpb24gcmV0dXJucyB0byBkZWZhdWx0IHdoZW4gc2V0IHRvIHplcm8gbGVu Z3RoLgogICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYnRuIikuc2V0QXR0cmlidXRl KCJhcmlhLXJvbGVkZXNjcmlwdGlvbiIsICIiKTsKLSAgICAgICAgZGVidWcoIlJvbGUgZGVzY3Jp cHRpb246ICIgKyBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQo ImJ0biIpLnJvbGVEZXNjcmlwdGlvbik7CisgICAgICAgIGRlYnVnKCJSb2xlIGRlc2NyaXB0aW9u OiAiICsgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJidG4i KS5yb2xlRGVzY3JpcHRpb24gKyAiLiIpOworCisgICAgICAgIC8vIENvbmZpcm0gb3VyIHJvbGUg ZGVzY3JpcHRpb24gcmV0dXJucyB0byBkZWZhdWx0IHdoZW4gc2V0IHRvIHdoaXRlc3BhY2Ugb25s eS4KKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJ0biIpLnNldEF0dHJpYnV0ZSgi YXJpYS1yb2xlZGVzY3JpcHRpb24iLCAiICAgICAiKTsKKyAgICAgICAgZGVidWcoIlJvbGUgZGVz Y3JpcHRpb246ICIgKyBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5 SWQoImJ0biIpLnJvbGVEZXNjcmlwdGlvbiArICIuIik7CisKKyAgICAgICAgLy8gQ29uZmlybSBv dXIgcm9sZSBkZXNjcmlwdGlvbiBzdHJpcHMgZXh0cmFuZW91cyB3aGl0ZXNwYWNlIGNoYXJhY3Rl cnMuCisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJidG4iKS5zZXRBdHRyaWJ1dGUo ImFyaWEtcm9sZWRlc2NyaXB0aW9uIiwgIiAgICAgICAgICBTdXBlciBCdXR0b24gICAgICAgICAg Iik7CisgICAgICAgIGRlYnVnKCJSb2xlIGRlc2NyaXB0aW9uOiAiICsgYWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJidG4iKS5yb2xlRGVzY3JpcHRpb24gKyAi LiIpOwogCiAgICAgICAgIC8vIENvbmZpcm0gb3VyIHJvbGUgZGVzY3JpcHRpb24gcmV0dXJucyB0 byBkZWZhdWx0IHdoZW4gcmVtb3ZlZC4KICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo ImJ0biIpLnJlbW92ZUF0dHJpYnV0ZSgiYXJpYS1yb2xlZGVzY3JpcHRpb24iKTsKLSAgICAgICAg ZGVidWcoIlJvbGUgZGVzY3JpcHRpb246ICIgKyBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nl c3NpYmxlRWxlbWVudEJ5SWQoImJ0biIpLnJvbGVEZXNjcmlwdGlvbik7CisgICAgICAgIGRlYnVn KCJSb2xlIGRlc2NyaXB0aW9uOiAiICsgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJs ZUVsZW1lbnRCeUlkKCJidG4iKS5yb2xlRGVzY3JpcHRpb24gKyAiLiIpOwogICAgIH0KIH0KIApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvYXJpYS1y b2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Fj Y2Vzc2liaWxpdHkvYXJpYS1yb2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0CmluZGV4IDk1OTAy ZjQzMmE0NTVlOTYwNmUyMDI0YTc5OWI4NjI2MWRhMzUwNTguLmIxZjMwZDBjMDg0OWU5MmY5NDkw OWYwZmE2NTE5MjRmMWVlNmI4MjggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0 ay9hY2Nlc3NpYmlsaXR5L2FyaWEtcm9sZWRlc2NyaXB0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9hcmlhLXJvbGVkZXNjcmlwdGlv bi1leHBlY3RlZC50eHQKQEAgLTQsOSArNCwxMSBAQCBUaGlzIHRlc3RzIHRoYXQgYXJpYS1yb2xl ZGVzY3JpcHRpb24gd29ya3MuCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2Yg IlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCiAKIAotUm9sZSBk ZXNjcmlwdGlvbjogQVhSb2xlRGVzY3JpcHRpb246IFN1cGVyIEJ1dHRvbgotUm9sZSBkZXNjcmlw dGlvbjogQVhSb2xlRGVzY3JpcHRpb246IAotUm9sZSBkZXNjcmlwdGlvbjogQVhSb2xlRGVzY3Jp cHRpb246IAorUm9sZSBkZXNjcmlwdGlvbjogQVhSb2xlRGVzY3JpcHRpb246IFN1cGVyIEJ1dHRv bi4KK1JvbGUgZGVzY3JpcHRpb246IEFYUm9sZURlc2NyaXB0aW9uOiAuCitSb2xlIGRlc2NyaXB0 aW9uOiBBWFJvbGVEZXNjcmlwdGlvbjogLgorUm9sZSBkZXNjcmlwdGlvbjogQVhSb2xlRGVzY3Jp cHRpb246IFN1cGVyIEJ1dHRvbi4KK1JvbGUgZGVzY3JpcHRpb246IEFYUm9sZURlc2NyaXB0aW9u OiAuCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUK