125783 2013-12-16 09:17:29 -0800 AX: WebKit not sending AXMenuClosed notification 2013-12-18 10:49:27 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach aboxhall apinheiro commit-queue dmazzoni jcraig jdiggs mario samuel_white webkit-bug-importer oldest_to_newest 960081 0 cfleizach 2013-12-16 09:17:29 -0800 AXMenuClosedNotification https://dvcs.w3.org/hg/pfwg/raw-file/default/ARIA-UAIG/1.0/tests/test-files/test96.html 960082 1 cfleizach 2013-12-16 09:17:42 -0800 <rdar://problem/15668928> 960860 2 219510 cfleizach 2013-12-18 00:05:23 -0800 Created attachment 219510 patch 960892 3 219510 mario 2013-12-18 04:03:46 -0800 Comment on attachment 219510 patch View in context: https://bugs.webkit.org/attachment.cgi?id=219510&action=review > Source/WebCore/accessibility/AccessibilityObject.cpp:95 > + // Menu close events need to notify the platform. No element is used in the notification because it's a destruction event. > + if (detachmentType == ElementDestroyed && roleValue() == MenuRole && cache) > + cache->postNotification(nullptr, &cache->document(), AXObjectCache::AXMenuClosed); Would it be possible to use AccessibilityObject::document() here, so you would not need to add AXObjectCache::document()? Also, would it be possible to use AccessibilityObject::axObjectCache(), instead of having to add that new first parameter to AccessibilityObject::detach()? I guess the answer is that it's probably too late here to get the document (and hence the AXObjectCache out of it) from the AccessibilityObject that is being detached, but I have to ask anyway :) If that's the case, maybe it would be cleaner to swap the arguments in detach() and add a default value for the cache, so we have something like void detach(AccessibilityDetachmentType, AXObjectCache* axObjectCache = nullptr) that allows you to omit that "mysterious" nullptr parameter when not using ElementDestroyed as the "detachment type" 960912 4 cfleizach 2013-12-18 05:48:33 -0800 (In reply to comment #3) > (From update of attachment 219510 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=219510&action=review > > > Source/WebCore/accessibility/AccessibilityObject.cpp:95 > > + // Menu close events need to notify the platform. No element is used in the notification because it's a destruction event. > > + if (detachmentType == ElementDestroyed && roleValue() == MenuRole && cache) > > + cache->postNotification(nullptr, &cache->document(), AXObjectCache::AXMenuClosed); > > Would it be possible to use AccessibilityObject::document() here, so you would not need to add AXObjectCache::document()? > > Also, would it be possible to use AccessibilityObject::axObjectCache(), instead of having to add that new first parameter to AccessibilityObject::detach()? > > I guess the answer is that it's probably too late here to get the document (and hence the AXObjectCache out of it) from the AccessibilityObject that is being detached, but I have to ask anyway :) Correct > > If that's the case, maybe it would be cleaner to swap the arguments in detach() and add a default value for the cache, so we have something like void detach(AccessibilityDetachmentType, AXObjectCache* axObjectCache = nullptr) that allows you to omit that "mysterious" nullptr parameter when not using ElementDestroyed as the "detachment type" Yep. No problem 960931 5 219510 mario 2013-12-18 07:45:53 -0800 Comment on attachment 219510 patch (In reply to comment #4) > [...] > > If that's the case, maybe it would be cleaner to swap the arguments in detach() and add a default value for the cache, so we have something like void detach(AccessibilityDetachmentType, AXObjectCache* axObjectCache = nullptr) that allows you to omit that "mysterious" nullptr parameter when not using ElementDestroyed as the "detachment type" > > Yep. No problem Thanks for the confirmation. Setting r+ now 961002 6 cfleizach 2013-12-18 10:49:27 -0800 https://trac.webkit.org/changeset/160778 219510 2013-12-18 00:05:23 -0800 2013-12-18 07:45:53 -0800 patch patch text/plain 12907 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDc1NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEzLTEyLTE4ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFdlYktpdCBub3Qg c2VuZGluZyBBWE1lbnVDbG9zZWQgbm90aWZpY2F0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU3ODMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGFuIG9iamVjdCB3aXRoIGEgcm9sZT1tZW51 IGlzIHJlbW92ZWQsIHdlIG5lZWQgdG8gc2VuZCBvdXQgYSBub3RpZmljYXRpb24gaW5mb3JtaW5n IHRoYXQgdGhlIG1lbnUgaGFzIGNsb3NlZC4KKyAgICAgICAgVGhpcyBtZWFucyBkZXRlY3Rpbmcg dGhlIHJpZ2h0IGtpbmQgb2YgZGVzdHJ1Y3Rpb24gZXZlbnQgZm9yIGFuIGVsZW1lbnQsIGJlY2F1 c2Ugd2UgZG8gbm90IHdhbnQgdG8gCisgICAgICAgIHNlbmQgdGhpcyBub3RpZmljYXRpb24gd2hl biB0aGUgZW50aXJlIGNhY2hlIGlzIGJlaW5nIHRvcm4gZG93bi4KKworICAgICAgICBUZXN0OiBw bGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLW1lbnUtY2xvc2VkLW5vdGlmaWNhdGlvbi5o dG1sCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6fkFYT2JqZWN0Q2FjaGUpOgorICAgICAgICAoV2Vi Q29yZTo6QVhPYmplY3RDYWNoZTo6cmVtb3ZlKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FY T2JqZWN0Q2FjaGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmRvY3VtZW50 KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpkZXRhY2gpOgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuaDoKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6ZGV0YWNoKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6ZGV0YWNoKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlSZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlT Y3JvbGxWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3 OjpkZXRhY2gpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZp ZXcuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1tOgor ICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9u KToKKwogMjAxMy0xMi0xNyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTVNFXSBQZXJpb2RpY2FsbHkgbW9uaXRvciBzb3VyY2UgYnVmZmVycy4KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAkocmV2aXNp b24gMTYwNzEzKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIyLDcgKzEyMiw3IEBACiAgICAgZm9yIChIYXNoTWFw PEFYSUQsIFJlZlB0cjxBY2Nlc3NpYmlsaXR5T2JqZWN0Pj46Oml0ZXJhdG9yIGl0ID0gbV9vYmpl Y3RzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewogICAgICAgICBBY2Nlc3NpYmlsaXR5T2Jq ZWN0KiBvYmogPSAoKml0KS52YWx1ZS5nZXQoKTsKICAgICAgICAgZGV0YWNoV3JhcHBlcihvYmop OwotICAgICAgICBvYmotPmRldGFjaCgpOworICAgICAgICBvYmotPmRldGFjaChudWxscHRyLCBD YWNoZURlc3Ryb3llZCk7CiAgICAgICAgIHJlbW92ZUFYSUQob2JqKTsKICAgICB9CiB9CkBAIC00 OTQsNyArNDk0LDcgQEAKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIGRldGFjaFdyYXBwZXIo b2JqKTsKLSAgICBvYmotPmRldGFjaCgpOworICAgIG9iai0+ZGV0YWNoKHRoaXMsIEVsZW1lbnRE ZXN0cm95ZWQpOwogICAgIHJlbW92ZUFYSUQob2JqKTsKICAgICAKICAgICAvLyBmaW5hbGx5IHJl bW92ZSB0aGUgb2JqZWN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2Jq ZWN0Q2FjaGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FY T2JqZWN0Q2FjaGUuaAkocmV2aXNpb24gMTYwNzEzKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BWE9iamVjdENhY2hlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2OSw2ICsxNjksNyBA QAogICAgICAgICBBWExpdmVSZWdpb25DaGFuZ2VkLAogICAgICAgICBBWE1lbnVMaXN0SXRlbVNl bGVjdGVkLAogICAgICAgICBBWE1lbnVMaXN0VmFsdWVDaGFuZ2VkLAorICAgICAgICBBWE1lbnVD bG9zZWQsCiAgICAgICAgIEFYUm93Q291bnRDaGFuZ2VkLAogICAgICAgICBBWFJvd0NvbGxhcHNl ZCwKICAgICAgICAgQVhSb3dFeHBhbmRlZCwKQEAgLTIwNiw2ICsyMDcsOCBAQAogCiAgICAgQVhD b21wdXRlZE9iamVjdEF0dHJpYnV0ZUNhY2hlKiBjb21wdXRlZE9iamVjdEF0dHJpYnV0ZUNhY2hl KCkgeyByZXR1cm4gbV9jb21wdXRlZE9iamVjdEF0dHJpYnV0ZUNhY2hlLmdldCgpOyB9CiAKKyAg ICBEb2N1bWVudCYgZG9jdW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2RvY3VtZW50OyB9CisgICAg CiBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24oQWNjZXNzaWJp bGl0eU9iamVjdCosIEFYTm90aWZpY2F0aW9uKTsKICAgICB2b2lkIG5vZGVUZXh0Q2hhbmdlUGxh dGZvcm1Ob3RpZmljYXRpb24oQWNjZXNzaWJpbGl0eU9iamVjdCosIEFYVGV4dENoYW5nZSwgdW5z aWduZWQgb2Zmc2V0LCBjb25zdCBTdHJpbmcmKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCShyZXZp c2lvbiAxNjA3MTMpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlOb2RlT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIwLDEwICsxMjAsMTAgQEAKICAg ICByZXR1cm4gYWRvcHRSZWYobmV3IEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0KG5vZGUpKTsKIH0K IAotdm9pZCBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6ZGV0YWNoKCkKK3ZvaWQgQWNjZXNzaWJp bGl0eU5vZGVPYmplY3Q6OmRldGFjaChBWE9iamVjdENhY2hlKiBjYWNoZSwgQWNjZXNzaWJpbGl0 eURldGFjaG1lbnRUeXBlIGRldGFjaG1lbnRUeXBlKQogewotICAgIGNsZWFyQ2hpbGRyZW4oKTsK LSAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpkZXRhY2goKTsKKyAgICAvLyBBY2Nlc3NpYmlsaXR5 T2JqZWN0IGNhbGxzIGNsZWFyQ2hpbGRyZW4uCisgICAgQWNjZXNzaWJpbGl0eU9iamVjdDo6ZGV0 YWNoKGNhY2hlLCBkZXRhY2htZW50VHlwZSk7CiAgICAgbV9ub2RlID0gMDsKIH0KIApJbmRleDog U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5v ZGVPYmplY3QuaAkocmV2aXNpb24gMTYwNzEzKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDQsNyAr MTQ0LDcgQEAKICAgICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlPYmplY3QqIHBhcmVudE9iamVjdCgp IGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogcGFyZW50 T2JqZWN0SWZFeGlzdHMoKSBjb25zdCBPVkVSUklERTsKIAotICAgIHZpcnR1YWwgdm9pZCBkZXRh Y2goKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGV0YWNoKEFYT2JqZWN0Q2FjaGUqLCBB Y2Nlc3NpYmlsaXR5RGV0YWNobWVudFR5cGUpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBj aGlsZHJlbkNoYW5nZWQoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQWNjZXNz aWJpbGl0eVJvbGUoKSBPVkVSUklERTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCShyZXZpc2lvbiAxNjA3MTMp CisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC04OCw4ICs4OCwxMiBAQAogICAgIEFTU0VSVChpc0RldGFjaGVk KCkpOwogfQogCi12b2lkIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmRldGFjaCgpCit2b2lkIEFjY2Vz c2liaWxpdHlPYmplY3Q6OmRldGFjaChBWE9iamVjdENhY2hlKiBjYWNoZSwgQWNjZXNzaWJpbGl0 eURldGFjaG1lbnRUeXBlIGRldGFjaG1lbnRUeXBlKQogeworICAgIC8vIE1lbnUgY2xvc2UgZXZl bnRzIG5lZWQgdG8gbm90aWZ5IHRoZSBwbGF0Zm9ybS4gTm8gZWxlbWVudCBpcyB1c2VkIGluIHRo ZSBub3RpZmljYXRpb24gYmVjYXVzZSBpdCdzIGEgZGVzdHJ1Y3Rpb24gZXZlbnQuCisgICAgaWYg KGRldGFjaG1lbnRUeXBlID09IEVsZW1lbnREZXN0cm95ZWQgJiYgcm9sZVZhbHVlKCkgPT0gTWVu dVJvbGUgJiYgY2FjaGUpCisgICAgICAgIGNhY2hlLT5wb3N0Tm90aWZpY2F0aW9uKG51bGxwdHIs ICZjYWNoZS0+ZG9jdW1lbnQoKSwgQVhPYmplY3RDYWNoZTo6QVhNZW51Q2xvc2VkKTsKKyAgICAK ICAgICAvLyBDbGVhciBhbnkgY2hpbGRyZW4gYW5kIGNhbGwgZGV0YWNoRnJvbVBhcmVudCBvbiB0 aGVtIHNvIHRoYXQKICAgICAvLyBubyBjaGlsZHJlbiBhcmUgbGVmdCB3aXRoIGRhbmdsaW5nIHBv aW50ZXJzIHRvIHRoZWlyIHBhcmVudC4KICAgICBjbGVhckNoaWxkcmVuKCk7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAko cmV2aXNpb24gMTYwNzEzKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTM1MSw2ICszNTEsOCBAQAogICAgICwg dmlzaWJsZU9ubHkodmlzaWJsZU9ubHkpCiAgICAgeyB9CiB9OworICAgIAorZW51bSBBY2Nlc3Np YmlsaXR5RGV0YWNobWVudFR5cGUgeyBDYWNoZURlc3Ryb3llZCwgRWxlbWVudERlc3Ryb3llZCB9 OwogCiBzdHJ1Y3QgVmlzaWJsZVBvc2l0aW9uUmFuZ2UgewogCkBAIC00MDAsNyArNDAyLDcgQEAK IAogICAgIC8vIFdoZW4gdGhlIGNvcnJlc3BvbmRpbmcgV2ViQ29yZSBvYmplY3QgdGhhdCB0aGlz IEFjY2Vzc2liaWxpdHlPYmplY3QKICAgICAvLyB3cmFwcyBpcyBkZWxldGVkLCBpdCBtdXN0IGJl IGRldGFjaGVkLgotICAgIHZpcnR1YWwgdm9pZCBkZXRhY2goKTsKKyAgICB2aXJ0dWFsIHZvaWQg ZGV0YWNoKEFYT2JqZWN0Q2FjaGUqLCBBY2Nlc3NpYmlsaXR5RGV0YWNobWVudFR5cGUpOwogICAg IHZpcnR1YWwgYm9vbCBpc0RldGFjaGVkKCkgY29uc3Q7CiAKICAgICB0eXBlZGVmIFZlY3RvcjxS ZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4+IEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvcjsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gMTYwNzEzKQorKysgU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTMxLDkgKzEzMSw5IEBACiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0KHJlbmRlcmVyKSk7CiB9CiAKLXZvaWQgQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6ZGV0YWNoKCkKK3ZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 ZGV0YWNoKEFYT2JqZWN0Q2FjaGUqIGNhY2hlLCBBY2Nlc3NpYmlsaXR5RGV0YWNobWVudFR5cGUg ZGV0YWNobWVudFR5cGUpCiB7Ci0gICAgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmRldGFjaCgp OworICAgIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0OjpkZXRhY2goY2FjaGUsIGRldGFjaG1lbnRU eXBlKTsKICAgICAKICAgICBkZXRhY2hSZW1vdGVTVkdSb290KCk7CiAgICAgCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3QuaAkocmV2aXNpb24gMTYwNzEzKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2MSw3 ICsxNjEsNyBAQAogICAgIHZpcnR1YWwgdm9pZCBzZXRTZWxlY3RlZFJvd3MoQWNjZXNzaWJpbGl0 eUNoaWxkcmVuVmVjdG9yJikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T3Jp ZW50YXRpb24gb3JpZW50YXRpb24oKSBjb25zdCBPVkVSUklERTsKICAgICAKLSAgICB2aXJ0dWFs IHZvaWQgZGV0YWNoKCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGRldGFjaChBWE9iamVj dENhY2hlKiwgQWNjZXNzaWJpbGl0eURldGFjaG1lbnRUeXBlKSBPVkVSUklERTsKICAgICB2aXJ0 dWFsIHZvaWQgdGV4dENoYW5nZWQoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hp bGRyZW4oKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJvb2wgY2FuSGF2ZUNoaWxkcmVuKCkgY29u c3QgT1ZFUlJJREU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlTY3JvbGxWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmNwcAkocmV2aXNpb24gMTYwNzEzKQorKysg U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQ4LDkgKzQ4LDkgQEAKICAgICBBU1NFUlQoaXNEZXRhY2hlZCgp KTsKIH0KIAotdm9pZCBBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldzo6ZGV0YWNoKCkKK3ZvaWQgQWNj ZXNzaWJpbGl0eVNjcm9sbFZpZXc6OmRldGFjaChBWE9iamVjdENhY2hlKiBjYWNoZSwgQWNjZXNz aWJpbGl0eURldGFjaG1lbnRUeXBlIGRldGFjaG1lbnRUeXBlKQogewotICAgIEFjY2Vzc2liaWxp dHlPYmplY3Q6OmRldGFjaCgpOworICAgIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmRldGFjaChjYWNo ZSwgZGV0YWNobWVudFR5cGUpOwogICAgIG1fc2Nyb2xsVmlldyA9IDA7CiB9CiAKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTY3Jv bGxWaWV3LmgJKHJldmlzaW9uIDE2MDcxMykKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEs NyBAQAogICAgIFNjcm9sbFZpZXcqIHNjcm9sbFZpZXcoKSBjb25zdCB7IHJldHVybiBtX3Njcm9s bFZpZXc7IH0KIAogICAgIHZpcnR1YWwgfkFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3KCk7Ci0gICAg dmlydHVhbCB2b2lkIGRldGFjaCgpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBkZXRhY2go QVhPYmplY3RDYWNoZSosIEFjY2Vzc2liaWxpdHlEZXRhY2htZW50VHlwZSkgT1ZFUlJJREU7CiAK IHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIFNjcm9sbGFibGVBcmVhKiBnZXRTY3JvbGxhYmxlQXJl YUlmU2Nyb2xsYWJsZSgpIGNvbnN0IE9WRVJSSURFOwpJbmRleDogU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1tCShyZXZpc2lvbiAx NjA3MTMpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hl TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMTgsNiArMTE4LDkgQEAKICAgICAgICAgY2FzZSBB WEVsZW1lbnRCdXN5Q2hhbmdlZDoKICAgICAgICAgICAgIG1hY05vdGlmaWNhdGlvbiA9IEAiQVhF bGVtZW50QnVzeUNoYW5nZWQiOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQVhN ZW51Q2xvc2VkOgorICAgICAgICAgICAgbWFjTm90aWZpY2F0aW9uID0gKGlkKWtBWE1lbnVDbG9z ZWROb3RpZmljYXRpb247CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBBWENoZWNr ZWRTdGF0ZUNoYW5nZWQ6CiAgICAgICAgICAgICAvLyBEb2VzIG5vdCBleGlzdCBvbiBNYWMuCiAg ICAgICAgIGRlZmF1bHQ6CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjA3NTUpCisrKyBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0xMi0xOCAg Q2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBXZWJL aXQgbm90IHNlbmRpbmcgQVhNZW51Q2xvc2VkIG5vdGlmaWNhdGlvbgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NzgzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJp bGl0eS9hcmlhLW1lbnUtY2xvc2VkLW5vdGlmaWNhdGlvbi1leHBlY3RlZC50eHQ6IEFkZGVkLgor ICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtbWVudS1jbG9zZWQtbm90 aWZpY2F0aW9uLmh0bWw6IEFkZGVkLgorCiAyMDEzLTEyLTE3ICBKZXIgTm9ibGUgIDxqZXIubm9i bGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtNU0VdIFBlcmlvZGljYWxseSBtb25pdG9yIHNvdXJj ZSBidWZmZXJzLgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv YXJpYS1tZW51LWNsb3NlZC1ub3RpZmljYXRpb24tZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtbWVudS1jbG9zZWQt bm90aWZpY2F0aW9uLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtbWVudS1jbG9zZWQtbm90aWZpY2F0aW9uLWV4 cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDExIEBACitUaGlzIHRlc3RzIHRo YXQgYW4gQVhNZW51Q2xvc2VkIG5vdGlmaWNhdGlvbiBnZXRzIGZpcmVkIHdoZW4gYW4gQVJJQSBt ZW51IHBvcHVwIGNsb3Nlcy4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9m ICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1Mg YWRkZWROb3RpZmljYXRpb24gaXMgdHJ1ZQorUmVjZWl2ZWQgbWVudSBjbG9zZWQgbm90aWZpY2F0 aW9uOiBBWE1lbnVDbG9zZWQKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVT VCBDT01QTEVURQorCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0 eS9hcmlhLW1lbnUtY2xvc2VkLW5vdGlmaWNhdGlvbi5odG1sCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtbWVudS1jbG9zZWQtbm90aWZp Y2F0aW9uLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNj ZXNzaWJpbGl0eS9hcmlhLW1lbnUtY2xvc2VkLW5vdGlmaWNhdGlvbi5odG1sCSh3b3JraW5nIGNv cHkpCkBAIC0wLDAgKzEsNDkgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFRE IEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3Vy Y2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5Ij4K KworPGRpdiBpZD0ibWVudSIgcm9sZT0ibWVudSI+CisgICAgPGRpdiByb2xlPSJtZW51aXRlbSIg aWQ9Iml0ZW0xIiB0YWJpbmRleD0iMCI+TWVudSBpdGVtIDE8L2Rpdj4KKyAgICA8ZGl2IHJvbGU9 Im1lbnVpdGVtIiBpZD0iaXRlbTIiIHRhYmluZGV4PSIwIj5NZW51IGl0ZW0gMjwvZGl2PgorPC9k aXY+CisKKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+ CisKKzxzY3JpcHQ+CisKKyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyB0aGF0IGFuIEFYTWVu dUNsb3NlZCBub3RpZmljYXRpb24gZ2V0cyBmaXJlZCB3aGVuIGFuIEFSSUEgbWVudSBwb3B1cCBj bG9zZXMuIik7CisKKyAgICBmdW5jdGlvbiBoaWRlTWVudSgpIHsKKyAgICAgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoIm1lbnUiKS5zdHlsZS5kaXNwbGF5ID0gIm5vbmUiOworICAgIH0KKwor ICAgIHZhciB3ZWJBcmVhID0gMDsKKyAgICBmdW5jdGlvbiBhcmlhQ2FsbGJhY2sobm90aWZpY2F0 aW9uKSB7CisgICAgICAgIGlmIChub3RpZmljYXRpb24gPT0gIkFYTWVudUNsb3NlZCIpIHsKKyAg ICAgICAgICAgZGVidWcoIlJlY2VpdmVkIG1lbnUgY2xvc2VkIG5vdGlmaWNhdGlvbjogIiArIG5v dGlmaWNhdGlvbik7CisgICAgICAgICAgIHdlYkFyZWEucmVtb3ZlTm90aWZpY2F0aW9uTGlzdGVu ZXIoKTsKKyAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgIH0KKyAgICB9CisKKyAg ICBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgICAgIHdpbmRvdy5q c1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKworICAgICAgICB3ZWJBcmVhID0gYWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIucm9vdEVsZW1lbnQuY2hpbGRBdEluZGV4KDApOworICAgICAgICB2YXIgbWVudSA9 IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgibWVudSIpOwor CisgICAgICAgIHZhciBhZGRlZE5vdGlmaWNhdGlvbiA9IHdlYkFyZWEuYWRkTm90aWZpY2F0aW9u TGlzdGVuZXIoYXJpYUNhbGxiYWNrKTsKKyAgICAgICAgc2hvdWxkQmUoImFkZGVkTm90aWZpY2F0 aW9uIiwgInRydWUiKTsKKworICAgICAgICBoaWRlTWVudSgpOyAKKyAgICB9CisKKzwvc2NyaXB0 PgorCis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9z Y3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==