26668 2009-06-23 18:49:51 -0700 AX: need a way to retrieve the language for an element 2009-06-24 16:01:15 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach webkit-unassigned oldest_to_newest 127790 0 cfleizach 2009-06-23 18:49:51 -0700 elements can have the lang attribute or have a meta tag that specifies language accessibility needs to be able to vend this 127955 1 31799 cfleizach 2009-06-24 11:54:27 -0700 Created attachment 31799 patch 127962 2 31799 oliver 2009-06-24 12:13:50 -0700 Comment on attachment 31799 patch r=me It would be great if AX tests could start using the js-test-* style result reporting as they make for much readable test out in browser, report failures nicer, and have a number of functions for testing certain kinds of equality. 127982 3 31799 darin 2009-06-24 13:45:10 -0700 Comment on attachment 31799 patch > + JSRetainPtr<JSStringRef> language(Adopt, toAXElement(thisObject)->language()); Is this adopt really correct? 128006 4 cfleizach 2009-06-24 14:21:54 -0700 i think so. it works, and i copied it from the description() method above 128013 5 cfleizach 2009-06-24 15:15:32 -0700 http://trac.webkit.org/changeset/45109 128022 6 cfleizach 2009-06-24 15:56:00 -0700 fixing windows build in progress 128023 7 cfleizach 2009-06-24 16:01:15 -0700 windows build fix in http://trac.webkit.org/changeset/45112 31799 2009-06-24 11:54:27 -0700 2009-06-24 12:13:50 -0700 patch patch.txt text/plain 11419 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTA4NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMDYtMjQgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBCdWcgMjY2Njg6IEFYOiBuZWVkIGEgd2F5IHRvIHJldHJpZXZlIHRoZSBsYW5ndWFnZSBmb3Ig YW4gZWxlbWVudAorICAgICAgICAKKyAgICAgICAgUHJvdmlkZXMgYSB3YXkgdG8gcmV0cmlldmUg dGhlIGxhbmd1YWdlIGFzc29jaWF0ZWQgd2l0aCBhIHNwZWNpZmljIGFjY2Vzc2liaWxpdHkgZWxl bWVudC4KKworICAgICAgICBUZXN0OiBhY2Nlc3NpYmlsaXR5L2xhbmd1YWdlLWF0dHJpYnV0ZS5o dG1sCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6bGFuZ3VhZ2UpOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oOgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpsYW5ndWFnZSk6CisgICAgICAgICogYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJp bGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW06CisgICAgICAgICgtW0FjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpdKToKKwog MjAwOS0wNi0yNCAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eU9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCShyZXZpc2lvbiA0NTA4NykKKysrIFdlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjk4 LDcgKzI5OCwyMiBAQCBib29sIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnByZXNzKCkgY29uc3QKICAg ICBhY3Rpb25FbGVtLT5hY2Nlc3NLZXlBY3Rpb24odHJ1ZSk7CiAgICAgcmV0dXJuIHRydWU7CiB9 Ci0KKyAgICAKK1N0cmluZyBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpsYW5ndWFnZSgpIGNvbnN0Cit7 CisgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogcGFyZW50ID0gcGFyZW50T2JqZWN0KCk7CisgICAg CisgICAgLy8gYXMgYSBsYXN0IHJlc29ydCwgZmFsbCBiYWNrIHRvIHRoZSBjb250ZW50IGxhbmd1 YWdlIHNwZWNpZmllZCBpbiB0aGUgbWV0YSB0YWcKKyAgICBpZiAoIXBhcmVudCkgeworICAgICAg ICBEb2N1bWVudCogZG9jID0gZG9jdW1lbnQoKTsKKyAgICAgICAgaWYgKGRvYykKKyAgICAgICAg ICAgIHJldHVybiBkb2MtPmNvbnRlbnRMYW5ndWFnZSgpOworICAgICAgICByZXR1cm4gU3RyaW5n KCk7CisgICAgfQorICAgIAorICAgIHJldHVybiBwYXJlbnQtPmxhbmd1YWdlKCk7Cit9CisgICAg CiBBWE9iamVjdENhY2hlKiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpheE9iamVjdENhY2hlKCkgY29u c3QKIHsKICAgICByZXR1cm4gMDsKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuaAkocmV2aXNpb24gNDUwODcpCisrKyBXZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMTEsNyArMzExLDgg QEAgcHVibGljOgogICAgIHZpcnR1YWwgRG9jdW1lbnQqIGRvY3VtZW50KCkgY29uc3QgeyByZXR1 cm4gMDsgfQogICAgIHZpcnR1YWwgRnJhbWVWaWV3KiB0b3BEb2N1bWVudEZyYW1lVmlldygpIGNv bnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIEZyYW1lVmlldyogZG9jdW1lbnRGcmFtZVZp ZXcoKSBjb25zdDsKLQorICAgIHZpcnR1YWwgU3RyaW5nIGxhbmd1YWdlKCkgY29uc3Q7CisgICAg CiAgICAgdm9pZCBzZXRBWE9iamVjdElEKHVuc2lnbmVkKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0 Rm9jdXNlZChib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2VsZWN0ZWRUZXh0KGNvbnN0IFN0 cmluZyYpOwpJbmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gNDUwODcpCisrKyBXZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY1 Niw2ICs2NTYsMjUgQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmhlbHBUZQog ICAgIAogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KKyAgICAKK1N0cmluZyBBY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0OjpsYW5ndWFnZSgpIGNvbnN0Cit7CisgICAgaWYgKCFtX3JlbmRlcmVyKQor ICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgCisgICAgLy8gRGVmZXIgdG8gcGFyZW50IGlm IHRoaXMgZWxlbWVudCBkb2Vzbid0IGhhdmUgYSBsYW5ndWFnZSBzZXQKKyAgICBOb2RlKiBub2Rl ID0gbV9yZW5kZXJlci0+bm9kZSgpOworICAgIGlmICghbm9kZSkKKyAgICAgICAgcmV0dXJuIEFj Y2Vzc2liaWxpdHlPYmplY3Q6Omxhbmd1YWdlKCk7CisgICAgCisgICAgaWYgKCFub2RlLT5pc0Vs ZW1lbnROb2RlKCkpCisgICAgICAgIHJldHVybiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpsYW5ndWFn ZSgpOworICAgIAorICAgIFN0cmluZyBsYW5ndWFnZSA9IHN0YXRpY19jYXN0PEVsZW1lbnQqPihu b2RlKS0+Z2V0QXR0cmlidXRlKGxhbmdBdHRyKTsKKyAgICBpZiAobGFuZ3VhZ2UuaXNFbXB0eSgp KQorICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eU9iamVjdDo6bGFuZ3VhZ2UoKTsKKyAgICBy ZXR1cm4gbGFuZ3VhZ2U7Cit9CiAKIFN0cmluZyBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0 ZXh0VW5kZXJFbGVtZW50KCkgY29uc3QKIHsKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAkocmV2aXNpb24gNDUwODcpCisrKyBX ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCSh3b3JraW5n IGNvcHkpCkBAIC0xNzcsNiArMTc3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgV2lkZ2V0KiB3 aWRnZXRGb3JBdHRhY2htZW50VmlldygpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBnZXREb2N1 bWVudExpbmtzKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYpOwogICAgIHZpcnR1YWwgRnJh bWVWaWV3KiBkb2N1bWVudEZyYW1lVmlldygpIGNvbnN0OworICAgIHZpcnR1YWwgU3RyaW5nIGxh bmd1YWdlKCkgY29uc3Q7CiAgICAgCiAgICAgdmlydHVhbCBjb25zdCBBY2Nlc3NpYmlsaXR5Q2hp bGRyZW5WZWN0b3ImIGNoaWxkcmVuKCk7CiAgICAgCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxp dHkvbWFjL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9tYWMvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIubW0JKHJldmlz aW9uIDQ1MDg3KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMTExLDYgKzExMSwxMCBAQCB1c2luZyBu YW1lc3BhY2Ugc3RkOwogI2RlZmluZSBOU0FjY2Vzc2liaWxpdHlBY2Nlc3NLZXlBdHRyaWJ1dGUg QCJBWEFjY2Vzc0tleSIKICNlbmRpZgogCisjaWZuZGVmIE5TQWNjZXNzaWJpbGl0eUxhbmd1YWdl QXR0cmlidXRlCisjZGVmaW5lIE5TQWNjZXNzaWJpbGl0eUxhbmd1YWdlQXR0cmlidXRlIEAiQVhM YW5ndWFnZSIKKyNlbmRpZgorCiAjaWZkZWYgQlVJTERJTkdfT05fVElHRVIKIHR5cGVkZWYgdW5z aWduZWQgTlNVSW50ZWdlcjsKICNlbmRpZgpAQCAtMTQ1Miw2ICsxNDU2LDkgQEAgc3RhdGljIE5T U3RyaW5nKiByb2xlVmFsdWVUb05TU3RyaW5nKEFjYwogICAgICAgICByZXR1cm4gbmlsOwogICAg IH0KICAgICAKKyAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNz aWJpbGl0eUxhbmd1YWdlQXR0cmlidXRlXSkgCisgICAgICAgIHJldHVybiBtX29iamVjdC0+bGFu Z3VhZ2UoKTsKKyAgICAKICAgICByZXR1cm4gbmlsOwogfQogCkluZGV4OiBXZWJLaXRUb29scy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA0 NTA4NykKKysrIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE3IEBACisyMDA5LTA2LTI0ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDI2 NjY4OiBBWDogbmVlZCBhIHdheSB0byByZXRyaWV2ZSB0aGUgbGFuZ3VhZ2UgZm9yIGFuIGVsZW1l bnQKKyAgICAgICAgU3VwcG9ydCBhYmlsaXR5IHRvIHJldHJpZXZlIEFYTGFuZ3VhZ2UgZm9yIHRl c3RpbmcKKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQu Y3BwOgorICAgICAgICAoZ2V0TGFuZ3VhZ2VDYWxsYmFjayk6CisgICAgICAgIChBY2Nlc3NpYmls aXR5VUlFbGVtZW50OjpnZXRKU0NsYXNzKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9BY2Nl c3NpYmlsaXR5VUlFbGVtZW50Lmg6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0FjY2Vz c2liaWxpdHlVSUVsZW1lbnRNYWMubW06CisgICAgICAgIChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50 OjpsYW5ndWFnZSk6CisKIDIwMDktMDYtMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hY2llaiBTdGFjaG93aWFrLgpJbmRleDogV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5j cHAJKHJldmlzaW9uIDQ1MDg3KQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNz aWJpbGl0eVVJRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzNyw2ICsyMzcsMTIgQEAg c3RhdGljIEpTVmFsdWVSZWYgZ2V0RGVzY3JpcHRpb25DYWxsYmFjawogICAgIHJldHVybiBKU1Zh bHVlTWFrZVN0cmluZyhjb250ZXh0LCBkZXNjcmlwdGlvbi5nZXQoKSk7CiB9CiAKK3N0YXRpYyBK U1ZhbHVlUmVmIGdldExhbmd1YWdlQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2Jq ZWN0UmVmIHRoaXNPYmplY3QsIEpTU3RyaW5nUmVmIHByb3BlcnR5TmFtZSwgSlNWYWx1ZVJlZiog ZXhjZXB0aW9uKQoreworICAgIEpTUmV0YWluUHRyPEpTU3RyaW5nUmVmPiBsYW5ndWFnZShBZG9w dCwgdG9BWEVsZW1lbnQodGhpc09iamVjdCktPmxhbmd1YWdlKCkpOworICAgIHJldHVybiBKU1Zh bHVlTWFrZVN0cmluZyhjb250ZXh0LCBsYW5ndWFnZS5nZXQoKSk7Cit9CisKIHN0YXRpYyBKU1Zh bHVlUmVmIGdldENoaWxkcmVuQ291bnRDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNP YmplY3RSZWYgdGhpc09iamVjdCwgSlNTdHJpbmdSZWYgcHJvcGVydHlOYW1lLCBKU1ZhbHVlUmVm KiBleGNlcHRpb24pCiB7CiAgICAgcmV0dXJuIEpTVmFsdWVNYWtlTnVtYmVyKGNvbnRleHQsIHRv QVhFbGVtZW50KHRoaXNPYmplY3QpLT5jaGlsZHJlbkNvdW50KCkpOwpAQCAtMzEzLDYgKzMxOSw3 IEBAIEpTQ2xhc3NSZWYgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6Z2V0SlMKICAgICAgICAgeyAi cm9sZSIsIGdldFJvbGVDYWxsYmFjaywgMCwga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8 IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJ0aXRsZSIsIGdl dFRpdGxlQ2FsbGJhY2ssIDAsIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9w ZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAiZGVzY3JpcHRpb24iLCBnZXRE ZXNjcmlwdGlvbkNhbGxiYWNrLCAwLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pT UHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCisgICAgICAgIHsgImxhbmd1YWdlIiwgZ2V0 TGFuZ3VhZ2VDYWxsYmFjaywgMCwga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1By b3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJ4IiwgZ2V0WENhbGxiYWNr LCAwLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVE b250RGVsZXRlIH0sCiAgICAgICAgIHsgInkiLCBnZXRZQ2FsbGJhY2ssIDAsIGtKU1Byb3BlcnR5 QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAg ICAgICAgeyAid2lkdGgiLCBnZXRXaWR0aENhbGxiYWNrLCAwLCBrSlNQcm9wZXJ0eUF0dHJpYnV0 ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCkluZGV4OiBXZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5o CShyZXZpc2lvbiA0NTA4NykKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0FjY2Vzc2li aWxpdHlVSUVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtODEsNiArODEsNyBAQCBwdWJsaWM6 CiAgICAgSlNTdHJpbmdSZWYgcm9sZSgpOwogICAgIEpTU3RyaW5nUmVmIHRpdGxlKCk7CiAgICAg SlNTdHJpbmdSZWYgZGVzY3JpcHRpb24oKTsKKyAgICBKU1N0cmluZ1JlZiBsYW5ndWFnZSgpOwog ICAgIGRvdWJsZSB4KCk7CiAgICAgZG91YmxlIHkoKTsKICAgICBkb3VibGUgd2lkdGgoKTsKSW5k ZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50 TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9BY2Nl c3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCShyZXZpc2lvbiA0NTA4NykKKysrIFdlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCSh3b3JraW5n IGNvcHkpCkBAIC0zMTgsNiArMzE4LDEyIEBAIEpTU3RyaW5nUmVmIEFjY2Vzc2liaWxpdHlVSUVs ZW1lbnQ6OmRlc2MKICAgICByZXR1cm4gY29uY2F0ZW5hdGVBdHRyaWJ1dGVBbmRWYWx1ZShAIkFY RGVzY3JpcHRpb24iLCBkZXNjcmlwdGlvbik7CiB9CiAKK0pTU3RyaW5nUmVmIEFjY2Vzc2liaWxp dHlVSUVsZW1lbnQ6Omxhbmd1YWdlKCkKK3sKKyAgICBpZCBkZXNjcmlwdGlvbiA9IGRlc2NyaXB0 aW9uT2ZWYWx1ZShbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpAIkFYTGFu Z3VhZ2UiXSwgbV9lbGVtZW50KTsKKyAgICByZXR1cm4gY29uY2F0ZW5hdGVBdHRyaWJ1dGVBbmRW YWx1ZShAIkFYTGFuZ3VhZ2UiLCBkZXNjcmlwdGlvbik7Cit9CisKIGRvdWJsZSBBY2Nlc3NpYmls aXR5VUlFbGVtZW50Ojp4KCkKIHsKICAgICBOU1ZhbHVlKiBwb3NpdGlvblZhbHVlID0gW21fZWxl bWVudCBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6TlNBY2Nlc3NpYmlsaXR5UG9zaXRpb25B dHRyaWJ1dGVdOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDUwODcpCisrKyBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAorMjAwOS0wNi0yNCAgQ2hyaXMg RmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3RzIGZvciBCdWcgMjY2Njg6IEFYOiBuZWVkIGEg d2F5IHRvIHJldHJpZXZlIHRoZSBsYW5ndWFnZSBmb3IgYW4gZWxlbWVudC4KKworICAgICAgICAq IGFjY2Vzc2liaWxpdHkvbGFuZ3VhZ2UtYXR0cmlidXRlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9sYW5ndWFnZS1hdHRyaWJ1dGUuaHRtbDogQWRkZWQuCisK IDIwMDktMDYtMjQgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKERpc2FibGluZyBmYWlsaW5nIHRlc3QhKS4KSW5kZXg6IExheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvbGFuZ3VhZ2UtYXR0cmlidXRlLWV4cGVjdGVkLnR4dAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2xhbmd1YWdlLWF0dHJpYnV0ZS1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2xh bmd1YWdlLWF0dHJpYnV0ZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNyBA QAorY2hlZXJpbworZ2VybWFubmlzaAorCitlbHZpc2gKKworYW5kIG1vcmUgZW5nbGlzaAorUGFz c2VkCkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2xhbmd1YWdlLWF0dHJpYnV0ZS5o dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbGFuZ3VhZ2UtYXR0 cmlidXRlLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2xh bmd1YWdlLWF0dHJpYnV0ZS5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQ0IEBACis8aHRt bD4KKzxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAg ICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworPC9zY3JpcHQ+Cis8aGVhZD4K KzxtZXRhIGh0dHAtZXF1aXY9ImNvbnRlbnQtbGFuZ3VhZ2UiIGNvbnRlbnQ9ImVuLWdiIj4gCis8 Ym9keSBpZD0iYm9keSI+CisKKyAgICA8IS0tIFRoaXMgdGVzdHMgdGhlIGFiaWxpdHkgdG8gZ2V0 IHRoZSBjb250ZW50IGxhbmd1YWdlIGZvciB2YXJpb3VzIGVsZW1lbnRzIHVzaW5nIHZhcmlvdXMg dGVjaG5pcXVlcyAtLT4KKworICAgIGNoZWVyaW8KKyAgICAKKyAgICA8cCBsYW5nPSJkZSI+Z2Vy bWFubmlzaDwvcD4KKyAgICA8cCBsYW5nPSJqYSI+ZWx2aXNoPC9wPgorCisgICAgYW5kIG1vcmUg ZW5nbGlzaAorCisgICAgPGRpdiBpZD0icmVzdWx0Ij48L2Rpdj4KKyAgICAKKyAgICA8c2NyaXB0 PgorICAgICAgICBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgICAg ICAgICB2YXIgYm9keSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJib2R5Iik7CisgICAgICAg ICAgICBib2R5LmZvY3VzKCk7CisgICAgICAgICAgICB2YXIgd2ViQXJlYSA9IGFjY2Vzc2liaWxp dHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50OworICAgICAgICAgICAgdmFyIHJlc3VsdCA9IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJyZXN1bHQiKTsKKworICAgICAgICAgICAgdmFyIHRleHQx ID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMCkuY2hpbGRBdEluZGV4KDApOworICAgICAgICAgICAg dmFyIHRleHQyID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMSkuY2hpbGRBdEluZGV4KDApOworICAg ICAgICAgICAgdmFyIHRleHQzID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMikuY2hpbGRBdEluZGV4 KDApOworICAgICAgICAgICAgdmFyIHRleHQ0ID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMykuY2hp bGRBdEluZGV4KDApOworCisgICAgICAgICAgICBpZiAoIHdlYkFyZWEubGFuZ3VhZ2UgPT0gIkFY TGFuZ3VhZ2U6IGVuLWdiIiAmJiB0ZXh0MS5sYW5ndWFnZSA9PSAiQVhMYW5ndWFnZTogZW4tZ2Ii ICYmIAorICAgICAgICAgICAgICAgICB0ZXh0Mi5sYW5ndWFnZSA9PSAiQVhMYW5ndWFnZTogZGUi ICYmIHRleHQzLmxhbmd1YWdlID09ICJBWExhbmd1YWdlOiBqYSIgJiYgCisgICAgICAgICAgICAg ICAgIHRleHQ0Lmxhbmd1YWdlID09ICJBWExhbmd1YWdlOiBlbi1nYiIpIHsKKyAgICAgICAgICAg ICAgIHJlc3VsdC5pbm5lclRleHQgPSAiUGFzc2VkIjsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIGVsc2UgeyAKKyAgICAgICAgICAgICAgIHJlc3VsdC5pbm5lclRleHQgPSAiRmFpbGVkLiBD b3VsZCBub3QgZmluZCBBWExhbmd1YWdlczogIiArIHdlYkFyZWEubGFuZ3VhZ2UgKyAiIC0gIiAr IHRleHQxLmxhbmd1YWdlOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgPC9zY3JpcHQ+ Cis8L2JvZHk+Cis8L2h0bWw+Cg==