171178 2017-04-22 17:16:14 -0700 AX: Treat cells with ARIA table cell properties as cells 2017-05-03 10:18:48 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 jdiggs jdiggs aboxhall apinheiro buildbot cfleizach commit-queue dmazzoni jcraig samuel_white webkit-bug-importer oldest_to_newest 1300246 0 jdiggs 2017-04-22 17:16:14 -0700 This was discovered as part of the ARIA 1.1 CR testing. The failures are due to the following not being exposed as a table: <table> <tr> <td aria-colspan="2">test cell</td> </tr> </table> This strikes me as yet another case of "Why on earth would anyone do that?" And admittedly, this is an artificial/quick-and-dirty test case. That said, if an author has taken the time to use an ARIA table cell property on a table cell, I think we have expose the cell as a cell and the containing table as a table. 1300247 1 webkit-bug-importer 2017-04-22 17:16:47 -0700 <rdar://problem/31775750> 1304041 2 308909 jdiggs 2017-05-03 09:16:21 -0700 Created attachment 308909 Patch 1304045 3 308909 cfleizach 2017-05-03 09:24:47 -0700 Comment on attachment 308909 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308909&action=review > Source/WebCore/accessibility/AccessibilityTable.cpp:160 > + if (ariaColumnCount == -1 || ariaColumnCount > 0) is if (!ariaColumnCount) sufficient here? or do you care if the colcount was set to -2? > Source/WebCore/accessibility/AccessibilityTable.cpp:-169 > - if (numRows == 1 && numCols == 1) we may want to move this to the end. so if none of the rows or cols had the aria attributes, and we have only 1 cell... 1304054 4 308909 jdiggs 2017-05-03 09:38:45 -0700 Comment on attachment 308909 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308909&action=review >> Source/WebCore/accessibility/AccessibilityTable.cpp:160 >> + if (ariaColumnCount == -1 || ariaColumnCount > 0) > > is if (!ariaColumnCount) sufficient here? or do you care if the colcount was set to -2? I do care. If the colcount is set to -2, the author has provided an invalid value. If we are going to respect the author's desire to expose their minimalist table as a data table, I think they should at least do us the courtesy of providing a valid value. ;) Do you think we should instead accept any non-zero value? >> Source/WebCore/accessibility/AccessibilityTable.cpp:-169 >> - if (numRows == 1 && numCols == 1) > > we may want to move this to the end. so if none of the rows or cols had the aria attributes, and we have only 1 cell... I am happy to make that change, but in that particular case the existing heuristic concludes it is not a data table. See the last table in the layout test. The td element with id of "cell8" is an AXGroup on your platform and an ATK_ROLE_SECTION on mine. 1304061 5 308909 cfleizach 2017-05-03 09:45:22 -0700 Comment on attachment 308909 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=308909&action=review >>> Source/WebCore/accessibility/AccessibilityTable.cpp:160 >>> + if (ariaColumnCount == -1 || ariaColumnCount > 0) >> >> is if (!ariaColumnCount) sufficient here? or do you care if the colcount was set to -2? > > I do care. If the colcount is set to -2, the author has provided an invalid value. If we are going to respect the author's desire to expose their minimalist table as a data table, I think they should at least do us the courtesy of providing a valid value. ;) > > Do you think we should instead accept any non-zero value? probably not >>> Source/WebCore/accessibility/AccessibilityTable.cpp:-169 >>> - if (numRows == 1 && numCols == 1) >> >> we may want to move this to the end. so if none of the rows or cols had the aria attributes, and we have only 1 cell... > > I am happy to make that change, but in that particular case the existing heuristic concludes it is not a data table. See the last table in the layout test. The td element with id of "cell8" is an AXGroup on your platform and an ATK_ROLE_SECTION on mine. ok 1304097 6 308909 commit-queue 2017-05-03 10:18:46 -0700 Comment on attachment 308909 Patch Clearing flags on attachment: 308909 Committed r216123: <http://trac.webkit.org/changeset/216123> 1304098 7 commit-queue 2017-05-03 10:18:48 -0700 All reviewed patches have been landed. Closing bug. 308909 2017-05-03 09:16:21 -0700 2017-05-03 10:18:46 -0700 Patch bug-171178-20170503121620.patch text/plain 9655 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzgyM2Y4ZDc0MGJmZmJi M2IxNDA2YWFiMDg2OGI3YzI4NGE0MGEwNy4uZmMyYzA0YzgzYjkyYWUwMWYzOTc1NDJiMWViNWI5 ZWM1YTU3MjNmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE3LTA1LTAzICBKb2Fu bWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKworICAgICAgICBBWDogVHJlYXQgY2Vs bHMgd2l0aCBBUklBIHRhYmxlIGNlbGwgcHJvcGVydGllcyBhcyBjZWxscworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxMTc4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRoZSBmb2xsb3dpbmcgY2hl Y2tzIHRvIGhldXJpc3RpY3MgaW4gQWNjZXNzaWJpbGl0eVRhYmxlOjppc0RhdGFUYWJsZSgpOgor ICAgICAgICAxLiBJZiB0aGUgYXV0aG9yIGhhcyBwcm92aWRlZCBhIHZhbGlkIGFyaWEtcm93Y291 bnQgb3IgYXJpYS1jb2xjb3VudCB2YWx1ZSBvbgorICAgICAgICAgICB0aGUgdGFibGUgZWxlbWVu dCwgZXhwb3NlIGl0IGFzIGEgZGF0YSB0YWJsZS4KKyAgICAgICAgMi4gSWYgdGhlIGF1dGhvciBo YXMgcHJvdmlkZWQgYSB2YWxpZCBhcmlhLWNvbGluZGV4IG9yIGFyaWEtcm93aW5kZXggb24gdGhl CisgICAgICAgICAgIGNlbGwgZWxlbWVudCwgZXhwb3NlIGl0IGFzIGEgZGF0YSB0YWJsZS4KKyAg ICAgICAgMy4gSWYgdGhlIGF1dGhvciBoYXMgcHJvdmlkZWQgYSB2YWxpZCBhcmlhLXJvd2luZGV4 IG9uIHRoZSByb3cgZWxlbWVudCwgZXhwb3NlCisgICAgICAgICAgIGl0IGFzIGEgZGF0YSB0YWJs ZS4KKyAgICAgICAgNC4gSWYgdGhlIGF1dGhvciBoYXMgcHJvdmlkZWQgYSB2YWx1ZSBmb3IgYXJp YS1jb2xzcGFuIG9yIGFyaWEtcm93c3BhbiBvbiBhIGNlbGwsCisgICAgICAgICAgIGV4cG9zZSBp dCBhcyBhIGRhdGEgdGFibGUgKGV2ZW4gdGhvdWdoIHdlIGFyZSBzdXBwb3NlZCB0byBpZ25vcmUg dGhlIHZhbHVlIGZvcgorICAgICAgICAgICB0aGUgcHVycG9zZSBvZiBleHBvc2luZyB0aGUgc3Bh biB2aWEgcGxhdGZvcm0gYWNjZXNzaWJpbGl0eSBBUElzKQorCisgICAgICAgIFJlbW92ZSB0aGUg aGV1cmlzdGljIHRoYXQgYSB0YWJsZSB3aXRoIG9ubHkgb25lIGNlbGwgaXMgIm5vdCBhIGdvb2Qg QVhUYWJsZSBjYW5kaWRhdGUuIgorICAgICAgICBJdCBwcmV2ZW50cyB1cyBmcm9tIGV2ZXIgZG9p bmcgdGhlIGFib3ZlIGNoZWNrcy4KKworICAgICAgICBUZXN0OiBhY2Nlc3NpYmlsaXR5L21pbmlt YWwtdGFibGUtd2l0aC1hcmlhLWlzLWRhdGEtdGFibGUuaHRtbAorCisgICAgICAgICogYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz aWJpbGl0eVRhYmxlOjppc0RhdGFUYWJsZSk6CisKIDIwMTctMDUtMDIgIEFuZHJldyBHb2xkICA8 YWdvbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFR5cG8gaW4gQVZBdWRpb1Nlc3Npb25DYXB0dXJl RGV2aWNlTWFuYWdlci5tbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5VGFibGUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5VGFibGUuY3BwCmluZGV4IDg5MTU4N2NiOTA5OWI0MDVjYmNkYWQ3Njk5NTdh ZjM1NWU5NGJjOGQuLjJmNTViOTI5MjE5MDI3N2M0NWJmMzQ3NWJjNDI4MDdjMTg2OTY1ZjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJs ZS5jcHAKQEAgLTE1NCw2ICsxNTQsMTYgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5VGFibGU6OmlzRGF0 YVRhYmxlKCkgY29uc3QKICAgICBpZiAoIWhhc1RhZ05hbWUodGFibGVUYWcpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgCisgICAgLy8gSWYgdGhlIGF1dGhvciBoYXMgdXNlZCBBUklBIHRv IHNwZWNpZnkgYSB2YWxpZCBjb2x1bW4gb3Igcm93IGNvdW50LCBhc3N1bWUgdGhleQorICAgIC8v IHdhbnQgdXMgdG8gdHJlYXQgdGhlIHRhYmxlIGFzIGEgZGF0YSB0YWJsZS4KKyAgICBpbnQgYXJp YUNvbHVtbkNvdW50ID0gZ2V0QXR0cmlidXRlKGFyaWFfY29sY291bnRBdHRyKS50b0ludCgpOwor ICAgIGlmIChhcmlhQ29sdW1uQ291bnQgPT0gLTEgfHwgYXJpYUNvbHVtbkNvdW50ID4gMCkKKyAg ICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBpbnQgYXJpYVJvd0NvdW50ID0gZ2V0QXR0cmlidXRl KGFyaWFfcm93Y291bnRBdHRyKS50b0ludCgpOworICAgIGlmIChhcmlhUm93Q291bnQgPT0gLTEg fHwgYXJpYVJvd0NvdW50ID4gMCkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBSZW5kZXJU YWJsZSYgdGFibGUgPSBkb3duY2FzdDxSZW5kZXJUYWJsZT4oKm1fcmVuZGVyZXIpOwogICAgIC8v IGdvIHRocm91Z2ggdGhlIGNlbGwncyBhbmQgY2hlY2sgZm9yIHRlbGwtdGFsZSBzaWducyBvZiAi ZGF0YSIgdGFibGUgc3RhdHVzCiAgICAgLy8gY2VsbHMgaGF2ZSBib3JkZXJzLCBvciB1c2UgYXR0 cmlidXRlcyBsaWtlIGhlYWRlcnMsIGFiYnIsIHNjb3BlIG9yIGF4aXMKQEAgLTE2NSwxMCArMTc1 LDYgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5VGFibGU6OmlzRGF0YVRhYmxlKCkgY29uc3QKICAgICBp bnQgbnVtQ29scyA9IGZpcnN0Qm9keS0+bnVtQ29sdW1ucygpOwogICAgIGludCBudW1Sb3dzID0g Zmlyc3RCb2R5LT5udW1Sb3dzKCk7CiAgICAgCi0gICAgLy8gSWYgdGhlcmUncyBvbmx5IG9uZSBj ZWxsLCBpdCdzIG5vdCBhIGdvb2QgQVhUYWJsZSBjYW5kaWRhdGUuCi0gICAgaWYgKG51bVJvd3Mg PT0gMSAmJiBudW1Db2xzID09IDEpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIC8vIElm IHRoZXJlIGFyZSBhdCBsZWFzdCAyMCByb3dzLCB3ZSdsbCBjYWxsIGl0IGEgZGF0YSB0YWJsZS4K ICAgICBpZiAobnVtUm93cyA+PSAyMCkKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0xODEsNyAr MTg3LDggQEAgYm9vbCBBY2Nlc3NpYmlsaXR5VGFibGU6OmlzRGF0YVRhYmxlKCkgY29uc3QKICAg ICAvLyBDcml0ZXJpYTogCiAgICAgLy8gICAxKSBtdXN0IGhhdmUgYXQgbGVhc3Qgb25lIHZhbGlk IGNlbGwgKGFuZCkKICAgICAvLyAgIDIpIGF0IGxlYXN0IGhhbGYgb2YgY2VsbHMgaGF2ZSBib3Jk ZXJzIChvcikKLSAgICAvLyAgIDMpIGF0IGxlYXN0IGhhbGYgb2YgY2VsbHMgaGF2ZSBkaWZmZXJl bnQgYmcgY29sb3JzIHRoYW4gdGhlIHRhYmxlLCBhbmQgdGhlcmUgaXMgY2VsbCBzcGFjaW5nCisg ICAgLy8gICAzKSBhdCBsZWFzdCBoYWxmIG9mIGNlbGxzIGhhdmUgZGlmZmVyZW50IGJnIGNvbG9y cyB0aGFuIHRoZSB0YWJsZSwgYW5kIHRoZXJlIGlzIGNlbGwgc3BhY2luZyAob3IpCisgICAgLy8g ICA0KSB0aGUgdmFsaWQgY2VsbCBoYXMgYW4gQVJJQSBjZWxsLXJlbGF0ZWQgcHJvcGVydHkKICAg ICB1bnNpZ25lZCB2YWxpZENlbGxDb3VudCA9IDA7CiAgICAgdW5zaWduZWQgYm9yZGVyZWRDZWxs Q291bnQgPSAwOwogICAgIHVuc2lnbmVkIGJhY2tncm91bmREaWZmZXJlbmNlQ2VsbENvdW50ID0g MDsKQEAgLTIyNyw2ICsyMzQsMzQgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5VGFibGU6OmlzRGF0YVRh YmxlKCkgY29uc3QKICAgICAgICAgICAgICAgICAgICAgfHwgIXRhYmxlQ2VsbEVsZW1lbnQuYXhp cygpLmlzRW1wdHkoKSB8fCAhdGFibGVDZWxsRWxlbWVudC5zY29wZSgpLmlzRW1wdHkoKSkKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9CisKKyAgICAgICAg ICAgIC8vIElmIHRoZSBhdXRob3IgaGFzIHVzZWQgQVJJQSB0byBzcGVjaWZ5IGEgdmFsaWQgY29s dW1uIG9yIHJvdyBpbmRleCwgYXNzdW1lIHRoZXkgd2FudCB1cworICAgICAgICAgICAgLy8gdG8g dHJlYXQgdGhlIHRhYmxlIGFzIGEgZGF0YSB0YWJsZS4KKyAgICAgICAgICAgIGludCBhcmlhQ29s dW1uSW5kZXggPSBjZWxsRWxlbWVudC0+YXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihh cmlhX2NvbGluZGV4QXR0cikudG9JbnQoKTsKKyAgICAgICAgICAgIGlmIChhcmlhQ29sdW1uSW5k ZXggPj0gMSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgICAgICAgICAgaW50 IGFyaWFSb3dJbmRleCA9IGNlbGxFbGVtZW50LT5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0 aW9uKGFyaWFfcm93aW5kZXhBdHRyKS50b0ludCgpOworICAgICAgICAgICAgaWYgKGFyaWFSb3dJ bmRleCA+PSAxKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworCisgICAgICAgICAgICBp ZiAoYXV0byBjZWxsUGFyZW50RWxlbWVudCA9IGNlbGxFbGVtZW50LT5wYXJlbnRFbGVtZW50KCkp IHsKKyAgICAgICAgICAgICAgICBhcmlhUm93SW5kZXggPSBjZWxsUGFyZW50RWxlbWVudC0+YXR0 cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihhcmlhX3Jvd2luZGV4QXR0cikudG9JbnQoKTsK KyAgICAgICAgICAgICAgICBpZiAoYXJpYVJvd0luZGV4ID49IDEpCisgICAgICAgICAgICAgICAg ICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICAvLyBJZiB0aGUg YXV0aG9yIGhhcyB1c2VkIEFSSUEgdG8gc3BlY2lmeSBhIGNvbHVtbiBvciByb3cgc3Bhbiwgd2Un cmUgc3VwcG9zZWQgdG8gaWdub3JlCisgICAgICAgICAgICAvLyB0aGUgdmFsdWUgZm9yIHRoZSBw dXJwb3NlcyBvZiBleHBvc2luZyB0aGUgc3Bhbi4gQnV0IGFzc3VtZSB0aGV5IHdhbnQgdXMgdG8g dHJlYXQgdGhlCisgICAgICAgICAgICAvLyB0YWJsZSBhcyBhIGRhdGEgdGFibGUuCisgICAgICAg ICAgICBpbnQgYXJpYUNvbHVtblNwYW4gPSBjZWxsRWxlbWVudC0+YXR0cmlidXRlV2l0aG91dFN5 bmNocm9uaXphdGlvbihhcmlhX2NvbHNwYW5BdHRyKS50b0ludCgpOworICAgICAgICAgICAgaWYg KGFyaWFDb2x1bW5TcGFuID49IDEpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAg ICAgICAgICAgIGludCBhcmlhUm93U3BhbiA9IGNlbGxFbGVtZW50LT5hdHRyaWJ1dGVXaXRob3V0 U3luY2hyb25pemF0aW9uKGFyaWFfcm93c3BhbkF0dHIpLnRvSW50KCk7CisgICAgICAgICAgICBp ZiAoYXJpYVJvd1NwYW4gPj0gMSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKwogICAg ICAgICAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHJlbmRlclN0eWxlID0gY2VsbC0+c3R5bGUoKTsK IAogICAgICAgICAgICAgLy8gSWYgdGhlIGVtcHR5LWNlbGxzIHN0eWxlIGlzIHNldCwgd2UnbGwg Y2FsbCBpdCBhIGRhdGEgdGFibGUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggM2FlM2QzNjRhMDkwNjc2YWZhZmViZDQxNTQ0 YjcxOTg4MDcwMTgxZS4uMjM4NzVkNjhiYThlYzAwMDg4OGFmYzA4NjI4OTk5ODQyOTdkYzA4MCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA1LTAzICBKb2FubWFyaWUgRGlnZ3MgIDxqZGln Z3NAaWdhbGlhLmNvbT4KKworICAgICAgICBBWDogVHJlYXQgY2VsbHMgd2l0aCBBUklBIHRhYmxl IGNlbGwgcHJvcGVydGllcyBhcyBjZWxscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTcxMTc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21pbmltYWwtdGFibGUtd2l0aC1hcmlh LWlzLWRhdGEtdGFibGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L21pbmltYWwtdGFibGUtd2l0aC1hcmlhLWlzLWRhdGEtdGFibGUuaHRtbDogQWRkZWQuCisg ICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbWluaW1hbC10YWJsZS13aXRoLWFy aWEtaXMtZGF0YS10YWJsZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorCiAyMDE3LTA1LTAyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIER5bmFtaWNhbGx5 IGFkZGVkIHBvc2l0aW9uOmZpeGVkIGVsZW1lbnQgaXMgaW4gdGhlIHdyb25nIHBsYWNlCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21pbmltYWwtdGFibGUtd2l0aC1hcmlh LWlzLWRhdGEtdGFibGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9t aW5pbWFsLXRhYmxlLXdpdGgtYXJpYS1pcy1kYXRhLXRhYmxlLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4yM2MyNTZhNDgxZjg5YzVhNjE0YzQ0ZWY3ZTU2NGQyOTJlYzI2Njk3Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9taW5pbWFsLXRhYmxlLXdpdGgtYXJp YS1pcy1kYXRhLXRhYmxlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE3IEBACitUaGlzIHRlc3Rz IHRoYXQgbWluaW1hbCB0YWJsZXMgYXJlIHRyZWF0ZWQgYXMgZGF0YSB0YWJsZXMgaWYgdGhleSBo YXZlIEFSSUEgdGFibGUtcmVsYXRlZCBwcm9wZXJ0aWVzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2ls bCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01Q TEVURSIuCisKKworY2VsbDE6IEFYUm9sZTogQVhDZWxsCitjZWxsMjogQVhSb2xlOiBBWENlbGwK K2NlbGwzOiBBWFJvbGU6IEFYQ2VsbAorY2VsbDQ6IEFYUm9sZTogQVhDZWxsCitjZWxsNTogQVhS b2xlOiBBWENlbGwKK2NlbGw2OiBBWFJvbGU6IEFYQ2VsbAorY2VsbDc6IEFYUm9sZTogQVhDZWxs CitjZWxsODogQVhSb2xlOiBBWEdyb3VwCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl CisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9taW5pbWFsLXRhYmxlLXdpdGgtYXJpYS1pcy1kYXRhLXRhYmxlLmh0bWwgYi9MYXlvdXRUZXN0 cy9hY2Nlc3NpYmlsaXR5L21pbmltYWwtdGFibGUtd2l0aC1hcmlhLWlzLWRhdGEtdGFibGUuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi45MGE2OGE5MDA3ZjRlZDkzM2NmMDczYTU0MDhlOTUyM2JhMDMwYzI5Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9taW5pbWFsLXRhYmxl LXdpdGgtYXJpYS1pcy1kYXRhLXRhYmxlLmh0bWwKQEAgLTAsMCArMSwzMyBAQAorPCFET0NUWVBF IEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxz Y3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFk PgorPGJvZHkgaWQ9ImJvZHkiPgorPGRpdiBpZD0iY29udGVudCI+Cis8dGFibGU+PHRyPjx0ZCBp ZD0iY2VsbDEiIGFyaWEtY29sc3Bhbj0iMSI+eDwvdGQ+PC90cj48L3RhYmxlPgorPHRhYmxlPjx0 cj48dGQgaWQ9ImNlbGwyIiBhcmlhLXJvd3NwYW49IjEiPng8L3RkPjwvdHI+PC90YWJsZT4KKzx0 YWJsZT48dHI+PHRkIGlkPSJjZWxsMyIgYXJpYS1jb2xpbmRleD0iMSI+eDwvdGQ+PC90cj48L3Rh YmxlPgorPHRhYmxlPjx0cj48dGQgaWQ9ImNlbGw0IiBhcmlhLXJvd2luZGV4PSIxIj54PC90ZD48 L3RyPjwvdGFibGU+Cis8dGFibGU+PHRyIGFyaWEtcm93aW5kZXg9IjEiPjx0ZCBpZD0iY2VsbDUi Png8L3RkPjwvdHI+PC90YWJsZT4KKzx0YWJsZSBhcmlhLXJvd2NvdW50PSIxIj48dHI+PHRkIGlk PSJjZWxsNiI+eDwvdGQ+PC90cj48L3RhYmxlPgorPHRhYmxlIGFyaWEtY29sY291bnQ9IjEiPjx0 cj48dGQgaWQ9ImNlbGw3Ij54PC90ZD48L3RyPjwvdGFibGU+Cis8dGFibGU+PHRyPjx0ZCBpZD0i Y2VsbDgiPng8L3RkPjwvdHI+PC90YWJsZT4KKzwvZGl2PgorPHNjcmlwdD4KKworICAgIGRlc2Ny aXB0aW9uKCJUaGlzIHRlc3RzIHRoYXQgbWluaW1hbCB0YWJsZXMgYXJlIHRyZWF0ZWQgYXMgZGF0 YSB0YWJsZXMgaWYgdGhleSBoYXZlIEFSSUEgdGFibGUtcmVsYXRlZCBwcm9wZXJ0aWVzLiIpOwor ICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgZm9yICh2 YXIgaSA9IDE7IGkgPD0gODsgaSsrKSB7CisgICAgICAgICAgICB2YXIgYXhFbGVtZW50ID0gYWNj ZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJjZWxsIiArIGkpOwor ICAgICAgICAgICAgdmFyIHJlc3VsdCA9ICFheEVsZW1lbnQgPyAiKG5vdCBleHBvc2VkKSIgOiBh eEVsZW1lbnQucm9sZTsKKyAgICAgICAgICAgIGRlYnVnKCJjZWxsIiArIGkgKyAiOiAiICsgcmVz dWx0KTsKKyAgICAgICAgfQorICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGVu dCIpLnN0eWxlLnZpc2liaWxpdHkgPSAiaGlkZGVuIjsKKyAgICB9CisKKzwvc2NyaXB0PgorCis8 c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNz aWJpbGl0eS9taW5pbWFsLXRhYmxlLXdpdGgtYXJpYS1pcy1kYXRhLXRhYmxlLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L21pbmltYWwtdGFibGUt d2l0aC1hcmlhLWlzLWRhdGEtdGFibGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmYyZDY0ZDBj YmNkMTE3NjU1NTU5NDJiNDMwZmZlY2U0Y2Q2ZWVmMDIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9taW5pbWFsLXRhYmxlLXdpdGgtYXJp YS1pcy1kYXRhLXRhYmxlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDE3IEBACitUaGlzIHRlc3Rz IHRoYXQgbWluaW1hbCB0YWJsZXMgYXJlIHRyZWF0ZWQgYXMgZGF0YSB0YWJsZXMgaWYgdGhleSBo YXZlIEFSSUEgdGFibGUtcmVsYXRlZCBwcm9wZXJ0aWVzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2ls bCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01Q TEVURSIuCisKKworY2VsbDE6IEFYUm9sZTogQVhDZWxsCitjZWxsMjogQVhSb2xlOiBBWENlbGwK K2NlbGwzOiBBWFJvbGU6IEFYQ2VsbAorY2VsbDQ6IEFYUm9sZTogQVhDZWxsCitjZWxsNTogQVhS b2xlOiBBWENlbGwKK2NlbGw2OiBBWFJvbGU6IEFYQ2VsbAorY2VsbDc6IEFYUm9sZTogQVhDZWxs CitjZWxsODogQVhSb2xlOiBBWFNlY3Rpb24KK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKKworVEVTVCBDT01QTEVURQorCg==