115837 2013-05-08 17:41:12 -0700 AX: VoiceOver is no longer seeing items in poorly formed tables 2013-05-09 17:57:16 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach aboxhall apinheiro commit-queue dmazzoni jdiggs mario thorton oldest_to_newest 886540 0 cfleizach 2013-05-08 17:41:12 -0700 If an ARIA table has intermediate nodes between it and its rows, then the table does not vend its rows or children correctly. 886541 1 cfleizach 2013-05-08 17:41:31 -0700 Like this kind of table <div role="grid" id="grid"> <div role="application"> <div role="application"> <div role="row" id="row1"> <div role="gridcell">1</div> </div> <div role="text">a</div> <div role="row" id="row2"> <div role="gridcell">1</div> </div> </div> </div> </div> 886549 2 201123 cfleizach 2013-05-08 17:51:24 -0700 Created attachment 201123 patch 886550 3 cfleizach 2013-05-08 17:51:41 -0700 Adding Tim to help with review 886551 4 cfleizach 2013-05-08 17:51:56 -0700 rdar://13687511 886926 5 201123 darin 2013-05-09 09:56:19 -0700 Comment on attachment 201123 patch View in context: https://bugs.webkit.org/attachment.cgi?id=201123&action=review > Source/WebCore/accessibility/AccessibilityARIAGridRow.cpp:121 > + // The parent table might not be the direct ancestor (unfortunately due to bad programming). This reference to “bad programming” is vague and confusing. Could you write something more specific instead? > Source/WebCore/accessibility/AccessibilityTable.h:91 > + // isTable is whether it's an AccessibilityTable object. > + virtual bool isTable() const { return true; } > + // isAccessibilityTable is whether it is exposed as an AccessibilityTable to the platform. > + virtual bool isAccessibilityTable() const; > + // isDataTable is whether it is exposed as an AccessibilitTable because the heuristic > + // think this "looks" like a data-based table (instead of a table used for layout). > + virtual bool isDataTable() const; All three of these virtual functions should say OVERRIDE. I don’t find the distinction between isTable and isAccessibilityTable is expressed by the function name. I’d suggest calling the latter function something else. Something to return to later. There’s a typo here: AccessibilitTable. > Source/WebCore/accessibility/AccessibilityTableRow.cpp:106 > + for (AccessibilityObject* parent = parentObject(); parent; parent = parent->parentObject()) { Does this need to skip ignored objects, or does that take care of itself? > Source/WebCore/accessibility/AccessibilityTableRow.cpp:107 > + // If this is a table object, but not an accessibility table, we shouldn't Looks like you were halfway through writing this comment. 887175 6 cfleizach 2013-05-09 17:36:03 -0700 (In reply to comment #5) > (From update of attachment 201123 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=201123&action=review > > > Source/WebCore/accessibility/AccessibilityARIAGridRow.cpp:121 > > + // The parent table might not be the direct ancestor (unfortunately due to bad programming). > > This reference to “bad programming” is vague and confusing. Could you write something more specific instead? Fixed > > > Source/WebCore/accessibility/AccessibilityTable.h:91 > > + // isTable is whether it's an AccessibilityTable object. > > + virtual bool isTable() const { return true; } > > + // isAccessibilityTable is whether it is exposed as an AccessibilityTable to the platform. > > + virtual bool isAccessibilityTable() const; > > + // isDataTable is whether it is exposed as an AccessibilitTable because the heuristic > > + // think this "looks" like a data-based table (instead of a table used for layout). > > + virtual bool isDataTable() const; > > All three of these virtual functions should say OVERRIDE. > Fixed > I don’t find the distinction between isTable and isAccessibilityTable is expressed by the function name. I’d suggest calling the latter function something else. Something to return to later. Agreed. I'll revisit in another bug > > There’s a typo here: AccessibilitTable. > > > Source/WebCore/accessibility/AccessibilityTableRow.cpp:106 > > + for (AccessibilityObject* parent = parentObject(); parent; parent = parent->parentObject()) { > > Does this need to skip ignored objects, or does that take care of itself? > That takes care of itself by asking if it's an accessibilityTable. parentObjectUnignored() will do the same thing as this method (run up the parent chain), but has the added cost of calling accessibilityIsIgnored() on every object. > > Source/WebCore/accessibility/AccessibilityTableRow.cpp:107 > > + // If this is a table object, but not an accessibility table, we shouldn't > > Looks like you were halfway through writing this comment. Thanks fixed. 887176 7 cfleizach 2013-05-09 17:57:16 -0700 http://trac.webkit.org/changeset/149858 201123 2013-05-08 17:51:24 -0700 2013-05-09 09:56:19 -0700 patch patch text/plain 12442 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0OTc4MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDEzLTA1LTA4ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFZvaWNlT3ZlciBp cyBubyBsb25nZXIgc2VlaW5nIGl0ZW1zIGluIHBvb3JseSBmb3JtZWQgdGFibGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU4MzcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjYXNlIHRoZSBhdXRo b3IgZGlkbid0IGluY2x1ZGUgdGhlIHJvd3Mgb2YgYSB0YWJsZSBhcyB0aGUgCisgICAgICAgIGRp cmVjdCBjaGlsZHJlbiwgYSB0YWJsZSBuZWVkIHRvIGRpdmUgZG93biBpdHMgZGVzY2VuZGFudCBj aGFpbgorICAgICAgICB1bnRpbCB0aGUgcm93cyBhcmUgZm91bmQuIAorCisgICAgICAgIEkgYWxz byB0b29rIHRoZSBvcHBvcnR1bml0eSB0byBjbGVhbiB1cCBhIGJpdCB3aGF0IGFyZSB0aGUgZGlm ZmVyZW50CisgICAgICAgIG1lYW5pbmdzIG9mIHRhYmxlIGluIHRoZSBhY2Nlc3NpYmlsaXR5IGNv ZGUuCisKKyAgICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9wb29ybHktZm9ybWVkLWFyaWEtdGFi bGUuaHRtbAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eUFSSUFHcmlkOjphZGRSb3dEZXNj ZW5kYW50KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlBUklBR3JpZDo6YWRkQ2hp bGRyZW4pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUFSSUFHcmlkLmg6 CisgICAgICAgIChBY2Nlc3NpYmlsaXR5QVJJQUdyaWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eUFSSUFHcmlkUm93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vz c2liaWxpdHlBUklBR3JpZFJvdzo6cGFyZW50VGFibGUpOgorICAgICAgICAoV2ViQ29yZSk6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWRSb3cuaDoKKyAgICAg ICAgKEFjY2Vzc2liaWxpdHlBUklBR3JpZFJvdyk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5T2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2Jq ZWN0Ojppc1RhYmxlKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJs ZS5oOgorICAgICAgICAoQWNjZXNzaWJpbGl0eVRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlUYWJsZTo6aXNUYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjp0b0FjY2Vzc2li aWxpdHlUYWJsZSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVS b3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVRhYmxlUm93OjpwYXJlbnRU YWJsZSk6CisKIDIwMTMtMDUtMDcgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUG90ZW50aWFsIHVzZS1hZnRlci1mcmVlIG9mIEZyYW1lCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlBUklBR3JpZC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWQu Y3BwCShyZXZpc2lvbiAxNDk2MDApCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlBUklBR3JpZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgxLDcgKzgxLDIzIEBA CiAgICAgYXBwZW5kZWRSb3dzLmFkZChyb3cpOwogICAgIHJldHVybiB0cnVlOwogfQotICAgIAor Cit2b2lkIEFjY2Vzc2liaWxpdHlBUklBR3JpZDo6YWRkUm93RGVzY2VuZGFudChBY2Nlc3NpYmls aXR5T2JqZWN0KiByb3dDaGlsZCwgSGFzaFNldDxBY2Nlc3NpYmlsaXR5T2JqZWN0Kj4mIGFwcGVu ZGVkUm93cywgdW5zaWduZWQmIGNvbHVtbkNvdW50KQoreworICAgIGlmICghcm93Q2hpbGQpCisg ICAgICAgIHJldHVybjsKKworICAgIGlmICghcm93Q2hpbGQtPmlzVGFibGVSb3coKSkgeworICAg ICAgICAvLyBUaGUgY2hpbGRyZW4gb2YgdGhpcyBub24tcm93IHdpbGwgY29udGFpbiBhbGwgbm9u LWlnbm9yZWQgZWxlbWVudHMgKHJlY3Vyc2luZyB0byBmaW5kIHRoZW0pLgorICAgICAgICAvLyBU aGlzIGFsbG93cyB0aGUgdGFibGUgdG8gZGl2ZSBhcmJpdHJhcmlseSBkZWVwIHRvIGZpbmQgdGhl IHJvd3MuCisgICAgICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBjaGlsZHJlbiA9IHJv d0NoaWxkLT5jaGlsZHJlbigpOworICAgICAgICBzaXplX3QgbGVuZ3RoID0gY2hpbGRyZW4uc2l6 ZSgpOworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKQorICAgICAg ICAgICAgYWRkUm93RGVzY2VuZGFudChjaGlsZHJlbltpXS5nZXQoKSwgYXBwZW5kZWRSb3dzLCBj b2x1bW5Db3VudCk7CisgICAgfSBlbHNlCisgICAgICAgIGFkZFRhYmxlQ2VsbENoaWxkKHJvd0No aWxkLCBhcHBlbmRlZFJvd3MsIGNvbHVtbkNvdW50KTsKK30KKwogdm9pZCBBY2Nlc3NpYmlsaXR5 QVJJQUdyaWQ6OmFkZENoaWxkcmVuKCkKIHsKICAgICBBU1NFUlQoIW1faGF2ZUNoaWxkcmVuKTsg CkBAIC0xMDAsMjIgKzExNiw4IEBACiAgICAgLy8gYWRkIG9ubHkgcm93cyB0aGF0IGFyZSBsYWJl bGVkIGFzIGFyaWEgcm93cwogICAgIEhhc2hTZXQ8QWNjZXNzaWJpbGl0eU9iamVjdCo+IGFwcGVu ZGVkUm93czsKICAgICB1bnNpZ25lZCBjb2x1bW5Db3VudCA9IDA7Ci0gICAgZm9yIChSZWZQdHI8 QWNjZXNzaWJpbGl0eU9iamVjdD4gY2hpbGQgPSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9 IGNoaWxkLT5uZXh0U2libGluZygpKSB7Ci0KLSAgICAgICAgaWYgKCFhZGRUYWJsZUNlbGxDaGls ZChjaGlsZC5nZXQoKSwgYXBwZW5kZWRSb3dzLCBjb2x1bW5Db3VudCkpIHsKLSAgICAgICAgICAg IAotICAgICAgICAgICAgLy8gaW4gY2FzZSB0aGUgcmVuZGVyIHRyZWUgZG9lc24ndCBtYXRjaCB0 aGUgZXhwZWN0ZWQgQVJJQSBoaWVyYXJjaHksIGxvb2sgYXQgdGhlIGNoaWxkcmVuCi0gICAgICAg ICAgICBpZiAoIWNoaWxkLT5oYXNDaGlsZHJlbigpKQotICAgICAgICAgICAgICAgIGNoaWxkLT5h ZGRDaGlsZHJlbigpOwotCi0gICAgICAgICAgICAvLyBUaGUgY2hpbGRyZW4gb2YgdGhpcyBub24t cm93IHdpbGwgY29udGFpbiBhbGwgbm9uLWlnbm9yZWQgZWxlbWVudHMgKHJlY3Vyc2luZyB0byBm aW5kIHRoZW0pLiAKLSAgICAgICAgICAgIC8vIFRoaXMgYWxsb3dzIHRoZSB0YWJsZSB0byBkaXZl IGFyYml0cmFyaWx5IGRlZXAgdG8gZmluZCB0aGUgcm93cy4KLSAgICAgICAgICAgIEFjY2Vzc2li aWxpdHlDaGlsZHJlblZlY3RvciBjaGlsZHJlbiA9IGNoaWxkLT5jaGlsZHJlbigpOwotICAgICAg ICAgICAgc2l6ZV90IGxlbmd0aCA9IGNoaWxkcmVuLnNpemUoKTsKLSAgICAgICAgICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpCi0gICAgICAgICAgICAgICAgYWRkVGFibGVD ZWxsQ2hpbGQoY2hpbGRyZW5baV0uZ2V0KCksIGFwcGVuZGVkUm93cywgY29sdW1uQ291bnQpOwot ICAgICAgICB9Ci0gICAgfQorICAgIGZvciAoUmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+IGNo aWxkID0gZmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkK KyAgICAgICAgYWRkUm93RGVzY2VuZGFudChjaGlsZC5nZXQoKSwgYXBwZW5kZWRSb3dzLCBjb2x1 bW5Db3VudCk7CiAgICAgCiAgICAgLy8gbWFrZSB0aGUgY29sdW1ucyBiYXNlZCBvbiB0aGUgbnVt YmVyIG9mIGNvbHVtbnMgaW4gdGhlIGZpcnN0IGJvZHkKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAw OyBpIDwgY29sdW1uQ291bnQ7ICsraSkgewpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlBUklBR3JpZC5oCShyZXZpc2lvbiAxNDk2MDAp CisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlBUklBR3JpZC5o CSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1NSw3IEBACiAgICAgdmlydHVhbCBib29sIGlzTXVs dGlTZWxlY3RhYmxlKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgYm9vbCBp c1RhYmxlRXhwb3NhYmxlVGhyb3VnaEFjY2Vzc2liaWxpdHkoKSBjb25zdCB7IHJldHVybiB0cnVl OyB9CiAgICAgCisgICAgdm9pZCBhZGRSb3dEZXNjZW5kYW50KEFjY2Vzc2liaWxpdHlPYmplY3Qq LCBIYXNoU2V0PEFjY2Vzc2liaWxpdHlPYmplY3QqPiYgYXBwZW5kZWRSb3dzLCB1bnNpZ25lZCYg Y29sdW1uQ291bnQpOwogICAgIGJvb2wgYWRkVGFibGVDZWxsQ2hpbGQoQWNjZXNzaWJpbGl0eU9i amVjdCosIEhhc2hTZXQ8QWNjZXNzaWJpbGl0eU9iamVjdCo+JiBhcHBlbmRlZFJvd3MsIHVuc2ln bmVkJiBjb2x1bW5Db3VudCk7CiB9OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlBUklBR3JpZFJvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWRSb3cuY3BwCShyZXZpc2lv biAxNDk2MDApCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlB UklBR3JpZFJvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNiw2ICsxMTYsMTggQEAKICAgICBy ZXR1cm4gMDsKIH0KICAgICAKK0FjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlBUklB R3JpZFJvdzo6cGFyZW50VGFibGUoKSBjb25zdAoreworICAgIC8vIFRoZSBwYXJlbnQgdGFibGUg bWlnaHQgbm90IGJlIHRoZSBkaXJlY3QgYW5jZXN0b3IgKHVuZm9ydHVuYXRlbHkgZHVlIHRvIGJh ZCBwcm9ncmFtbWluZykuCisgICAgZm9yIChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBwYXJlbnQgPSBw YXJlbnRPYmplY3QoKTsgcGFyZW50OyBwYXJlbnQgPSBwYXJlbnQtPnBhcmVudE9iamVjdCgpKSB7 CisgICAgICAgIC8vIFRoZSBwYXJlbnQgdGFibGUgZm9yIGFuIEFSSUEgZ3JpZCByb3cgc2hvdWxk IGJlIGFuIEFSSUEgdGFibGUuCisgICAgICAgIGlmIChwYXJlbnQtPmlzVGFibGUoKSAmJiBwYXJl bnQtPmlzQWNjZXNzaWJpbGl0eVRhYmxlKCkgJiYgdG9BY2Nlc3NpYmlsaXR5VGFibGUocGFyZW50 KS0+aXNBcmlhVGFibGUoKSkKKyAgICAgICAgICAgIHJldHVybiBwYXJlbnQ7CisgICAgfQorICAg IAorICAgIHJldHVybiAwOworfQorCiBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5 QVJJQUdyaWRSb3c6OmhlYWRlck9iamVjdCgpCiB7CiAgICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVu VmVjdG9yIHJvd0NoaWxkcmVuID0gY2hpbGRyZW4oKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUFSSUFHcmlkUm93LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5QVJJQUdyaWRSb3cuaAkocmV2 aXNpb24gMTQ5NjAwKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5QVJJQUdyaWRSb3cuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsNyBAQAogICAgIAog cHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgaXNBUklBVHJlZUdyaWRSb3coKSBjb25zdDsKKyAg ICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlPYmplY3QqIHBhcmVudFRhYmxlKCkgY29uc3Q7CiB9OyAK ICAgICAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUgCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAkocmV2aXNpb24gMTQ5NjAw KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgJ KHdvcmtpbmcgY29weSkKQEAgLTQxMyw2ICs0MTMsNyBAQAogICAgIHZpcnR1YWwgYm9vbCBpc0lu cHV0U2xpZGVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXND b250cm9sKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNMaXN0 KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNUYWJsZSgpIGNv bnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlzQWNjZXNzaWJpbGl0eVRh YmxlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNEYXRhVGFi bGUoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc1RhYmxlUm93 KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuaAkocmV2aXNpb24gMTQ5NjAwKQorKysg U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDcsOSArNDcsNiBAQAogCiAgICAgdmlydHVhbCB2b2lkIGluaXQoKTsKIAot ICAgIHZpcnR1YWwgYm9vbCBpc0FjY2Vzc2liaWxpdHlUYWJsZSgpIGNvbnN0OwotICAgIHZpcnR1 YWwgYm9vbCBpc0RhdGFUYWJsZSgpIGNvbnN0OwotCiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5 Um9sZSByb2xlVmFsdWUoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgaXNBcmlhVGFibGUoKSBj b25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIApAQCAtODQsMTMgKzgxLDIyIEBACiAgICAgYm9v bCBtX2lzQWNjZXNzaWJpbGl0eVRhYmxlOwogCiAgICAgYm9vbCBoYXNBUklBUm9sZSgpIGNvbnN0 OworCisgICAgLy8gaXNUYWJsZSBpcyB3aGV0aGVyIGl0J3MgYW4gQWNjZXNzaWJpbGl0eVRhYmxl IG9iamVjdC4KKyAgICB2aXJ0dWFsIGJvb2wgaXNUYWJsZSgpIGNvbnN0IHsgcmV0dXJuIHRydWU7 IH0KKyAgICAvLyBpc0FjY2Vzc2liaWxpdHlUYWJsZSBpcyB3aGV0aGVyIGl0IGlzIGV4cG9zZWQg YXMgYW4gQWNjZXNzaWJpbGl0eVRhYmxlIHRvIHRoZSBwbGF0Zm9ybS4KKyAgICB2aXJ0dWFsIGJv b2wgaXNBY2Nlc3NpYmlsaXR5VGFibGUoKSBjb25zdDsKKyAgICAvLyBpc0RhdGFUYWJsZSBpcyB3 aGV0aGVyIGl0IGlzIGV4cG9zZWQgYXMgYW4gQWNjZXNzaWJpbGl0VGFibGUgYmVjYXVzZSB0aGUg aGV1cmlzdGljCisgICAgLy8gdGhpbmsgdGhpcyAibG9va3MiIGxpa2UgYSBkYXRhLWJhc2VkIHRh YmxlIChpbnN0ZWFkIG9mIGEgdGFibGUgdXNlZCBmb3IgbGF5b3V0KS4KKyAgICB2aXJ0dWFsIGJv b2wgaXNEYXRhVGFibGUoKSBjb25zdDsKKwogICAgIHZpcnR1YWwgYm9vbCBpc1RhYmxlRXhwb3Nh YmxlVGhyb3VnaEFjY2Vzc2liaWxpdHkoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgY29tcHV0 ZUFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSBjb25zdDsKIH07CiAgICAgCiBpbmxpbmUgQWNjZXNz aWJpbGl0eVRhYmxlKiB0b0FjY2Vzc2liaWxpdHlUYWJsZShBY2Nlc3NpYmlsaXR5T2JqZWN0KiBv YmplY3QpCiB7Ci0gICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIW9iamVjdCB8 fCBvYmplY3QtPmlzQWNjZXNzaWJpbGl0eVRhYmxlKCkpOworICAgIEFTU0VSVF9XSVRIX1NFQ1VS SVRZX0lNUExJQ0FUSU9OKCFvYmplY3QgfHwgb2JqZWN0LT5pc1RhYmxlKCkpOwogICAgIHJldHVy biBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5VGFibGUqPihvYmplY3QpOwogfQogICAgIApJbmRl eDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVSb3cuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVRhYmxlUm93LmNwcAkocmV2aXNpb24gMTQ5NjAwKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVSb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIs MTEgKzEwMiwxNCBAQAogICAgIAogQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVRh YmxlUm93OjpwYXJlbnRUYWJsZSgpIGNvbnN0CiB7Ci0gICAgQWNjZXNzaWJpbGl0eU9iamVjdCog cGFyZW50ID0gcGFyZW50T2JqZWN0VW5pZ25vcmVkKCk7Ci0gICAgaWYgKCFwYXJlbnQgfHwgIXBh cmVudC0+aXNBY2Nlc3NpYmlsaXR5VGFibGUoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgLy8g VGhlIHBhcmVudCB0YWJsZSBtaWdodCBub3QgYmUgdGhlIGRpcmVjdCBhbmNlc3RvciAodW5mb3J0 dW5hdGVseSBkdWUgdG8gYmFkIHByb2dyYW1taW5nKS4KKyAgICBmb3IgKEFjY2Vzc2liaWxpdHlP YmplY3QqIHBhcmVudCA9IHBhcmVudE9iamVjdCgpOyBwYXJlbnQ7IHBhcmVudCA9IHBhcmVudC0+ cGFyZW50T2JqZWN0KCkpIHsKKyAgICAgICAgLy8gSWYgdGhpcyBpcyBhIHRhYmxlIG9iamVjdCwg YnV0IG5vdCBhbiBhY2Nlc3NpYmlsaXR5IHRhYmxlLCB3ZSBzaG91bGRuJ3QgCisgICAgICAgIGlm IChwYXJlbnQtPmlzVGFibGUoKSkKKyAgICAgICAgICAgIHJldHVybiBwYXJlbnQtPmlzQWNjZXNz aWJpbGl0eVRhYmxlKCkgPyBwYXJlbnQgOiAwOworICAgIH0KICAgICAKLSAgICByZXR1cm4gcGFy ZW50OworICAgIHJldHVybiAwOwogfQogICAgIAogQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNz aWJpbGl0eVRhYmxlUm93OjpoZWFkZXJPYmplY3QoKQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTQ5Nzgz KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTMtMDUtMDggIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKwor ICAgICAgICBBWDogVm9pY2VPdmVyIGlzIG5vIGxvbmdlciBzZWVpbmcgaXRlbXMgaW4gcG9vcmx5 IGZvcm1lZCB0YWJsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExNTgzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9wb29ybHktZm9ybWVkLWFyaWEtdGFibGUtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L3Bvb3JseS1mb3JtZWQtYXJpYS10 YWJsZS5odG1sOiBBZGRlZC4KKwogMjAxMy0wNS0wOCAgU2Vva2p1IEt3b24gIDxzZW9ranUua3dv bkBnbWFpbC5jb20+CiAKICAgICAgICAgW0VGTF0gR2V0IHJpZCBvZiBkdXBsaWNhdGUgZW50cnkg bGluZSBpbiBUZXN0RXhwZWN0YXRpb25zCkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5 L3Bvb3JseS1mb3JtZWQtYXJpYS10YWJsZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9wb29ybHktZm9ybWVkLWFyaWEtdGFibGUtZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9wb29ybHktZm9y bWVkLWFyaWEtdGFibGUtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTIg QEAKK1RoaXMgdGVzdHMgdGhhdCBpZiBhbiBBUklBIHRhYmxlIGRvZXMgbm90IHJlcG9ydCB0aGUg cm93cyBhcyBpdHMgZGlyZWN0IGNoaWxkcmVuLCB0aGUgdGFibGUgd2lsbCBzdGlsbCBjb3JyZWN0 bHkgcmVwb3J0IHRoZSByb3dzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMg b2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFT UyBncmlkLnJvd0F0SW5kZXgoMCkuaXNFcXVhbChyb3cxKSBpcyB0cnVlCitQQVNTIGdyaWQucm93 QXRJbmRleCgxKS5pc0VxdWFsKHJvdzIpIGlzIHRydWUKK1BBU1MgZ3JpZC5yb3dDb3VudCBpcyAy CitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRl eDogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9wb29ybHktZm9ybWVkLWFyaWEtdGFibGUuaHRt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3Bvb3JseS1mb3JtZWQt YXJpYS10YWJsZS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9wb29ybHktZm9ybWVkLWFyaWEtdGFibGUuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsx LDQ1IEBACis8IURPQ1RZUEUgSFRNTD4KKzxodG1sPgorPGJvZHk+Cis8c2NyaXB0IHNyYz0iLi4v ZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorCis8ZGl2IGlkPSJj b250ZW50Ij4KKworPGRpdiByb2xlPSJncmlkIiBpZD0iZ3JpZCI+CisgIDxkaXYgcm9sZT0iYXBw bGljYXRpb24iPgorICAgICA8ZGl2IHJvbGU9ImFwcGxpY2F0aW9uIj4KKyAgICAgICAgIDxkaXYg cm9sZT0icm93IiBpZD0icm93MSI+CisgICAgICAgICAgICA8ZGl2IHJvbGU9ImdyaWRjZWxsIj4x PC9kaXY+CisgICAgICAgICA8L2Rpdj4KKyAgICAgICAgIDxkaXYgcm9sZT0idGV4dCI+YTwvZGl2 PgorICAgICAgICAgPGRpdiByb2xlPSJyb3ciIGlkPSJyb3cyIj4KKyAgICAgICAgICAgIDxkaXYg cm9sZT0iZ3JpZGNlbGwiPjE8L2Rpdj4KKyAgICAgICAgIDwvZGl2PgorICAgICA8L2Rpdj4KKyAg PC9kaXY+Cis8L2Rpdj4KKworPC9kaXY+CisKKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNj cmlwdD4KKworZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCBpZiBhbiBBUklBIHRhYmxlIGRv ZXMgbm90IHJlcG9ydCB0aGUgcm93cyBhcyBpdHMgZGlyZWN0IGNoaWxkcmVuLCB0aGUgdGFibGUg d2lsbCBzdGlsbCBjb3JyZWN0bHkgcmVwb3J0IHRoZSByb3dzLiIpCisKK2lmICh3aW5kb3cudGVz dFJ1bm5lciAmJiB3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAKKyAgICB2YXIg Z3JpZCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiZ3Jp ZCIpOworICAgIHZhciByb3cxID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVs ZW1lbnRCeUlkKCJyb3cxIik7CisgICAgdmFyIHJvdzIgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxl ci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInJvdzIiKTsKKyAgICAKKyAKKyAgICBzaG91bGRCZVRy dWUoImdyaWQucm93QXRJbmRleCgwKS5pc0VxdWFsKHJvdzEpIik7CisgICAgc2hvdWxkQmVUcnVl KCJncmlkLnJvd0F0SW5kZXgoMSkuaXNFcXVhbChyb3cyKSIpOworICAgIHNob3VsZEJlKCJncmlk LnJvd0NvdW50IiwgIjIiKTsKKworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb250ZW50 Iikuc3R5bGUudmlzaWJpbGl0eSA9ICdoaWRkZW4nOyAgICAKK30KKzwvc2NyaXB0PgorPHNjcmlw dCBzcmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8 L2JvZHk+Cis8L2h0bWw+Cg==