37040 2010-04-02 13:03:59 -0700 AX: need to send selected children change notification when aria-selected changed 2010-04-05 15:15:02 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach abarth bdakin eric webkit.review.bot oldest_to_newest 208022 0 cfleizach 2010-04-02 13:03:59 -0700 when aria-selected changes, webkit should send out the notification 208624 1 52556 cfleizach 2010-04-05 12:10:29 -0700 Created attachment 52556 patch 208635 2 52556 darin 2010-04-05 12:18:44 -0700 Comment on attachment 52556 patch > + bool nodeIsAriaType(Node*, String role); The type should be const String&. If the term for the argument really role, then I'd think you'd want it to be called nodeHasRole rather than nodeIsAriaType. Or nodeHasARIAType. > - if (renderer->isTextControl()) > - return renderer->document()->axObjectCache()->getOrCreate(renderer); > + if (renderer->isTextControl() > + || (renderer->isListBox() || axObjectCache()->nodeIsAriaType(renderer->node(), "listbox"))) > + return axObjectCache()->getOrCreate(renderer); This seems like a pretty strange set of conditions. I think this rule should be implemented with a helper function, just to give you a place to put a comment. And the comment can explain why these three things are special. > + AccessibilityChildrenVector childObjects = children(); > + for (unsigned k = 0, childrenSize = childObjects.size(); k < childrenSize; ++k) { Normally we'd just initialize childrenSize outside the loop. It's neat to have it scoped like this, but clearer written the more-conventional way. 208675 3 cfleizach 2010-04-05 13:42:12 -0700 made changes darin requested http://trac.webkit.org/changeset/57093 208682 4 cfleizach 2010-04-05 14:05:57 -0700 this caused aria-live region to fail on leopard again. it must be something with that test, because it looks like we can't add new tests. i will look at that test now 208684 5 cfleizach 2010-04-05 14:09:07 -0700 why this only fails on leopard release bot is baffling 208689 6 cfleizach 2010-04-05 14:12:45 -0700 disabling this test on leopard for now https://bugs.webkit.org/show_bug.cgi?id=37112 208728 7 webkit.review.bot 2010-04-05 15:13:25 -0700 http://trac.webkit.org/changeset/57093 might have broken Tiger Intel Release 208730 8 abarth 2010-04-05 15:15:02 -0700 > http://trac.webkit.org/changeset/57093 might have broken Tiger Intel Release This is svg/custom/getsvgdocument.html, which has recently become very flaky. I don't think it's related to your change. 52556 2010-04-05 12:10:29 -0700 2010-04-05 12:18:43 -0700 patch patch.txt text/plain 11585 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzA4OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMTAtMDQtMDUgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBCdWcgMzcwNDAgLSBBWDogbmVlZCB0byBzZW5kIHNlbGVjdGVkIGNoaWxkcmVuIGNoYW5nZSBu b3RpZmljYXRpb24gd2hlbiBhcmlhLXNlbGVjdGVkIGNoYW5nZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MDQwCisKKyAgICAgICAgV2hlbiBhcmlh LXNlbGVjdGVkIGlzIGNoYW5nZWQgaW4gdGhlIERPTSwgaXQgd2lsbCB0cmlnZ2VyIGEgc2VsZWN0 ZWQgY2hpbGRyZW4gY2hhbmdlIG5vdGlmaWNhdGlvbi4gCisKKyAgICAgICAgVGVzdDogcGxhdGZv cm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1saXN0Ym94LXNlbGVjdGVkY2hpbGRyZW4tY2hhbmdl Lmh0bWwKKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpzZWxlY3RlZENoaWxkcmVuQ2hhbmdlZCk6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmg6CisgICAgICAgICogYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVkaWFDb250cm9scy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpBY2Nlc3NpYmlsaXR5TWVkaWFDb250cm9sOjpjb250cm9sVHlwZSk6CisgICAgICAgICAgICBS ZW1vdmUgZXh0cmEgd2hpdGVzcGFjZSBiZWZvcmUgY29tbWVudCAod2Via2l0LXN0eWxlKS4KKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6b2JzZXJ2YWJsZU9iamVj dCk6CisgICAgICAgICAgICBBbGxvd2VkIGEgbGlzdEJveCB0byBiZSBhbiBvYnNlcnZhYmxlIG9i amVjdC4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFS b2xlSGFzUHJlc2VudGF0aW9uYWxDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGlzdGJveFNlbGVjdGVkQ2hpbGRyZW4pOgorICAgICAg ICAgICAgVXBkYXRlZCBhbmQgc3RyZWFtbGluZWQgZXhpc3RpbmcgY29kZS4KKyAgICAgICAgKiBk b20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojp1cGRhdGVBZnRlckF0 dHJpYnV0ZUNoYW5nZWQpOgorCiAyMDEwLTA0LTA1ICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlLUNocmlzdGlhbnNl bi4KSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAJKHJldmlzaW9u IDU2OTI5KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zOCw4ICszOCw4IEBACiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eUxpc3RC b3hPcHRpb24uaCIKICNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5TWVkaWFDb250cm9scy5oIgogI2lu Y2x1ZGUgIkFjY2Vzc2liaWxpdHlNZW51TGlzdC5oIgotI2luY2x1ZGUgIkFjY2Vzc2liaWxpdHlN ZW51TGlzdFBvcHVwLmgiCiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uLmgi CisjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuaCIKICNpbmNsdWRlICJBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgiCiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eVNjcm9sbGJh ci5oIgogI2luY2x1ZGUgIkFjY2Vzc2liaWxpdHlTbGlkZXIuaCIKQEAgLTQ0MSw3ICs0NDEsOSBA QCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3ROb3RpZmljYXRpb24oQWNjCiAKIHZvaWQgQVhPYmpl Y3RDYWNoZTo6c2VsZWN0ZWRDaGlsZHJlbkNoYW5nZWQoUmVuZGVyT2JqZWN0KiByZW5kZXJlcikK IHsKLSAgICBwb3N0Tm90aWZpY2F0aW9uKHJlbmRlcmVyLCBBWFNlbGVjdGVkQ2hpbGRyZW5DaGFu Z2VkLCB0cnVlKTsKKyAgICAvLyBwb3N0VG9FbGVtZW50IGlzIGZhbHNlIHNvIHRoYXQgeW91IGNh biBwYXNzIGluIGFueSBjaGlsZCBvZiBhbiBlbGVtZW50IGFuZCBpdCB3aWxsIGdvIHVwIHRoZSBw YXJlbnQgdHJlZQorICAgIC8vIHRvIGZpbmQgdGhlIGNvbnRhaW5lciB3aGljaCBzaG91bGQgc2Vu ZCBvdXQgdGhlIG5vdGlmaWNhdGlvbi4KKyAgICBwb3N0Tm90aWZpY2F0aW9uKHJlbmRlcmVyLCBB WFNlbGVjdGVkQ2hpbGRyZW5DaGFuZ2VkLCBmYWxzZSk7CiB9CiAjZW5kaWYKIApJbmRleDogV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oCShyZXZpc2lvbiA1NjkyOSkKKysrIFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMSw2 ICsxMjEsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBwb3N0Tm90aWZpY2F0aW9uKFJlbmRlck9iamVj dCosIEFYTm90aWZpY2F0aW9uLCBib29sIHBvc3RUb0VsZW1lbnQsIFBvc3RUeXBlID0gUG9zdEFz eW5jaHJvbm91c2x5KTsKICAgICB2b2lkIHBvc3ROb3RpZmljYXRpb24oQWNjZXNzaWJpbGl0eU9i amVjdCosIERvY3VtZW50KiwgQVhOb3RpZmljYXRpb24sIGJvb2wgcG9zdFRvRWxlbWVudCwgUG9z dFR5cGUgPSBQb3N0QXN5bmNocm9ub3VzbHkpOwogCisgICAgYm9vbCBub2RlSXNBcmlhVHlwZShO b2RlKiwgU3RyaW5nIHJvbGUpOworCiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBwb3N0UGxhdGZvcm1O b3RpZmljYXRpb24oQWNjZXNzaWJpbGl0eU9iamVjdCosIEFYTm90aWZpY2F0aW9uKTsKIApAQCAt MTM5LDcgKzE0MSw2IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIEFjY2Vzc2liaWxpdHlPYmplY3Qq IGZvY3VzZWRJbWFnZU1hcFVJRWxlbWVudChIVE1MQXJlYUVsZW1lbnQqKTsKICAgICAKICAgICBB WElEIGdldEFYSUQoQWNjZXNzaWJpbGl0eU9iamVjdCopOwotICAgIGJvb2wgbm9kZUlzQXJpYVR5 cGUoTm9kZSosIFN0cmluZyByb2xlKTsKIH07CiAKICNpZiAhSEFWRShBQ0NFU1NJQklMSVRZKQpJ bmRleDogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lZGlh Q29udHJvbHMuY3BwCShyZXZpc2lvbiA1NjkyOSkKKysrIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5TWVkaWFDb250cm9scy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg5LDcgKzg5 LDcgQEAgUGFzc1JlZlB0cjxBY2Nlc3NpYmlsaXR5T2JqZWN0PiBBY2Nlc3NpYgogTWVkaWFDb250 cm9sRWxlbWVudFR5cGUgQWNjZXNzaWJpbGl0eU1lZGlhQ29udHJvbDo6Y29udHJvbFR5cGUoKSBj b25zdAogewogICAgIGlmICghcmVuZGVyZXIoKSB8fCAhcmVuZGVyZXIoKS0+bm9kZSgpKQotICAg ICAgICByZXR1cm4gTWVkaWFUaW1lbGluZUNvbnRhaW5lcjsgIC8vIFRpbWVsaW5lIGNvbnRhaW5l ciBpcyBub3QgYWNjZXNzaWJsZS4KKyAgICAgICAgcmV0dXJuIE1lZGlhVGltZWxpbmVDb250YWlu ZXI7IC8vIFRpbWVsaW5lIGNvbnRhaW5lciBpcyBub3QgYWNjZXNzaWJsZS4KIAogICAgIE5vZGUq IG5vZGUgPSByZW5kZXJlcigpLT5ub2RlKCk7CiAKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDU2OTI5 KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNjQyLDggKzI2NDIsOSBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0 KiBBY2Nlc3NpYmlsaXR5UmVuZGVyCiBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0OjpvYnNlcnZhYmxlT2JqZWN0KCkgY29uc3QKIHsKICAgICBmb3IgKFJlbmRl ck9iamVjdCogcmVuZGVyZXIgPSBtX3JlbmRlcmVyOyByZW5kZXJlciAmJiByZW5kZXJlci0+bm9k ZSgpOyByZW5kZXJlciA9IHJlbmRlcmVyLT5wYXJlbnQoKSkgewotICAgICAgICBpZiAocmVuZGVy ZXItPmlzVGV4dENvbnRyb2woKSkKLSAgICAgICAgICAgIHJldHVybiByZW5kZXJlci0+ZG9jdW1l bnQoKS0+YXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShyZW5kZXJlcik7CisgICAgICAgIGlm IChyZW5kZXJlci0+aXNUZXh0Q29udHJvbCgpIAorICAgICAgICAgICAgfHwgKHJlbmRlcmVyLT5p c0xpc3RCb3goKSB8fCBheE9iamVjdENhY2hlKCktPm5vZGVJc0FyaWFUeXBlKHJlbmRlcmVyLT5u b2RlKCksICJsaXN0Ym94IikpKQorICAgICAgICAgICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUoKS0+ Z2V0T3JDcmVhdGUocmVuZGVyZXIpOwogICAgIH0KICAgICAKICAgICByZXR1cm4gMDsKQEAgLTI4 MDcsNyArMjgwOCw3IEBAIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYVJvbGUK ICAgICBjYXNlIFNsaWRlclJvbGU6CiAgICAgY2FzZSBJbWFnZVJvbGU6CiAgICAgY2FzZSBQcm9n cmVzc0luZGljYXRvclJvbGU6Ci0gICAgLy9jYXNlIFNlcGFyYXRvclJvbGU6CisgICAgLy8gY2Fz ZSBTZXBhcmF0b3JSb2xlOgogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBkZWZhdWx0OgogICAg ICAgICByZXR1cm4gZmFsc2U7CkBAIC0zMDgzLDMyICszMDg0LDE3IEBAIHZvaWQgQWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdDo6YXJpYVNlbGUKICAgICAKIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6YXJpYUxpc3Rib3hTZWxlY3RlZENoaWxkcmVuKEFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciYgcmVzdWx0KQogewotICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGNoaWxkID0gZmly c3RDaGlsZCgpOwotICAgIAotICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxFbGVt ZW50Kj4ocmVuZGVyZXIoKS0+bm9kZSgpKTsgICAgICAgIAotICAgIGlmICghZWxlbWVudCB8fCAh ZWxlbWVudC0+aXNFbGVtZW50Tm9kZSgpKSAvLyBkbyB0aGlzIGNoZWNrIHRvIGVuc3VyZSBzYWZl dHkgb2Ygc3RhdGljX2Nhc3QgYWJvdmUKLSAgICAgICAgcmV0dXJuOwotCiAgICAgYm9vbCBpc011 bHRpID0gaXNNdWx0aVNlbGVjdGFibGUoKTsKLSAgICAKLSAgICB3aGlsZSAoY2hpbGQpIHsKLSAg ICAgICAgLy8gZXZlcnkgY2hpbGQgc2hvdWxkIGhhdmUgYXJpYS1yb2xlIG9wdGlvbiwgYW5kIGlm IHNvLCBjaGVjayBmb3Igc2VsZWN0ZWQgYXR0cmlidXRlL3N0YXRlCi0gICAgICAgIEFjY2Vzc2li aWxpdHlSb2xlIGFyaWFSb2xlID0gY2hpbGQtPmFyaWFSb2xlQXR0cmlidXRlKCk7Ci0gICAgICAg IFJlbmRlck9iamVjdCogY2hpbGRSZW5kZXJlciA9IDA7Ci0gICAgICAgIGlmIChjaGlsZC0+aXNB Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KCkpCi0gICAgICAgICAgICBjaGlsZFJlbmRlcmVyID0g c3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCo+KGNoaWxkKS0+cmVuZGVyZXIo KTsKLSAgICAgICAgaWYgKGNoaWxkUmVuZGVyZXIgJiYgYXJpYVJvbGUgPT0gTGlzdEJveE9wdGlv blJvbGUpIHsKLSAgICAgICAgICAgIEVsZW1lbnQqIGNoaWxkRWxlbWVudCA9IHN0YXRpY19jYXN0 PEVsZW1lbnQqPihjaGlsZFJlbmRlcmVyLT5ub2RlKCkpOwotICAgICAgICAgICAgaWYgKGNoaWxk RWxlbWVudCAmJiBjaGlsZEVsZW1lbnQtPmlzRWxlbWVudE5vZGUoKSkgeyAvLyBkbyB0aGlzIGNo ZWNrIHRvIGVuc3VyZSBzYWZldHkgb2Ygc3RhdGljX2Nhc3QgYWJvdmUKLSAgICAgICAgICAgICAg ICBTdHJpbmcgc2VsZWN0ZWRBdHRyU3RyaW5nID0gY2hpbGRFbGVtZW50LT5nZXRBdHRyaWJ1dGUo YXJpYV9zZWxlY3RlZEF0dHIpLnN0cmluZygpOwotICAgICAgICAgICAgICAgIGlmIChlcXVhbEln bm9yaW5nQ2FzZShzZWxlY3RlZEF0dHJTdHJpbmcsICJ0cnVlIikpIHsKLSAgICAgICAgICAgICAg ICAgICAgcmVzdWx0LmFwcGVuZChjaGlsZCk7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChpc011 bHRpKQotICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgICAgIH0K LSAgICAgICAgICAgIH0KKworICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBjaGlsZE9i amVjdHMgPSBjaGlsZHJlbigpOworICAgIGZvciAodW5zaWduZWQgayA9IDAsIGNoaWxkcmVuU2l6 ZSA9IGNoaWxkT2JqZWN0cy5zaXplKCk7IGsgPCBjaGlsZHJlblNpemU7ICsraykgeworICAgICAg ICAvLyBFdmVyeSBjaGlsZCBzaG91bGQgaGF2ZSBhcmlhLXJvbGUgb3B0aW9uLCBhbmQgaWYgc28s IGNoZWNrIGZvciBzZWxlY3RlZCBhdHRyaWJ1dGUvc3RhdGUuCisgICAgICAgIEFjY2Vzc2liaWxp dHlPYmplY3QqIGNoaWxkID0gY2hpbGRPYmplY3RzW2tdLmdldCgpOworICAgICAgICBpZiAoY2hp bGQtPmlzU2VsZWN0ZWQoKSAmJiBjaGlsZC0+YXJpYVJvbGVBdHRyaWJ1dGUoKSA9PSBMaXN0Qm94 T3B0aW9uUm9sZSkgeworICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChjaGlsZCk7CisgICAgICAg ICAgICBpZiAoIWlzTXVsdGkpCisgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0g ICAgICAgIGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCk7IAogICAgIH0KIH0KIApJbmRleDog V2ViQ29yZS9kb20vRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vRWxlbWVu dC5jcHAJKHJldmlzaW9uIDU2OTI5KQorKysgV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTY0OCw3ICs2NDgsOCBAQCB2b2lkIEVsZW1lbnQ6OnVwZGF0ZUFmdGVyQXR0 cmlidXRlQ2hhbmdlCiAgICAgfSBlbHNlIGlmIChhdHRyTmFtZSA9PSBhcmlhX2xhYmVsQXR0ciB8 fCBhdHRyTmFtZSA9PSBhcmlhX2xhYmVsZWRieUF0dHIgfHwgYXR0ck5hbWUgPT0gYWx0QXR0ciB8 fCBhdHRyTmFtZSA9PSB0aXRsZUF0dHIpIHsKICAgICAgICAgLy8gSWYgdGhlIGNvbnRlbnQgb2Yg YW4gZWxlbWVudCBjaGFuZ2VzIGR1ZSB0byBhbiBhdHRyaWJ1dGUgY2hhbmdlLCBub3RpZnkgYWNj ZXNzaWJpbGl0eS4KICAgICAgICAgZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5jb250ZW50 Q2hhbmdlZChyZW5kZXJlcigpKTsKLSAgICB9CisgICAgfSBlbHNlIGlmIChhdHRyTmFtZSA9PSBh cmlhX3NlbGVjdGVkQXR0cikKKyAgICAgICAgZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5z ZWxlY3RlZENoaWxkcmVuQ2hhbmdlZChyZW5kZXJlcigpKTsKIH0KICAgICAKIHZvaWQgRWxlbWVu dDo6cmVjYWxjU3R5bGVJZk5lZWRlZEFmdGVyQXR0cmlidXRlQ2hhbmdlZChBdHRyaWJ1dGUqIGF0 dHIpCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1NzA4OCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEwLTA0LTA1ICBDaHJpcyBGbGVpemFj aCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGVzdHMgZm9yCisgICAgICAgIEJ1ZyAzNzA0MCAtIEFYOiBuZWVk IHRvIHNlbmQgc2VsZWN0ZWQgY2hpbGRyZW4gY2hhbmdlIG5vdGlmaWNhdGlvbiB3aGVuIGFyaWEt c2VsZWN0ZWQgY2hhbmdlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzcwNDAKKworICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2Fy aWEtbGlzdGJveC1zZWxlY3RlZGNoaWxkcmVuLWNoYW5nZS1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGlzdGJveC1zZWxlY3Rl ZGNoaWxkcmVuLWNoYW5nZS5odG1sOiBBZGRlZC4KKwogMjAxMC0wNC0wNSAgQWRhbSBCYXJ0aCAg PGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuCkluZGV4OiBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLWxpc3Rib3gtc2VsZWN0ZWRjaGls ZHJlbi1jaGFuZ2UtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRm b3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGlzdGJveC1zZWxlY3RlZGNoaWxkcmVuLWNoYW5n ZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv YWNjZXNzaWJpbGl0eS9hcmlhLWxpc3Rib3gtc2VsZWN0ZWRjaGlsZHJlbi1jaGFuZ2UtZXhwZWN0 ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEzIEBACitPcHRpb24KK09wdGlvbgorT3B0 aW9uCitUaGlzIHRlc3RzIHRoYXQgd2hlbiBhcmlhLXNlbGVjdGVkIGlzIGNoYW5nZWQgaW4gYSBs aXN0Ym94LCB0aGUgY29ycmVjdCBub3RpZmljYXRpb24gaXMgc2VudC4KKworT24gc3VjY2Vzcywg eW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRF U1QgQ09NUExFVEUiLgorCisKK1BBU1MgYWRkZWROb3RpZmljYXRpb24gaXMgdHJ1ZQorUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGlzdGJveC1zZWxlY3RlZGNo aWxkcmVuLWNoYW5nZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21h Yy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGlzdGJveC1zZWxlY3RlZGNoaWxkcmVuLWNoYW5nZS5odG1s CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv YXJpYS1saXN0Ym94LXNlbGVjdGVkY2hpbGRyZW4tY2hhbmdlLmh0bWwJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsNTYgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwv L0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uLy4u Ly4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQ+Cit2YXIg c3VjY2Vzc2Z1bGx5UGFyc2VkID0gZmFsc2U7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8u Li8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+ Cis8Ym9keSBpZD0iYm9keSI+CisKKzxkaXYgcm9sZT0iZ3JvdXAiIHRhYmluZGV4PTAgaWQ9Imxp c3Rib3giIHJvbGU9Imxpc3Rib3giPgorPGRpdiBpZD0ib3B0aW9uMSIgcm9sZT0ib3B0aW9uIiBh cmlhLXNlbGVjdGVkPSJ0cnVlIj5PcHRpb248L2Rpdj4KKzxkaXYgaWQ9Im9wdGlvbjIiIHJvbGU9 Im9wdGlvbiI+T3B0aW9uPC9kaXY+Cis8ZGl2IGlkPSJvcHRpb24zIiByb2xlPSJvcHRpb24iPk9w dGlvbjwvZGl2PgorPC9kaXY+CisKKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0i Y29uc29sZSI+PC9kaXY+CisKKzxzY3JpcHQ+CisKKyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0 cyB0aGF0IHdoZW4gYXJpYS1zZWxlY3RlZCBpcyBjaGFuZ2VkIGluIGEgbGlzdGJveCwgdGhlIGNv cnJlY3Qgbm90aWZpY2F0aW9uIGlzIHNlbnQuIik7CisKKyAgICB2YXIgbm90aWZpY2F0aW9uQ291 bnQgPSAwOworICAgIGZ1bmN0aW9uIGFyaWFDYWxsYmFjayhub3RpZmljYXRpb24pIHsKKyAgICAg ICAgaWYgKG5vdGlmaWNhdGlvbiA9PSAiQVhTZWxlY3RlZENoaWxkcmVuQ2hhbmdlZCIpIHsKKyAg ICAgICAgICAgIG5vdGlmaWNhdGlvbkNvdW50Kys7CisKKyAgICAgICAgICAgIC8vIFdlIHNob3Vs ZCBnZXQgYSB0b3RhbCBvZiA0IGxpdmUgcmVnaW9uIGNoYW5nZXMuCisgICAgICAgICAgICBpZiAo bm90aWZpY2F0aW9uQ291bnQgPT0gMikgeworICAgICAgICAgICAgICAgd2luZG93LmxheW91dFRl c3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAg IH0KKworICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAg d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKworICAgICAgICBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgibGlzdGJveCIpLmZvY3VzKCk7CisgICAgICAgIHZhciBs aXN0Ym94ID0gd2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50Owor CisgICAgICAgIHZhciBhZGRlZE5vdGlmaWNhdGlvbiA9IGxpc3Rib3guYWRkTm90aWZpY2F0aW9u TGlzdGVuZXIoYXJpYUNhbGxiYWNrKTsKKyAgICAgICAgc2hvdWxkQmUoImFkZGVkTm90aWZpY2F0 aW9uIiwgInRydWUiKTsKKworICAgICAgICAvLyBUaGVzZSBzaG91bGQgZWFjaCB0cmlnZ2VyIGEg bm90aWZpY2F0aW9uIHRoYXQgdGhlIHNlbGVjdGVkIGNoaWxkcmVuIGNoYW5nZWQuCisgICAgICAg IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJvcHRpb24yIikuc2V0QXR0cmlidXRlKCJhcmlhLXNl bGVjdGVkIiwgInRydWUiKTsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm9wdGlv bjIiKS5zZXRBdHRyaWJ1dGUoImFyaWEtc2VsZWN0ZWQiLCAiZmFsc2UiKTsKKyAgICB9CisKKyAg ICBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIu Li8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9i b2R5PgorPC9odG1sPgo=