179837 2017-11-17 13:01:08 -0800 AX: [ATK] Fix WKTR's methods for testing row header and column header presence and count 2017-11-17 14:09:58 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All Linux RESOLVED FIXED InRadar P2 Normal --- 1 jdiggs jdiggs aboxhall apinheiro cfleizach commit-queue dmazzoni ews-watchlist jcraig mcatanzaro samuel_white webkit-bug-importer oldest_to_newest 1373228 0 jdiggs 2017-11-17 13:01:08 -0800 We currently have these methods: 1. rowHeaders() and columnHeaders() 2. getRowHeaders() and getColumnHeaders() The methods in item 1 should return the headers if given a cell or a table. columnHeaders() does so, but rowHeaders() does not. These methods are to be implemented by all platforms, so we need to fix this. The methods in item 1 should return an empty array and not nullptr upon failure. Tests might ask for the length of the array and we should handle that gracefully. The methods in item 2 only get headers if given a table. Unlike the methods in item 1, these methods are just helper methods for our platform. Let's rename them to something a tad clearer. The methods in item 2 call atk_table_get_{row,column}_header. Those ATK methods take an index and return a header if there's one there and otherwise null. We should not append null objects to the array of headers because it leads to bogus results. 1373231 1 webkit-bug-importer 2017-11-17 13:01:39 -0800 <rdar://problem/35621868> 1373246 2 jdiggs 2017-11-17 13:29:01 -0800 *** Bug 176798 has been marked as a duplicate of this bug. *** 1373259 3 327227 jdiggs 2017-11-17 13:38:03 -0800 Created attachment 327227 Patch 1373289 4 327227 commit-queue 2017-11-17 14:09:56 -0800 Comment on attachment 327227 Patch Clearing flags on attachment: 327227 Committed r224986: <https://trac.webkit.org/changeset/224986> 1373290 5 commit-queue 2017-11-17 14:09:58 -0800 All reviewed patches have been landed. Closing bug. 327227 2017-11-17 13:38:03 -0800 2017-11-17 14:09:56 -0800 Patch bug-179837-20171117163802.patch text/plain 13469 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0OTY3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzhmODk4YzlmYzRiMTcyOTZjYzczYmU1NmEzM2Y1NmZk MDZiNzY5Yi4uYWRiY2E0OWRlNzAwNzgzMjNhZjYzMTY0YzhmNTk3OTMzYWI4ODE4ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE3LTExLTE3ICBKb2FubWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKwor ICAgICAgICBBWDogW0FUS10gRml4IFdLVFIncyBtZXRob2RzIGZvciB0ZXN0aW5nIHJvdyBoZWFk ZXIgYW5kIGNvbHVtbiBoZWFkZXIgcHJlc2VuY2UgYW5kIGNvdW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk4MzcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCB0byByb3dIZWFkZXJz KCkgZm9yIHRhYmxlcy4gUmV0dXJuIGFuIGVtcHR5IGFycmF5IGluIHJvd0hlYWRlcnMoKQorICAg ICAgICBhbmQgY29sdW1uSGVhZGVycygpIHVwb24gZmFpbHVyZS4gUmVuYW1lIGdldFJvd0hlYWRl cnMoKSBhbmQgZ2V0Q29sdW1uSGVhZGVycygpCisgICAgICAgIHRvIGdldFRhYmxlUm93SGVhZGVy cygpIGFuZCBnZXRUYWJsZUNvbHVtbkhlYWRlcnMoKSByZXNwZWN0aXZlbHkuCisKKyAgICAgICAg KiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVt ZW50QXRrLmNwcDoKKyAgICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6cm93SGVh ZGVycyBjb25zdCk6CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmNvbHVt bkhlYWRlcnMgY29uc3QpOgorICAgICAgICAoV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojph dHRyaWJ1dGVzT2ZDb2x1bW5IZWFkZXJzKToKKyAgICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJ RWxlbWVudDo6YXR0cmlidXRlc09mUm93SGVhZGVycyk6CisKIDIwMTctMTEtMTYgIERvbiBPbG1z dGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dIFVwZGF0 ZSBXaW5DYWlyb1JlcXVpcmVtZW50cwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9JbmplY3RlZEJ1bmRsZS9hdGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVt ZW50QXRrLmNwcAppbmRleCA0N2IyZTY3MDRlMzNlODhlYjMyODJhZTgyZTVlNTVkY2MzMDI3ZDUx Li41YmJjMTRjNDNkYmZiNTFiZDcwMzA4ZDU4NTJjNmYxYWMwNmZiZDQ2IDEwMDY0NAotLS0gYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2F0ay9BY2Nlc3NpYmlsaXR5VUlF bGVtZW50QXRrLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxl L2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcApAQCAtNjY1LDI0ICs2NjUsMjggQEAg c3RhdGljIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBjcmVhdGVTdHJpbmdXaXRoQXR0cmlidXRl cyhjb25zdCBWZWN0b3I8UmVmUHRyPEEKICAgICByZXR1cm4gSlNTdHJpbmdDcmVhdGVXaXRoVVRG OENTdHJpbmcoYnVpbGRlci50b1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogfQogCi1zdGF0aWMg VmVjdG9yPFJlZlB0cjxBY2Nlc3NpYmlsaXR5VUlFbGVtZW50PiA+IGdldFJvd0hlYWRlcnMoQXRr VGFibGUqIGFjY2Vzc2libGUpCitzdGF0aWMgVmVjdG9yPFJlZlB0cjxBY2Nlc3NpYmlsaXR5VUlF bGVtZW50PiA+IGdldFRhYmxlUm93SGVhZGVycyhBdGtUYWJsZSogYWNjZXNzaWJsZSkKIHsKICAg ICBWZWN0b3I8UmVmUHRyPEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ+ID4gcm93SGVhZGVyczsKIAog ICAgIGludCByb3dzQ291bnQgPSBhdGtfdGFibGVfZ2V0X25fcm93cyhhY2Nlc3NpYmxlKTsKLSAg ICBmb3IgKGludCByb3cgPSAwOyByb3cgPCByb3dzQ291bnQ7ICsrcm93KQotICAgICAgICByb3dI ZWFkZXJzLmFwcGVuZChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpjcmVhdGUoYXRrX3RhYmxlX2dl dF9yb3dfaGVhZGVyKGFjY2Vzc2libGUsIHJvdykpKTsKKyAgICBmb3IgKGludCByb3cgPSAwOyBy b3cgPCByb3dzQ291bnQ7ICsrcm93KSB7CisgICAgICAgIGlmIChBdGtPYmplY3QqIGhlYWRlciA9 IGF0a190YWJsZV9nZXRfcm93X2hlYWRlcihhY2Nlc3NpYmxlLCByb3cpKQorICAgICAgICAgICAg cm93SGVhZGVycy5hcHBlbmQoQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6Y3JlYXRlKGhlYWRlcikp OworICAgIH0KIAogICAgIHJldHVybiByb3dIZWFkZXJzOwogfQogCi1zdGF0aWMgVmVjdG9yPFJl ZlB0cjxBY2Nlc3NpYmlsaXR5VUlFbGVtZW50PiA+IGdldENvbHVtbkhlYWRlcnMoQXRrVGFibGUq IGFjY2Vzc2libGUpCitzdGF0aWMgVmVjdG9yPFJlZlB0cjxBY2Nlc3NpYmlsaXR5VUlFbGVtZW50 PiA+IGdldFRhYmxlQ29sdW1uSGVhZGVycyhBdGtUYWJsZSogYWNjZXNzaWJsZSkKIHsKICAgICBW ZWN0b3I8UmVmUHRyPEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ+ID4gY29sdW1uSGVhZGVyczsKIAog ICAgIGludCBjb2x1bW5zQ291bnQgPSBhdGtfdGFibGVfZ2V0X25fY29sdW1ucyhhY2Nlc3NpYmxl KTsKLSAgICBmb3IgKGludCBjb2x1bW4gPSAwOyBjb2x1bW4gPCBjb2x1bW5zQ291bnQ7ICsrY29s dW1uKQotICAgICAgICBjb2x1bW5IZWFkZXJzLmFwcGVuZChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50 OjpjcmVhdGUoYXRrX3RhYmxlX2dldF9jb2x1bW5faGVhZGVyKGFjY2Vzc2libGUsIGNvbHVtbikp KTsKKyAgICBmb3IgKGludCBjb2x1bW4gPSAwOyBjb2x1bW4gPCBjb2x1bW5zQ291bnQ7ICsrY29s dW1uKSB7CisgICAgICAgIGlmIChBdGtPYmplY3QqIGhlYWRlciA9IGF0a190YWJsZV9nZXRfY29s dW1uX2hlYWRlcihhY2Nlc3NpYmxlLCBjb2x1bW4pKQorICAgICAgICAgICAgY29sdW1uSGVhZGVy cy5hcHBlbmQoQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6Y3JlYXRlKGhlYWRlcikpOworICAgIH0K IAogICAgIHJldHVybiBjb2x1bW5IZWFkZXJzOwogfQpAQCAtMTEzNyw0MCArMTE0MSwzNCBAQCBK U1ZhbHVlUmVmIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnVpRWxlbWVudEFycmF5QXR0cmlidXRl VmFsdWUoSlNTdHJpbmdSZWYgYXR0cgogCiBKU1ZhbHVlUmVmIEFjY2Vzc2liaWxpdHlVSUVsZW1l bnQ6OnJvd0hlYWRlcnMoKSBjb25zdAogewotI2lmIEFUS19DSEVDS19WRVJTSU9OKDIsMTEsOTAp Ci0gICAgaWYgKCFBVEtfSVNfVEFCTEVfQ0VMTChtX2VsZW1lbnQuZ2V0KCkpKQotICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKKyAgICBpZiAoQVRLX0lTX1RBQkxFKG1fZWxlbWVudC5nZXQoKSkpCisg ICAgICAgIHJldHVybiBjb252ZXJ0VG9KU09iamVjdEFycmF5KGdldFRhYmxlUm93SGVhZGVycyhB VEtfVEFCTEUobV9lbGVtZW50LmdldCgpKSkpOwogCi0gICAgR1JlZlB0cjxHUHRyQXJyYXk+IGFy cmF5ID0gYWRvcHRHUmVmKGF0a190YWJsZV9jZWxsX2dldF9yb3dfaGVhZGVyX2NlbGxzKEFUS19U QUJMRV9DRUxMKG1fZWxlbWVudC5nZXQoKSkpKTsKLSAgICBpZiAoIWFycmF5KQotICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKKyAgICBWZWN0b3I8UmVmUHRyPEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ+ PiBoZWFkZXJzOworICAgIGlmICghQVRLX0lTX1RBQkxFX0NFTEwobV9lbGVtZW50LmdldCgpKSkK KyAgICAgICAgcmV0dXJuIGNvbnZlcnRUb0pTT2JqZWN0QXJyYXkoaGVhZGVycyk7CiAKLSAgICBW ZWN0b3I8UmVmUHRyPEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ+PiByb3dzID0gY29udmVydEdQdHJB cnJheVRvVmVjdG9yKGFycmF5LmdldCgpKTsKLSAgICByZXR1cm4gY29udmVydFRvSlNPYmplY3RB cnJheShyb3dzKTsKLSNlbHNlCi0gICAgcmV0dXJuIG51bGxwdHI7CisjaWYgQVRLX0NIRUNLX1ZF UlNJT04oMiwxMSw5MCkKKyAgICBpZiAoR1JlZlB0cjxHUHRyQXJyYXk+IGFycmF5ID0gYWRvcHRH UmVmKGF0a190YWJsZV9jZWxsX2dldF9yb3dfaGVhZGVyX2NlbGxzKEFUS19UQUJMRV9DRUxMKG1f ZWxlbWVudC5nZXQoKSkpKSkKKyAgICAgICAgaGVhZGVycyA9IGNvbnZlcnRHUHRyQXJyYXlUb1Zl Y3RvcihhcnJheS5nZXQoKSk7CiAjZW5kaWYKKyAgICByZXR1cm4gY29udmVydFRvSlNPYmplY3RB cnJheShoZWFkZXJzKTsKIH0KIAogSlNWYWx1ZVJlZiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojpj b2x1bW5IZWFkZXJzKCkgY29uc3QKIHsKLSNpZiBBVEtfQ0hFQ0tfVkVSU0lPTigyLDExLDkwKQot ICAgIGlmICghQVRLX0lTX1RBQkxFX0NFTEwobV9lbGVtZW50LmdldCgpKSAmJiAhQVRLX0lTX1RB QkxFKG1fZWxlbWVudC5nZXQoKSkpCi0gICAgICAgIHJldHVybiBudWxscHRyOworICAgIGlmIChB VEtfSVNfVEFCTEUobV9lbGVtZW50LmdldCgpKSkKKyAgICAgICAgcmV0dXJuIGNvbnZlcnRUb0pT T2JqZWN0QXJyYXkoZ2V0VGFibGVDb2x1bW5IZWFkZXJzKEFUS19UQUJMRShtX2VsZW1lbnQuZ2V0 KCkpKSk7CiAKLSAgICBWZWN0b3I8UmVmUHRyPEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ+PiBjb2x1 bW5zOwotICAgIGlmIChBVEtfSVNfVEFCTEVfQ0VMTChtX2VsZW1lbnQuZ2V0KCkpKSB7Ci0gICAg ICAgIEdSZWZQdHI8R1B0ckFycmF5PiBhcnJheSA9IGFkb3B0R1JlZihhdGtfdGFibGVfY2VsbF9n ZXRfY29sdW1uX2hlYWRlcl9jZWxscyhBVEtfVEFCTEVfQ0VMTChtX2VsZW1lbnQuZ2V0KCkpKSk7 Ci0gICAgICAgIGlmICghYXJyYXkpCi0gICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICBW ZWN0b3I8UmVmUHRyPEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ+PiBoZWFkZXJzOworICAgIGlmICgh QVRLX0lTX1RBQkxFX0NFTEwobV9lbGVtZW50LmdldCgpKSkKKyAgICAgICAgcmV0dXJuIGNvbnZl cnRUb0pTT2JqZWN0QXJyYXkoaGVhZGVycyk7CiAKLSAgICAgICAgY29sdW1ucyA9IGNvbnZlcnRH UHRyQXJyYXlUb1ZlY3RvcihhcnJheS5nZXQoKSk7Ci0gICAgfSBlbHNlCi0gICAgICAgIGNvbHVt bnMgPSBnZXRDb2x1bW5IZWFkZXJzKEFUS19UQUJMRShtX2VsZW1lbnQuZ2V0KCkpKTsKLSAgICBy ZXR1cm4gY29udmVydFRvSlNPYmplY3RBcnJheShjb2x1bW5zKTsKLSNlbHNlCi0gICAgcmV0dXJu IG51bGxwdHI7CisjaWYgQVRLX0NIRUNLX1ZFUlNJT04oMiwxMSw5MCkKKyAgICBpZiAoR1JlZlB0 cjxHUHRyQXJyYXk+IGFycmF5ID0gYWRvcHRHUmVmKGF0a190YWJsZV9jZWxsX2dldF9jb2x1bW5f aGVhZGVyX2NlbGxzKEFUS19UQUJMRV9DRUxMKG1fZWxlbWVudC5nZXQoKSkpKSkKKyAgICAgICAg aGVhZGVycyA9IGNvbnZlcnRHUHRyQXJyYXlUb1ZlY3RvcihhcnJheS5nZXQoKSk7CiAjZW5kaWYK KyAgICByZXR1cm4gY29udmVydFRvSlNPYmplY3RBcnJheShoZWFkZXJzKTsKIH0KIAogUmVmUHRy PEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ+IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnVpRWxlbWVu dEF0dHJpYnV0ZVZhbHVlKEpTU3RyaW5nUmVmIGF0dHJpYnV0ZSkgY29uc3QKQEAgLTE4MjMsNyAr MTgyMSw3IEBAIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50 OjphdHRyaWJ1dGVzT2ZDb2x1bW5IZWFkZXJzKCkKICAgICBpZiAoIUFUS19JU19UQUJMRShtX2Vs ZW1lbnQuZ2V0KCkpKQogICAgICAgICByZXR1cm4gSlNTdHJpbmdDcmVhdGVXaXRoQ2hhcmFjdGVy cygwLCAwKTsKIAotICAgIFZlY3RvcjxSZWZQdHI8QWNjZXNzaWJpbGl0eVVJRWxlbWVudD4gPiBj b2x1bW5IZWFkZXJzID0gZ2V0Q29sdW1uSGVhZGVycyhBVEtfVEFCTEUobV9lbGVtZW50LmdldCgp KSk7CisgICAgVmVjdG9yPFJlZlB0cjxBY2Nlc3NpYmlsaXR5VUlFbGVtZW50PiA+IGNvbHVtbkhl YWRlcnMgPSBnZXRUYWJsZUNvbHVtbkhlYWRlcnMoQVRLX1RBQkxFKG1fZWxlbWVudC5nZXQoKSkp OwogICAgIHJldHVybiBjcmVhdGVTdHJpbmdXaXRoQXR0cmlidXRlcyhjb2x1bW5IZWFkZXJzKTsK IH0KIApAQCAtMTgzMiw3ICsxODMwLDcgQEAgSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+IEFjY2Vz c2liaWxpdHlVSUVsZW1lbnQ6OmF0dHJpYnV0ZXNPZlJvd0hlYWRlcnMoKQogICAgIGlmICghQVRL X0lTX1RBQkxFKG1fZWxlbWVudC5nZXQoKSkpCiAgICAgICAgIHJldHVybiBKU1N0cmluZ0NyZWF0 ZVdpdGhDaGFyYWN0ZXJzKDAsIDApOwogCi0gICAgVmVjdG9yPFJlZlB0cjxBY2Nlc3NpYmlsaXR5 VUlFbGVtZW50PiA+IHJvd0hlYWRlcnMgPSBnZXRSb3dIZWFkZXJzKEFUS19UQUJMRShtX2VsZW1l bnQuZ2V0KCkpKTsKKyAgICBWZWN0b3I8UmVmUHRyPEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ+ID4g cm93SGVhZGVycyA9IGdldFRhYmxlUm93SGVhZGVycyhBVEtfVEFCTEUobV9lbGVtZW50LmdldCgp KSk7CiAgICAgcmV0dXJuIGNyZWF0ZVN0cmluZ1dpdGhBdHRyaWJ1dGVzKHJvd0hlYWRlcnMpOwog fQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggNWNkNTYyMmVhZWNjNjU4ZTYxYjQ2OTQwNzFjYzdhN2E1NWMyMDkyNS4uY2Vk MmEzYWQ0NTA0MjNjMGNhZGIzOTEwMmZhYzE5ODZkZjlhZmJlZSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE3LTExLTE3ICBKb2FubWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKwor ICAgICAgICBBWDogW0FUS10gRml4IFdLVFIncyBtZXRob2RzIGZvciB0ZXN0aW5nIHJvdyBoZWFk ZXIgYW5kIGNvbHVtbiBoZWFkZXIgcHJlc2VuY2UgYW5kIGNvdW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk4MzcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZ3RrL3RhYmxl LWhlYWRlcnMtY291bnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L2d0ay90YWJsZS1oZWFkZXJzLWNvdW50Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRm b3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zOiBSZW1vdmUgYSBjb3VwbGUgb2YgImNyYXNoIiBmYWls dXJlcy4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90YWJsZS1zZWN0aW9u cy1leHBlY3RlZC50eHQ6IFJlbW92ZSBudWxsIG9iamVjdHMuCisKIDIwMTctMTEtMTYgIENvbW1p dCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIyMjQ5MjEuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmls aXR5L2d0ay90YWJsZS1oZWFkZXJzLWNvdW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvZ3RrL3RhYmxlLWhlYWRlcnMtY291bnQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjZkZjcxOWMwMjcyZDdmNGVhYTA5YjY5YWE0ODE4MmZjNDUwNzY0NmIKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2d0ay90YWJsZS1oZWFkZXJzLWNvdW50 LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDQ1IEBACitUaGlzIHZlcmlmaWVzIHJvd0hlYWRlcnMo KSBhbmQgY29sdW1uSGVhZGVycygpIGhhbmRsZXMgdW5leHBlY3RlZCByb2xlcyBhbmQgbGFjayBv ZiBoZWFkZXJzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1Mi IG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworCitUYWJsZSBoZWFk ZXIKK1JvdyBIZWFkZXJzOiAxCisgIEFYUm9sZTogQVhDb2x1bW5IZWFkZXIgQVhWYWx1ZTogUjFD MQorQ29sdW1uIEhlYWRlcnM6IDEKKyAgQVhSb2xlOiBBWENvbHVtbkhlYWRlciBBWFZhbHVlOiBS MUMxCisKK0NhcHRpb24KK1JvdyBIZWFkZXJzOiAwCitDb2x1bW4gSGVhZGVyczogMAorCitSb3cg MQorUm93IEhlYWRlcnM6IDAKK0NvbHVtbiBIZWFkZXJzOiAwCisKK1JvdyAyCitSb3cgSGVhZGVy czogMAorQ29sdW1uIEhlYWRlcnM6IDAKKworSGVhZGVyIGNlbGwKK1JvdyBIZWFkZXJzOiAwCitD b2x1bW4gSGVhZGVyczogMAorCitDZWxsIDEKK1JvdyBIZWFkZXJzOiAxCisgIEFYUm9sZTogQVhD b2x1bW5IZWFkZXIgQVhWYWx1ZTogUjFDMQorQ29sdW1uIEhlYWRlcnM6IDAKKworQ2VsbCAyCitS b3cgSGVhZGVyczogMAorQ29sdW1uIEhlYWRlcnM6IDEKKyAgQVhSb2xlOiBBWENvbHVtbkhlYWRl ciBBWFZhbHVlOiBSMUMxCisKK0NlbGwgMworUm93IEhlYWRlcnM6IDAKK0NvbHVtbiBIZWFkZXJz OiAwCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ndGsvdGFibGUtaGVhZGVycy1j b3VudC5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ndGsvdGFibGUtaGVhZGVycy1j b3VudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjcxYjczZDk2ZWY3MmE2OTU3NmRkMTEyOGEyYWRiMjY2ZDI1 NTQ1ZjkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2d0ay90 YWJsZS1oZWFkZXJzLWNvdW50Lmh0bWwKQEAgLTAsMCArMSw3NyBAQAorPCFET0NUWVBFIEhUTUwg UFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQg c3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor PGJvZHkgaWQ9ImJvZHkiPgorPGRpdiBpZD0iY29udGVudCI+CisgIDx0YWJsZSBpZD0idGFibGUi IGJvcmRlcj0iMSI+CisgICAgPGNhcHRpb24gaWQ9ImNhcHRpb24iPlg8L2NhcHRpb24+CisgICAg PHRyIGlkPSJyb3cxIj48dGggaWQ9ImhlYWRlciI+UjFDMTwvdGg+PHRkIGlkPSJjZWxsMSI+UjFD MjwvdGQ+PC90cj4KKyAgICA8dHIgaWQ9InJvdzIiPjx0ZCBpZD0iY2VsbDIiPlIyQzE8L3RkPjx0 ZCBpZD0iY2VsbDMiPlIyQzI8L3RkPjwvdHI+CisgIDwvdGFibGU+Cis8L2Rpdj4KKzxwIGlkPSJk ZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0PgorICAg IGRlc2NyaXB0aW9uKCJUaGlzIHZlcmlmaWVzIHJvd0hlYWRlcnMoKSBhbmQgY29sdW1uSGVhZGVy cygpIGhhbmRsZXMgdW5leHBlY3RlZCByb2xlcyBhbmQgbGFjayBvZiBoZWFkZXJzLiIpOworICAg IGZ1bmN0aW9uIGVsZW1lbnRJbmZvKGF4RWxlbWVudCkgeworICAgICAgICBpZiAoIWF4RWxlbWVu dCkKKyAgICAgICAgICAgIHJldHVybiAiPG51bGw+IjsKKyAgICAgICAgcmV0dXJuICIgICIgKyBh eEVsZW1lbnQucm9sZSArICIgIiArIGF4RWxlbWVudC5zdHJpbmdWYWx1ZTsKKyAgICB9CisKKyAg ICBmdW5jdGlvbiBoZWFkZXJJbmZvKGF4RWxlbWVudCkgeworICAgICAgICB2YXIgaGVhZGVycyA9 IGF4RWxlbWVudC5yb3dIZWFkZXJzKCk7CisgICAgICAgIGRlYnVnKCJSb3cgSGVhZGVyczogIiAr IGhlYWRlcnMubGVuZ3RoKTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBoZWFkZXJzLmxl bmd0aDsgaSsrKSB7CisgICAgICAgICAgICBkZWJ1ZyhlbGVtZW50SW5mbyhoZWFkZXJzW2ldKSk7 CisgICAgICAgIH0KKworICAgICAgICBoZWFkZXJzID0gYXhFbGVtZW50LmNvbHVtbkhlYWRlcnMo KTsKKyAgICAgICAgZGVidWcoIkNvbHVtbiBIZWFkZXJzOiAiICsgaGVhZGVycy5sZW5ndGgpOwor ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGhlYWRlcnMubGVuZ3RoOyBpKyspIHsKKyAgICAg ICAgICAgIGRlYnVnKGVsZW1lbnRJbmZvKGhlYWRlcnNbaV0pKTsKKyAgICAgICAgfQorICAgIH0K KworICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgIHZh ciBheEVsZW1lbnQgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5 SWQoInRhYmxlIik7CisgICAgICAgICBkZWJ1ZygiXG5UYWJsZSBoZWFkZXIiKTsKKyAgICAgICAg IGhlYWRlckluZm8oYXhFbGVtZW50KTsKKworICAgICAgICAgYXhFbGVtZW50ID0gYWNjZXNzaWJp bGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJjYXB0aW9uIik7CisgICAgICAg ICBkZWJ1ZygiXG5DYXB0aW9uIik7CisgICAgICAgICBoZWFkZXJJbmZvKGF4RWxlbWVudCk7CisK KyAgICAgICAgIGF4RWxlbWVudCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVF bGVtZW50QnlJZCgicm93MSIpOworICAgICAgICAgZGVidWcoIlxuUm93IDEiKTsKKyAgICAgICAg IGhlYWRlckluZm8oYXhFbGVtZW50KTsKKworICAgICAgICAgYXhFbGVtZW50ID0gYWNjZXNzaWJp bGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJyb3cyIik7CisgICAgICAgICBk ZWJ1ZygiXG5Sb3cgMiIpOworICAgICAgICAgaGVhZGVySW5mbyhheEVsZW1lbnQpOworCisgICAg ICAgICBheEVsZW1lbnQgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVu dEJ5SWQoImhlYWRlciIpOworICAgICAgICAgZGVidWcoIlxuSGVhZGVyIGNlbGwiKTsKKyAgICAg ICAgIGhlYWRlckluZm8oYXhFbGVtZW50KTsKKworICAgICAgICAgYXhFbGVtZW50ID0gYWNjZXNz aWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJjZWxsMSIpOworICAgICAg ICAgZGVidWcoIlxuQ2VsbCAxIik7CisgICAgICAgICBoZWFkZXJJbmZvKGF4RWxlbWVudCk7CisK KyAgICAgICAgIGF4RWxlbWVudCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVF bGVtZW50QnlJZCgiY2VsbDIiKTsKKyAgICAgICAgIGRlYnVnKCJcbkNlbGwgMiIpOworICAgICAg ICAgaGVhZGVySW5mbyhheEVsZW1lbnQpOworCisgICAgICAgICBheEVsZW1lbnQgPSBhY2Nlc3Np YmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImNlbGwzIik7CisgICAgICAg ICBkZWJ1ZygiXG5DZWxsIDMiKTsKKyAgICAgICAgIGhlYWRlckluZm8oYXhFbGVtZW50KTsKKwor ICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnRlbnQiKS5zdHlsZS52aXNpYmls aXR5ID0gImhpZGRlbiI7CisgICAgfQorPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVz b3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CisKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYTA2MmVkMTZkOGJm YWJiOGYyMzMwMjFmNmY5NWVlZjg4ZWQzMjFjMi4uZGIxMGFjMDk0MzhhYjI5ZTgwYTcxMGM0NDM0 NGQ0Mjg3YjUyZTQ3NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RF eHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlv bnMKQEAgLTEyODYsOSArMTI4Niw2IEBAIHdlYmtpdC5vcmcvYi8xNzY3OTYgYWNjZXNzaWJpbGl0 eS9ndGsveG1sLXJvbGVzLWV4cG9zZWQuaHRtbCBbIENyYXNoIF0KIAogd2Via2l0Lm9yZy9iLzE3 Njc5NyBhY2Nlc3NpYmlsaXR5L2FyaWEtbGlzdGJveC1uby1zZWxlY3Rpb24uaHRtbCBbIENyYXNo IF0KIAotd2Via2l0Lm9yZy9iLzE3Njc5OCBhY2Nlc3NpYmlsaXR5L2FyaWEtdGFibGVzLmh0bWwg WyBDcmFzaCBdCi13ZWJraXQub3JnL2IvMTc2Nzk4IGFjY2Vzc2liaWxpdHkvdGFibGUtc2VjdGlv bnMuaHRtbCBbIENyYXNoIF0KLQogd2Via2l0Lm9yZy9iLzE3Njc5OSBlZGl0aW5nL2RlbGV0aW5n L2RlbGV0ZS1zdXJyb2dhdGVwYWlyLmh0bWwgWyBDcmFzaCBdCiAKIHdlYmtpdC5vcmcvYi8xNzY4 MDEgZmFzdC9tZWRpYXN0cmVhbS9hcHBseS1jb25zdHJhaW50cy1hdWRpby5odG1sIFsgQ3Jhc2gg XQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvdGFi bGUtc2VjdGlvbnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vz c2liaWxpdHkvdGFibGUtc2VjdGlvbnMtZXhwZWN0ZWQudHh0CmluZGV4IDQxNjM2NmFiMDE3OWU5 YTVkMGRlMGI1ZjQ1NmY0ZjBiNDQ2YTBiMjIuLmJiOGEzZmEzYTNiMzM0OTNkOTdkMjdjMDg1OGMx ZGE1ZWY0OGY0MjAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3Np YmlsaXR5L3RhYmxlLXNlY3Rpb25zLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90YWJsZS1zZWN0aW9ucy1leHBlY3RlZC50eHQKQEAgLTEz NiwyMiArMTM2LDYgQEAgQVhDaGVja2VkOiAwCiBBWFBsYXRmb3JtQXR0cmlidXRlczogY29tcHV0 ZWQtcm9sZTpyb3doZWFkZXIsIHRhZzp0aCwgdG9vbGtpdDpXZWJLaXRHdGsKIC0tLS0tLS0tLS0t LQogCi1BWFBhcmVudDogKG51bGwpCi1BWENoaWxkcmVuOiAwCi1BWFBvc2l0aW9uOiB7IDAuMDAw MDAwLCAwLjAwMDAwMCB9Ci1BWFNpemU6IHsgMC4wMDAwMDAsIDAuMDAwMDAwIH0KLUFYRm9jdXNh YmxlOiAwCi1BWEZvY3VzZWQ6IDAKLUFYU2VsZWN0YWJsZTogMAotQVhTZWxlY3RlZDogMAotQVhN dWx0aVNlbGVjdGFibGU6IDAKLUFYRW5hYmxlZDogMAotQVhFeHBhbmRlZDogMAotQVhSZXF1aXJl ZDogMAotQVhDaGVja2VkOiAwCi1BWFBsYXRmb3JtQXR0cmlidXRlczogCi0tLS0tLS0tLS0tLS0K LQogCiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCkBAIC01MjIsMjIgKzUwNiw2IEBAIEFY Q2hlY2tlZDogMAogQVhQbGF0Zm9ybUF0dHJpYnV0ZXM6IGNvbXB1dGVkLXJvbGU6cm93aGVhZGVy LCB0YWc6dGgsIHRvb2xraXQ6V2ViS2l0R3RrCiAtLS0tLS0tLS0tLS0KIAotQVhQYXJlbnQ6IChu dWxsKQotQVhDaGlsZHJlbjogMAotQVhQb3NpdGlvbjogeyAwLjAwMDAwMCwgMC4wMDAwMDAgfQot QVhTaXplOiB7IDAuMDAwMDAwLCAwLjAwMDAwMCB9Ci1BWEZvY3VzYWJsZTogMAotQVhGb2N1c2Vk OiAwCi1BWFNlbGVjdGFibGU6IDAKLUFYU2VsZWN0ZWQ6IDAKLUFYTXVsdGlTZWxlY3RhYmxlOiAw Ci1BWEVuYWJsZWQ6IDAKLUFYRXhwYW5kZWQ6IDAKLUFYUmVxdWlyZWQ6IDAKLUFYQ2hlY2tlZDog MAotQVhQbGF0Zm9ybUF0dHJpYnV0ZXM6IAotLS0tLS0tLS0tLS0tCi0KIAogLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIAo=