267056 2024-01-03 11:52:24 -0800 AX: Tables with one row of all header cells should not be exposed as data tables 2024-01-05 17:43:28 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 jhoffman23 jhoffman23 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig samuel_white tyler_w webkit-bug-importer oldest_to_newest 2002823 0 jhoffman23 2024-01-03 11:52:24 -0800 WebKit currently exposes tables with one row of all header cells as data tables, even though other single row tables are not. These should be considered layout tables. 2002824 1 webkit-bug-importer 2024-01-03 11:52:34 -0800 <rdar://problem/120431884> 2002831 2 469280 jhoffman23 2024-01-03 12:00:29 -0800 Created attachment 469280 Patch 2002851 3 jhoffman23 2024-01-03 13:00:38 -0800 rdar://119941473 2002921 4 469280 tyler_w 2024-01-03 18:57:47 -0800 Comment on attachment 469280 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=469280&action=review > COMMIT_MESSAGE:13 > +AXObjectCache::childrenChanged was also updated to recompute a tables exposability when > +rows change outside of table sections (tbody, thead, tfoot). Is this required for the test in this patch to pass? Or does this fix some other bug that isn't tested? > Source/WebCore/accessibility/AccessibilityTable.cpp:339 > + if (firstRow && currentParent == firstRow && rowIsAllTableHeaderCells && cellCountForEachRow.get(currentParent.get()) >= 1 && rowCount >= 2) Seems like we accidentally added an extra space between && and cellCountForEachRow. > LayoutTests/accessibility/single-th-layout-table.html:35 > + await waitFor(() => accessibilityController.accessibleElementById('table1') != null); Can we also verify the table's role, row count, and column count? Just to make sure it isn't being exposed as a group or something. 2002924 5 469280 jhoffman23 2024-01-03 19:16:38 -0800 Comment on attachment 469280 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=469280&action=review >> COMMIT_MESSAGE:13 >> +rows change outside of table sections (tbody, thead, tfoot). > > Is this required for the test in this patch to pass? Or does this fix some other bug that isn't tested? Yes, as we have special logic to determine if the presence thead/tbody/tfoot indicate data tables, we want this patch to be agnostic of those factors. This test will implicitly test this addition, as well, as this layout test would not work without it. >> Source/WebCore/accessibility/AccessibilityTable.cpp:339 >> + if (firstRow && currentParent == firstRow && rowIsAllTableHeaderCells && cellCountForEachRow.get(currentParent.get()) >= 1 && rowCount >= 2) > > Seems like we accidentally added an extra space between && and cellCountForEachRow. Will remove that, thanks! >> LayoutTests/accessibility/single-th-layout-table.html:35 >> + await waitFor(() => accessibilityController.accessibleElementById('table1') != null); > > Can we also verify the table's role, row count, and column count? Just to make sure it isn't being exposed as a group or something. Yep, good call. 2003098 6 469294 jhoffman23 2024-01-04 20:07:58 -0800 Created attachment 469294 Patch 2003300 7 ews-feeder 2024-01-05 17:43:26 -0800 Committed 272716@main (51f8361485f6): <https://commits.webkit.org/272716@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 469294. 469280 2024-01-03 12:00:29 -0800 2024-01-05 16:03:03 -0800 Patch bug-267056-20240103120028.patch text/plain 5863 jhoffman23 RnJvbSAyNjY3MDBkZWQyMWU0OWU1NjE2ZjE5YTlkZjBhYjU1YzVhN2NkMzJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb3NodWEgSG9mZm1hbiA8amhvZmZtYW4yM0BhcHBsZS5jb20+ CkRhdGU6IFdlZCwgMyBKYW4gMjAyNCAxMTo1MTowNyAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIEFY OiBUYWJsZXMgd2l0aCBvbmUgcm93IG9mIGFsbCBoZWFkZXIgY2VsbHMgc2hvdWxkIG5vdCBiZQog ZXhwb3NlZCBhcyBkYXRhIHRhYmxlcyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjY3MDU2CiByZGFyOi8vMTE5OTQxNDczCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KCkR1ZSB0byBsb2dpYyBpbiBpc0RhdGFUYWJsZSwgd2UgY3VycmVudGx5IGV4cG9zZSB0YWJs ZXMgd2l0aCBvbmUgcm93IG9mIGFsbCBoZWFkZXIKY2VsbHMgYXMgZGF0YSB0YWJsZXMuIEJ1dCwg bW9zdCBvdGhlciBzaW5nbGUtcm93IHRhYmxlcyBhcmUgY29uc2lkZXJlZCBsYXlvdXQgdGFibGVz LgoKVGhpcyBwYXRjaCB1cGRhdGVzIG91dCBsb2dpYyB0byBjb25zaWRlciB0aGlzIG1hcmt1cCBh IGxheW91dCB0YWJsZS4KCkFYT2JqZWN0Q2FjaGU6OmNoaWxkcmVuQ2hhbmdlZCB3YXMgYWxzbyB1 cGRhdGVkIHRvIHJlY29tcHV0ZSBhIHRhYmxlcyBleHBvc2FiaWxpdHkgd2hlbgpyb3dzIGNoYW5n ZSBvdXRzaWRlIG9mIHRhYmxlIHNlY3Rpb25zICh0Ym9keSwgdGhlYWQsIHRmb290KS4KCiogTGF5 b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9zaW5nbGUtdGgtbGF5b3V0LXRhYmxlLWV4cGVjdGVkLnR4 dDogQWRkZWQuCiogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9zaW5nbGUtdGgtbGF5b3V0LXRh YmxlLmh0bWw6IEFkZGVkLgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RD YWNoZS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpjaGlsZHJlbkNoYW5nZWQpOgoqIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlLmNwcDoKKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlUYWJsZTo6aXNEYXRhVGFibGUgY29uc3QpOgotLS0KIC4uLi9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgICB8ICA0ICstCiAuLi4vYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuY3BwICAgICAgfCAgNCArLQogLi4uL3NpbmdsZS10 aC1sYXlvdXQtdGFibGUtZXhwZWN0ZWQudHh0ICAgICAgIHwgMTYgKysrKysrKwogLi4uL2FjY2Vz c2liaWxpdHkvc2luZ2xlLXRoLWxheW91dC10YWJsZS5odG1sIHwgNDQgKysrKysrKysrKysrKysr KysrKwogNCBmaWxlcyBjaGFuZ2VkLCA2NSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQog Y3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvc2luZ2xlLXRoLWxh eW91dC10YWJsZS1leHBlY3RlZC50eHQKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9h Y2Nlc3NpYmlsaXR5L3NpbmdsZS10aC1sYXlvdXQtdGFibGUuaHRtbAoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4IGVkMTViOTE1ZjAyNC4u MjQ2YTZjM2EzOTc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FY T2JqZWN0Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmpl Y3RDYWNoZS5jcHAKQEAgLTEzOTUsNyArMTM5NSw5IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6Y2hp bGRyZW5DaGFuZ2VkKEFjY2Vzc2liaWxpdHlPYmplY3QqIG9iamVjdCkKICAgICBtX2RlZmVycmVk Q2hpbGRyZW5DaGFuZ2VkTGlzdC5hZGQob2JqZWN0KTsKIAogICAgIC8vIEFkZGluZyBvciByZW1v dmluZyByb3dzIGZyb20gYSB0YWJsZSBjYW4gY2F1c2UgaXQgdG8gY2hhbmdlIGZyb20gbGF5b3V0 IHRhYmxlIHRvIEFYIGRhdGEgdGFibGUgYW5kIHZpY2UgdmVyc2EsIHNvIHF1ZXVlIHVwIHJlY29t cHV0YXRpb24gb2YgdGhhdCBmb3IgdGhlIHBhcmVudCB0YWJsZS4KLSAgICBpZiAoYXV0byogdGFi bGVTZWN0aW9uRWxlbWVudCA9IGR5bmFtaWNEb3duY2FzdDxIVE1MVGFibGVTZWN0aW9uRWxlbWVu dD4ob2JqZWN0LT5lbGVtZW50KCkpKQorICAgIGlmIChhdXRvKiB0YWJsZUVsZW1lbnQgPSBkeW5h bWljRG93bmNhc3Q8SFRNTFRhYmxlRWxlbWVudD4ob2JqZWN0LT5lbGVtZW50KCkpKQorICAgICAg ICBkZWZlclJlY29tcHV0ZVRhYmxlSXNFeHBvc2VkKGNvbnN0X2Nhc3Q8SFRNTFRhYmxlRWxlbWVu dCo+KHRhYmxlRWxlbWVudCkpOworICAgIGVsc2UgaWYgKGF1dG8qIHRhYmxlU2VjdGlvbkVsZW1l bnQgPSBkeW5hbWljRG93bmNhc3Q8SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ+KG9iamVjdC0+ZWxl bWVudCgpKSkKICAgICAgICAgZGVmZXJSZWNvbXB1dGVUYWJsZUlzRXhwb3NlZChjb25zdF9jYXN0 PEhUTUxUYWJsZUVsZW1lbnQqPih0YWJsZVNlY3Rpb25FbGVtZW50LT5maW5kUGFyZW50VGFibGUo KS5nZXQoKSkpOwogCiAgICAgaWYgKCFtX3BlcmZvcm1DYWNoZVVwZGF0ZVRpbWVyLmlzQWN0aXZl KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlUYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlU YWJsZS5jcHAKaW5kZXggZDI3MGQ3NjRjOGIwLi5iMzEzYTIzNmUzYTIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZS5jcHAKQEAgLTMz NSw4ICszMzUsOCBAQCBib29sIEFjY2Vzc2liaWxpdHlUYWJsZTo6aXNEYXRhVGFibGUoKSBjb25z dAogICAgICAgICAgICAgZWxlbWVudHNUb1Zpc2l0LnB1c2goY3VycmVudEVsZW1lbnQpOwogICAg ICAgICB9CiAKLSAgICAgICAgLy8gSWYgdGhlIGZpcnN0IHJvdyBpcyBjb21wcmlzZWQgb2YgYWxs IDx0aD4gdGFncywgYXNzdW1lIGl0IGlzIGEgZGF0YSB0YWJsZS4KLSAgICAgICAgaWYgKGZpcnN0 Um93ICYmIGN1cnJlbnRQYXJlbnQgPT0gZmlyc3RSb3cgJiYgcm93SXNBbGxUYWJsZUhlYWRlckNl bGxzICYmIGNlbGxDb3VudEZvckVhY2hSb3cuZ2V0KGN1cnJlbnRQYXJlbnQuZ2V0KCkpID49IDEp CisgICAgICAgIC8vIElmIHRoZSBmaXJzdCByb3cgb2YgYSBtdWx0aS1yb3cgdGFibGUgaXMgY29t cHJpc2VkIG9mIGFsbCA8dGg+IHRhZ3MsIGFzc3VtZSBpdCBpcyBhIGRhdGEgdGFibGUuCisgICAg ICAgIGlmIChmaXJzdFJvdyAmJiBjdXJyZW50UGFyZW50ID09IGZpcnN0Um93ICYmIHJvd0lzQWxs VGFibGVIZWFkZXJDZWxscyAmJiAgY2VsbENvdW50Rm9yRWFjaFJvdy5nZXQoY3VycmVudFBhcmVu dC5nZXQoKSkgPj0gMSAmJiByb3dDb3VudCA+PSAyKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3NpbmdsZS10 aC1sYXlvdXQtdGFibGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9z aW5nbGUtdGgtbGF5b3V0LXRhYmxlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAuLjU5MzQ4YWM1MTYxMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvc2luZ2xlLXRoLWxheW91dC10YWJsZS1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwxNiBAQAorVGVzdHMgdGhhdCB0YWJsZXMgd2l0aCBhIHNpbmdsZSByb3cgb2Yg YWxsIGhlYWRlcnMgYXJlIG5vdCBleHBvc2VkIGFzIGRhdGEgdGFibGVzLgorCitQQVNTOiAhYWNj ZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCd0YWJsZTEnKSA9PT0g dHJ1ZQorCitBZGRpbmcgYW5vdGhlciBoZWFkZXIgY2VsbCB0byAjdGFibGUxLi4uCitQQVNTOiAh YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCd0YWJsZTEnKSA9 PT0gdHJ1ZQorCitBZGRpbmcgYW5vdGhlciByb3cgdG8gI3RhYmxlMS4uLgorCisjdGFibGUxIGlz IG5vdCBpZ25vcmVkLgorCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1Qg Q09NUExFVEUKK0NlbGwgMQlDZWxsIDIKK0NlbGwgMwlDZWxsIDQKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvc2luZ2xlLXRoLWxheW91dC10YWJsZS5odG1sIGIvTGF5b3V0 VGVzdHMvYWNjZXNzaWJpbGl0eS9zaW5nbGUtdGgtbGF5b3V0LXRhYmxlLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi5lOGQ3YmE0OGZhY2EKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3NpbmdsZS10aC1sYXlvdXQtdGFibGUu aHRtbApAQCAtMCwwICsxLDQ0IEBACis8aHRtbD4KKzxoZWFkPgorICAgIDxzY3JpcHQgc3JjPSIu Li9yZXNvdXJjZXMvYWNjZXNzaWJpbGl0eS1oZWxwZXIuanMiPjwvc2NyaXB0PgorICAgIDxzY3Jp cHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+CisKKzxi b2R5PgorPHRhYmxlIGlkPSJ0YWJsZTEiPgorICAgIDx0ciBpZD0icm93MSI+IAorICAgICAgICA8 dGggaWQ9ImNlbGwxIj5DZWxsIDE8L3RoPiAKKyAgICA8L3RyPgorPC90YWJsZT4KKworPHNjcmlw dD4KK2xldCBvdXRwdXQgPSAiVGVzdHMgdGhhdCB0YWJsZXMgd2l0aCBhIHNpbmdsZSByb3cgb2Yg YWxsIGhlYWRlcnMgYXJlIG5vdCBleHBvc2VkIGFzIGRhdGEgdGFibGVzLlxuXG4iOworCitpZiAo d2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgd2luZG93LmpzVGVzdElzQXN5 bmMgPSB0cnVlOworCisgICAgb3V0cHV0ICs9IGV4cGVjdCgiIWFjY2Vzc2liaWxpdHlDb250cm9s bGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgndGFibGUxJykiLCAidHJ1ZSIpOworCisgICAgb3V0 cHV0ICs9ICJcbkFkZGluZyBhbm90aGVyIGhlYWRlciBjZWxsIHRvICN0YWJsZTEuLi5cbiI7Cisg ICAgbGV0IHRoRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRoIik7CisgICAgdGhF bGVtZW50LmlubmVySFRNTCA9ICJDZWxsIDIiOworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJjZWxsMSIpLmFmdGVyKHRoRWxlbWVudCk7CisKKyAgICBvdXRwdXQgKz0gZXhwZWN0KCIhYWNj ZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCd0YWJsZTEnKSIsICJ0 cnVlIik7CisKKyAgICBvdXRwdXQgKz0gIlxuQWRkaW5nIGFub3RoZXIgcm93IHRvICN0YWJsZTEu Li5cbiI7CisgICAgbGV0IHRyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRyIik7 CisgICAgdHJFbGVtZW50LmlubmVySFRNTCA9ICI8dGQ+Q2VsbCAzPC90ZD48dGQ+Q2VsbCA0PC90 ZD4iOworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyb3cxIikuYWZ0ZXIodHJFbGVtZW50 KTsKKworICAgIHNldFRpbWVvdXQoYXN5bmMgZnVuY3Rpb24gKCkgeworICAgICAgICBhd2FpdCB3 YWl0Rm9yKCgpID0+IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJ ZCgndGFibGUxJykgIT0gbnVsbCk7CisgICAgICAgIG91dHB1dCArPSAiXG4jdGFibGUxIGlzIG5v dCBpZ25vcmVkLlxuIjsKKworICAgICAgICBkZWJ1ZyhvdXRwdXQpOworICAgICAgICBmaW5pc2hK U1Rlc3QoKTsKKyAgICB9KQorfQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 469294 2024-01-04 20:07:58 -0800 2024-01-05 17:43:27 -0800 Patch bug-267056-20240104200757.patch text/plain 5874 jhoffman23 RnJvbSAwMGYxMjg4YTU0NWQ5OWU0ZDg0MGNkNTdhNDA0ZTZhYjc2N2E0YmNhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb3NodWEgSG9mZm1hbiA8amhvZmZtYW4yM0BhcHBsZS5jb20+ CkRhdGU6IFRodSwgNCBKYW4gMjAyNCAyMDowNDo1MiAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIEFY OiBUYWJsZXMgd2l0aCBvbmUgcm93IG9mIGFsbCBoZWFkZXIgY2VsbHMgc2hvdWxkIG5vdCBiZQog ZXhwb3NlZCBhcyBkYXRhIHRhYmxlcyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjY3MDU2CiByZGFyOi8vMTE5OTQxNDczCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KCkR1ZSB0byBsb2dpYyBpbiBpc0RhdGFUYWJsZSwgd2UgY3VycmVudGx5IGV4cG9zZSB0YWJs ZXMgd2l0aCBvbmUgcm93IG9mIGFsbCBoZWFkZXIKY2VsbHMgYXMgZGF0YSB0YWJsZXMuIEJ1dCwg bW9zdCBvdGhlciBzaW5nbGUtcm93IHRhYmxlcyBhcmUgY29uc2lkZXJlZCBsYXlvdXQgdGFibGVz LgoKVGhpcyBwYXRjaCB1cGRhdGVzIG91dCBsb2dpYyB0byBjb25zaWRlciB0aGlzIG1hcmt1cCBh IGxheW91dCB0YWJsZS4KCkFYT2JqZWN0Q2FjaGU6OmNoaWxkcmVuQ2hhbmdlZCB3YXMgYWxzbyB1 cGRhdGVkIHRvIHJlY29tcHV0ZSBhIHRhYmxlcyBleHBvc2FiaWxpdHkgd2hlbgpyb3dzIGNoYW5n ZSBvdXRzaWRlIG9mIHRhYmxlIHNlY3Rpb25zICh0Ym9keSwgdGhlYWQsIHRmb290KS4KCiogTGF5 b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9zaW5nbGUtdGgtbGF5b3V0LXRhYmxlLWV4cGVjdGVkLnR4 dDogQWRkZWQuCiogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9zaW5nbGUtdGgtbGF5b3V0LXRh YmxlLmh0bWw6IEFkZGVkLgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RD YWNoZS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpjaGlsZHJlbkNoYW5nZWQpOgoqIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlLmNwcDoKKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlUYWJsZTo6aXNEYXRhVGFibGUgY29uc3QpOgotLS0KIC4uLi9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgICB8ICA0ICstCiAuLi4vYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuY3BwICAgICAgfCAgNCArLQogLi4uL3NpbmdsZS10 aC1sYXlvdXQtdGFibGUtZXhwZWN0ZWQudHh0ICAgICAgIHwgMTYgKysrKysrKwogLi4uL2FjY2Vz c2liaWxpdHkvc2luZ2xlLXRoLWxheW91dC10YWJsZS5odG1sIHwgNDUgKysrKysrKysrKysrKysr KysrKwogNCBmaWxlcyBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQog Y3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvc2luZ2xlLXRoLWxh eW91dC10YWJsZS1leHBlY3RlZC50eHQKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9h Y2Nlc3NpYmlsaXR5L3NpbmdsZS10aC1sYXlvdXQtdGFibGUuaHRtbAoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4IGZlZWE1MDE0MTVhMS4u NjM3MDYwZDAwODhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FY T2JqZWN0Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmpl Y3RDYWNoZS5jcHAKQEAgLTEzOTUsNyArMTM5NSw5IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6Y2hp bGRyZW5DaGFuZ2VkKEFjY2Vzc2liaWxpdHlPYmplY3QqIG9iamVjdCkKICAgICBtX2RlZmVycmVk Q2hpbGRyZW5DaGFuZ2VkTGlzdC5hZGQob2JqZWN0KTsKIAogICAgIC8vIEFkZGluZyBvciByZW1v dmluZyByb3dzIGZyb20gYSB0YWJsZSBjYW4gY2F1c2UgaXQgdG8gY2hhbmdlIGZyb20gbGF5b3V0 IHRhYmxlIHRvIEFYIGRhdGEgdGFibGUgYW5kIHZpY2UgdmVyc2EsIHNvIHF1ZXVlIHVwIHJlY29t cHV0YXRpb24gb2YgdGhhdCBmb3IgdGhlIHBhcmVudCB0YWJsZS4KLSAgICBpZiAoYXV0byogdGFi bGVTZWN0aW9uRWxlbWVudCA9IGR5bmFtaWNEb3duY2FzdDxIVE1MVGFibGVTZWN0aW9uRWxlbWVu dD4ob2JqZWN0LT5lbGVtZW50KCkpKQorICAgIGlmIChhdXRvKiB0YWJsZUVsZW1lbnQgPSBkeW5h bWljRG93bmNhc3Q8SFRNTFRhYmxlRWxlbWVudD4ob2JqZWN0LT5lbGVtZW50KCkpKQorICAgICAg ICBkZWZlclJlY29tcHV0ZVRhYmxlSXNFeHBvc2VkKGNvbnN0X2Nhc3Q8SFRNTFRhYmxlRWxlbWVu dCo+KHRhYmxlRWxlbWVudCkpOworICAgIGVsc2UgaWYgKGF1dG8qIHRhYmxlU2VjdGlvbkVsZW1l bnQgPSBkeW5hbWljRG93bmNhc3Q8SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ+KG9iamVjdC0+ZWxl bWVudCgpKSkKICAgICAgICAgZGVmZXJSZWNvbXB1dGVUYWJsZUlzRXhwb3NlZChjb25zdF9jYXN0 PEhUTUxUYWJsZUVsZW1lbnQqPih0YWJsZVNlY3Rpb25FbGVtZW50LT5maW5kUGFyZW50VGFibGUo KS5nZXQoKSkpOwogCiAgICAgaWYgKCFtX3BlcmZvcm1DYWNoZVVwZGF0ZVRpbWVyLmlzQWN0aXZl KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlUYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlU YWJsZS5jcHAKaW5kZXggZDI3MGQ3NjRjOGIwLi5mY2Y1MzRhMTZlMGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZS5jcHAKQEAgLTMz NSw4ICszMzUsOCBAQCBib29sIEFjY2Vzc2liaWxpdHlUYWJsZTo6aXNEYXRhVGFibGUoKSBjb25z dAogICAgICAgICAgICAgZWxlbWVudHNUb1Zpc2l0LnB1c2goY3VycmVudEVsZW1lbnQpOwogICAg ICAgICB9CiAKLSAgICAgICAgLy8gSWYgdGhlIGZpcnN0IHJvdyBpcyBjb21wcmlzZWQgb2YgYWxs IDx0aD4gdGFncywgYXNzdW1lIGl0IGlzIGEgZGF0YSB0YWJsZS4KLSAgICAgICAgaWYgKGZpcnN0 Um93ICYmIGN1cnJlbnRQYXJlbnQgPT0gZmlyc3RSb3cgJiYgcm93SXNBbGxUYWJsZUhlYWRlckNl bGxzICYmIGNlbGxDb3VudEZvckVhY2hSb3cuZ2V0KGN1cnJlbnRQYXJlbnQuZ2V0KCkpID49IDEp CisgICAgICAgIC8vIElmIHRoZSBmaXJzdCByb3cgb2YgYSBtdWx0aS1yb3cgdGFibGUgaXMgY29t cHJpc2VkIG9mIGFsbCA8dGg+IHRhZ3MsIGFzc3VtZSBpdCBpcyBhIGRhdGEgdGFibGUuCisgICAg ICAgIGlmIChmaXJzdFJvdyAmJiBjdXJyZW50UGFyZW50ID09IGZpcnN0Um93ICYmIHJvd0lzQWxs VGFibGVIZWFkZXJDZWxscyAmJiBjZWxsQ291bnRGb3JFYWNoUm93LmdldChjdXJyZW50UGFyZW50 LmdldCgpKSA+PSAxICYmIHJvd0NvdW50ID49IDIpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvc2luZ2xlLXRo LWxheW91dC10YWJsZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3Np bmdsZS10aC1sYXlvdXQtdGFibGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMC4uNWYzMGVkMTY4OGVjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvYWNjZXNzaWJpbGl0eS9zaW5nbGUtdGgtbGF5b3V0LXRhYmxlLWV4cGVjdGVkLnR4dApA QCAtMCwwICsxLDE2IEBACitUZXN0cyB0aGF0IHRhYmxlcyB3aXRoIGEgc2luZ2xlIHJvdyBvZiBh bGwgaGVhZGVycyBhcmUgbm90IGV4cG9zZWQgYXMgZGF0YSB0YWJsZXMuCisKK1BBU1M6ICFhY2Nl c3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoJ3RhYmxlMScpID09PSB0 cnVlCisKK0FkZGluZyBhbm90aGVyIHJvdyB0byAjdGFibGUxLi4uCisKKyN0YWJsZTEgaXMgbm90 IGlnbm9yZWQuCitQQVNTOiB0YWJsZS5yb2xlID09PSAnQVhSb2xlOiBBWFRhYmxlJworUEFTUzog dGFibGUuY29sdW1uQ291bnQgPT09IDIKK1BBU1M6IHRhYmxlLnJvd0NvdW50ID09PSAyCisKK1BB U1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorQ2VsbCAxCUNl bGwgMgorQ2VsbCAzCUNlbGwgNApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9zaW5nbGUtdGgtbGF5b3V0LXRhYmxlLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5 L3NpbmdsZS10aC1sYXlvdXQtdGFibGUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAuLmI5NDdiNTdlZjgxMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvc2luZ2xlLXRoLWxheW91dC10YWJsZS5odG1sCkBAIC0wLDAgKzEsNDUg QEAKKzxodG1sPgorPGhlYWQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9hY2Nlc3Np YmlsaXR5LWhlbHBlci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNl cy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKworPGJvZHk+Cis8dGFibGUgaWQ9InRh YmxlMSI+CisgICAgPHRyIGlkPSJyb3cxIj4gCisgICAgICAgIDx0aCBpZD0iY2VsbDEiPkNlbGwg MTwvdGg+CisgICAgICAgIDx0aCBpZD0iY2VsbDIiPkNlbGwgMjwvdGg+CisgICAgPC90cj4KKzwv dGFibGU+CisKKzxzY3JpcHQ+CitsZXQgb3V0cHV0ID0gIlRlc3RzIHRoYXQgdGFibGVzIHdpdGgg YSBzaW5nbGUgcm93IG9mIGFsbCBoZWFkZXJzIGFyZSBub3QgZXhwb3NlZCBhcyBkYXRhIHRhYmxl cy5cblxuIjsKKworaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworICAgIHdp bmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKworICAgIG91dHB1dCArPSBleHBlY3QoIiFhY2Nl c3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoJ3RhYmxlMScpIiwgInRy dWUiKTsKKyAgICB0YWJsZSA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVt ZW50QnlJZCgndGFibGUxJykKKworICAgIG91dHB1dCArPSAiXG5BZGRpbmcgYW5vdGhlciByb3cg dG8gI3RhYmxlMS4uLlxuIjsKKyAgICBsZXQgdHJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgidHIiKTsKKyAgICB0ckVsZW1lbnQuaW5uZXJIVE1MID0gIjx0ZD5DZWxsIDM8L3RkPjx0 ZD5DZWxsIDQ8L3RkPiI7CisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJvdzEiKS5hZnRl cih0ckVsZW1lbnQpOworCisgICAgc2V0VGltZW91dChhc3luYyBmdW5jdGlvbiAoKSB7CisgICAg ICAgIGF3YWl0IHdhaXRGb3IoKCkgPT4geyAKKyAgICAgICAgICAgIHRhYmxlID0gYWNjZXNzaWJp bGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCd0YWJsZTEnKTsKKyAgICAgICAg ICAgIHJldHVybiB0YWJsZSAhPSBudWxsOworICAgICAgICB9KTsKKyAgICAgICAgb3V0cHV0ICs9 ICJcbiN0YWJsZTEgaXMgbm90IGlnbm9yZWQuXG4iOworICAgICAgICBvdXRwdXQgKz0gZXhwZWN0 KCJ0YWJsZS5yb2xlIiwgIidBWFJvbGU6IEFYVGFibGUnIik7CisgICAgICAgIG91dHB1dCArPSBl eHBlY3QoInRhYmxlLmNvbHVtbkNvdW50IiwgIjIiKTsKKyAgICAgICAgb3V0cHV0ICs9IGV4cGVj dCgidGFibGUucm93Q291bnQiLCAiMiIpOworCisgICAgICAgIGRlYnVnKG91dHB1dCk7CisgICAg ICAgIGZpbmlzaEpTVGVzdCgpOworICAgIH0pCit9Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRt bD4K