130037 2014-03-10 14:05:16 -0700 Web Inspector: Feature check for accessibility support before using it (DOMAgent.getAccessibilityPropertiesForNode) 2014-03-13 02:05:36 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 129779 129943 129952 1 joepeck joepeck graouts jcraig joepeck timothy webkit-bug-importer oldest_to_newest 989046 0 joepeck 2014-03-10 14:05:16 -0700 DOMAgent.getAccessibilityPropertiesForNode won't exist on iOS 6 and 7 remote inspector backends. It looks like our frontend will add UI and unconditionally ask for accessibility information. This will throw an exception inspecting an iOS 6 or iOS 7 device and cause issues. I think Views/DOMNodeDetailsSidebarPanel.js should add an "_accessibilitySupported() { return !!DOMAgent.getAccessibilityPropertiesForNode; }" function, and only add the UI / refresh accessibility when it is supported. 989867 1 joepeck 2014-03-12 17:07:39 -0700 Yep: Inspecting an iOS 6 device with ToT I see: [Error] TypeError: undefined is not a function (evaluating 'DOMAgent.getAccessibilityPropertiesForNode(this.id, accessibilityPropertiesCallback.bind(this))') accessibilityProperties (DOMNode.js, line 467) refreshAX (DOMNodeDetailsSidebarPanel.js, line 377) refresh (DOMNodeDetailsSidebarPanel.js, line 101) shown (DetailsSidebarPanel.js, line 60) selectedSidebarPanel (Sidebar.js, line 148) _contentBrowserRepresentedObjectsDidChange (Main.js, line 1124) dispatch (Object.js, line 180) dispatchEventToListeners (Object.js, line 187) _dispatchCurrentRepresentedObjectsDidChangeEvent (ContentBrowser.js, line 461) (anonymous function) ([native code], line 0) 989868 2 226561 joepeck 2014-03-12 17:09:44 -0700 Created attachment 226561 [PATCH] Proposed Fix 989882 3 joepeck 2014-03-12 17:35:59 -0700 <http://trac.webkit.org/changeset/165517> 226561 2014-03-12 17:09:44 -0700 2014-03-12 17:15:30 -0700 [PATCH] Proposed Fix ax.patch text/plain 7930 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNkODUxYzkuLjczOTIxOTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDE0LTAzLTEyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRmVhdHVy ZSBjaGVjayBmb3IgYWNjZXNzaWJpbGl0eSBzdXBwb3J0IGJlZm9yZSB1c2luZyBpdCAoRE9NQWdl bnQuZ2V0QWNjZXNzaWJpbGl0eVByb3BlcnRpZXNGb3JOb2RlKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMDM3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRmVhdHVyZSBkZXRlY3QgaWYgYWNjZXNzaWJp bGl0eSBpbmZvcm1hdGlvbiBpcyBzdXBwb3J0ZWQgYmVmb3JlCisgICAgICAgIGNyZWF0aW5nIG9y IGF0dGVtcHRpbmcgdG8gdXBkYXRlIHRoZSBhY2Nlc3NpYmlsaXR5IHNlY3Rpb24uCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX2Fj Y2Vzc2liaWxpdHlTdXBwb3J0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTU5vZGVEZXRh aWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fcmVmcmVzaEFjY2Vzc2liaWxpdHkpOgorCisyMDE0 LTAzLTEyICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAg V2ViIEluc3BlY3RvcjogRml4IG11bHRpcGxlIGNvbnNvbGUuYXNzZXJ0IHN0cmlwcGluZyBpc3N1 ZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDE2 NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCmluZGV4IDY4 NDYzYTIuLmVkZmJhMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RPTU5vZGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTU5vZGVEZXRhaWxzU2lkZWJhclBh bmVsLmpzCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTMsIDIwMTQgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC01MSwyNyArNTEsMzAgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGVEZXRhaWxzU2lkZWJh clBhbmVsID0gZnVuY3Rpb24oKSB7CiAgICAgdGhpcy5fZXZlbnRMaXN0ZW5lcnNTZWN0aW9uR3Jv dXAgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uR3JvdXA7CiAgICAgdmFyIGV2ZW50 TGlzdGVuZXJzU2VjdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb24oImRvbS1u b2RlLWV2ZW50LWxpc3RlbmVycyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRXZlbnQgTGlzdGVu ZXJzIiksIFt0aGlzLl9ldmVudExpc3RlbmVyc1NlY3Rpb25Hcm91cF0pOyAgICAKIAotICAgIHRo aXMuX2FjY2Vzc2liaWxpdHlFbXB0eVJvdyA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rp b25Sb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJObyBBY2Nlc3NpYmlsaXR5IEluZm9ybWF0aW9u IikpOwotICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlOb2RlQ2hlY2tlZFJvdyA9IG5ldyBXZWJJbnNw ZWN0b3IuRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDaGVj a2VkIikpOwotICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlOb2RlRGlzYWJsZWRSb3cgPSBuZXcgV2Vi SW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uU2ltcGxlUm93KFdlYkluc3BlY3Rvci5VSVN0cmluZygi RGlzYWJsZWQiKSk7Ci0gICAgdGhpcy5fYWNjZXNzaWJpbGl0eU5vZGVFeHBhbmRlZFJvdyA9IG5l dyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3coV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJFeHBhbmRlZCIpKTsKLSAgICB0aGlzLl9hY2Nlc3NpYmlsaXR5Tm9kZUlnbm9yZWRSb3cg PSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uU2ltcGxlUm93KFdlYkluc3BlY3Rvci5V SVN0cmluZygiSWdub3JlZCIpKTsKLSAgICB0aGlzLl9hY2Nlc3NpYmlsaXR5Tm9kZUludmFsaWRS b3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uU2ltcGxlUm93KFdlYkluc3BlY3Rv ci5VSVN0cmluZygiSW52YWxpZCIpKTsKLSAgICB0aGlzLl9hY2Nlc3NpYmlsaXR5Tm9kZUxhYmVs Um93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblNpbXBsZVJvdyhXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkxhYmVsIikpOwotICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlOb2RlUHJlc3Nl ZFJvdyA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3coV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJQcmVzc2VkIikpOwotICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlOb2RlUmVh ZG9ubHlSb3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uU2ltcGxlUm93KFdlYklu c3BlY3Rvci5VSVN0cmluZygiUmVhZG9ubHkiKSk7Ci0gICAgdGhpcy5fYWNjZXNzaWJpbGl0eU5v ZGVSZXF1aXJlZFJvdyA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3co V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXF1aXJlZCIpKTsKLSAgICB0aGlzLl9hY2Nlc3NpYmls aXR5Tm9kZVJvbGVSb3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uU2ltcGxlUm93 KFdlYkluc3BlY3Rvci5VSVN0cmluZygiUm9sZSIpKTsKLSAgICB0aGlzLl9hY2Nlc3NpYmlsaXR5 Tm9kZVNlbGVjdGVkUm93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblNpbXBsZVJv dyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlbGVjdGVkIikpOwotICAgIAotICAgIHRoaXMuX2Fj Y2Vzc2liaWxpdHlHcm91cCA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25Hcm91cChb dGhpcy5fYWNjZXNzaWJpbGl0eUVtcHR5Um93XSk7Ci0gICAgdmFyIGFjY2Vzc2liaWxpdHlTZWN0 aW9uID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbigiZG9tLW5vZGUtYWNjZXNzaWJp bGl0eSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQWNjZXNzaWJpbGl0eSIpLCBbdGhpcy5fYWNj ZXNzaWJpbGl0eUdyb3VwXSk7ICAgIAotICAgIAogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGls ZChpZGVudGl0eVNlY3Rpb24uZWxlbWVudCk7CiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxk KGF0dHJpYnV0ZXNTZWN0aW9uLmVsZW1lbnQpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGls ZChwcm9wZXJ0aWVzU2VjdGlvbi5lbGVtZW50KTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hp bGQoZXZlbnRMaXN0ZW5lcnNTZWN0aW9uLmVsZW1lbnQpOwotICAgIHRoaXMuZWxlbWVudC5hcHBl bmRDaGlsZChhY2Nlc3NpYmlsaXR5U2VjdGlvbi5lbGVtZW50KTsKKworICAgIGlmICh0aGlzLl9h Y2Nlc3NpYmlsaXR5U3VwcG9ydGVkKCkpIHsKKyAgICAgICAgdGhpcy5fYWNjZXNzaWJpbGl0eUVt cHR5Um93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdyhXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIk5vIEFjY2Vzc2liaWxpdHkgSW5mb3JtYXRpb24iKSk7CisgICAgICAgIHRoaXMu X2FjY2Vzc2liaWxpdHlOb2RlQ2hlY2tlZFJvdyA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1Nl Y3Rpb25TaW1wbGVSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDaGVja2VkIikpOworICAgICAg ICB0aGlzLl9hY2Nlc3NpYmlsaXR5Tm9kZURpc2FibGVkUm93ID0gbmV3IFdlYkluc3BlY3Rvci5E ZXRhaWxzU2VjdGlvblNpbXBsZVJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRpc2FibGVkIikp OworICAgICAgICB0aGlzLl9hY2Nlc3NpYmlsaXR5Tm9kZUV4cGFuZGVkUm93ID0gbmV3IFdlYklu c3BlY3Rvci5EZXRhaWxzU2VjdGlvblNpbXBsZVJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkV4 cGFuZGVkIikpOworICAgICAgICB0aGlzLl9hY2Nlc3NpYmlsaXR5Tm9kZUlnbm9yZWRSb3cgPSBu ZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uU2ltcGxlUm93KFdlYkluc3BlY3Rvci5VSVN0 cmluZygiSWdub3JlZCIpKTsKKyAgICAgICAgdGhpcy5fYWNjZXNzaWJpbGl0eU5vZGVJbnZhbGlk Um93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblNpbXBsZVJvdyhXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkludmFsaWQiKSk7CisgICAgICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlOb2Rl TGFiZWxSb3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uU2ltcGxlUm93KFdlYklu c3BlY3Rvci5VSVN0cmluZygiTGFiZWwiKSk7CisgICAgICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlO b2RlUHJlc3NlZFJvdyA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3co V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcmVzc2VkIikpOworICAgICAgICB0aGlzLl9hY2Nlc3Np YmlsaXR5Tm9kZVJlYWRvbmx5Um93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblNp bXBsZVJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlYWRvbmx5IikpOworICAgICAgICB0aGlz Ll9hY2Nlc3NpYmlsaXR5Tm9kZVJlcXVpcmVkUm93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxz U2VjdGlvblNpbXBsZVJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlcXVpcmVkIikpOworICAg ICAgICB0aGlzLl9hY2Nlc3NpYmlsaXR5Tm9kZVJvbGVSb3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRl dGFpbHNTZWN0aW9uU2ltcGxlUm93KFdlYkluc3BlY3Rvci5VSVN0cmluZygiUm9sZSIpKTsKKyAg ICAgICAgdGhpcy5fYWNjZXNzaWJpbGl0eU5vZGVTZWxlY3RlZFJvdyA9IG5ldyBXZWJJbnNwZWN0 b3IuRGV0YWlsc1NlY3Rpb25TaW1wbGVSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3Rl ZCIpKTsKKyAgICAKKyAgICAgICAgdGhpcy5fYWNjZXNzaWJpbGl0eUdyb3VwID0gbmV3IFdlYklu c3BlY3Rvci5EZXRhaWxzU2VjdGlvbkdyb3VwKFt0aGlzLl9hY2Nlc3NpYmlsaXR5RW1wdHlSb3dd KTsKKyAgICAgICAgdmFyIGFjY2Vzc2liaWxpdHlTZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5E ZXRhaWxzU2VjdGlvbigiZG9tLW5vZGUtYWNjZXNzaWJpbGl0eSIsIFdlYkluc3BlY3Rvci5VSVN0 cmluZygiQWNjZXNzaWJpbGl0eSIpLCBbdGhpcy5fYWNjZXNzaWJpbGl0eUdyb3VwXSk7ICAgIAor CisgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChhY2Nlc3NpYmlsaXR5U2VjdGlvbi5l bGVtZW50KTsKKyAgICB9CiB9OwogCiBXZWJJbnNwZWN0b3IuRE9NTm9kZURldGFpbHNTaWRlYmFy UGFuZWwuU3R5bGVDbGFzc05hbWUgPSAiZG9tLW5vZGUiOwpAQCAtMTAwLDYgKzEwMywxMSBAQCBX ZWJJbnNwZWN0b3IuRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogCiAg ICAgLy8gUHJpdmF0ZQogCisgICAgX2FjY2Vzc2liaWxpdHlTdXBwb3J0ZWQ6IGZ1bmN0aW9uKCkK KyAgICB7CisgICAgICAgIHJldHVybiAhIURPTUFnZW50LmdldEFjY2Vzc2liaWxpdHlQcm9wZXJ0 aWVzRm9yTm9kZTsKKyAgICB9LAorCiAgICAgX3JlZnJlc2hBdHRyaWJ1dGVzOiBmdW5jdGlvbigp CiAgICAgewogICAgICAgICB0aGlzLl9hdHRyaWJ1dGVzRGF0YUdyaWRSb3cuZGF0YUdyaWQgPSB0 aGlzLl9jcmVhdGVBdHRyaWJ1dGVzRGF0YUdyaWQoKTsKQEAgLTI0MSw4ICsyNDksNyBAQCBXZWJJ bnNwZWN0b3IuRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogICAgICAg ICB9CiAgICAgfSwKIAotICAgIF9yZWZyZXNoQWNjZXNzaWJpbGl0eTogKGZ1bmN0aW9uKCl7Ci0K KyAgICBfcmVmcmVzaEFjY2Vzc2liaWxpdHk6IChmdW5jdGlvbigpIHsKICAgICAgICAgdmFyIHBy b3BlcnRpZXMgPSB7fTsKICAgICAgICAgdmFyIGRvbU5vZGU7CiAKQEAgLTI2Myw3ICsyNzAsNiBA QCBXZWJJbnNwZWN0b3IuRE9NTm9kZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gYWNjZXNzaWJpbGl0eVByb3BlcnRpZXNDYWxs YmFjayhhY2Nlc3NpYmlsaXR5UHJvcGVydGllcykgewotCiAgICAgICAgICAgICBpZiAodGhpcy5k b21Ob2RlICE9PSBkb21Ob2RlKQogICAgICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMzMyLDcg KzMzOCw2IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5 cGUgPSB7CiAKICAgICAgICAgICAgICAgICAvLyBEaXNwbGF5IG9yZGVyLCBub3QgYWxwaGFiZXRp Y2FsIGFzIGFib3ZlLgogICAgICAgICAgICAgICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlHcm91cC5y b3dzID0gWwotCiAgICAgICAgICAgICAgICAgICAgIC8vIEdsb2JhbCBwcm9wZXJ0aWVzIGZvciBh bGwgZWxlbWVudHMuCiAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlOb2Rl SWdub3JlZFJvdywKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWNjZXNzaWJpbGl0eU5vZGVS b2xlUm93LApAQCAtMzQ5LDcgKzM1NCw2IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlRGV0YWlsc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgIHRoaXMuX2FjY2Vz c2liaWxpdHlOb2RlUHJlc3NlZFJvdywKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWNjZXNz aWJpbGl0eU5vZGVSZWFkb25seVJvdywKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWNjZXNz aWJpbGl0eU5vZGVTZWxlY3RlZFJvdwotCiAgICAgICAgICAgICAgICAgXTsKIAogICAgICAgICAg ICAgICAgIHRoaXMuX2FjY2Vzc2liaWxpdHlFbXB0eVJvdy5oaWRlRW1wdHlNZXNzYWdlKCk7CkBA IC0zNjEsMTAgKzM2NSwxNCBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZURldGFpbHNTaWRlYmFyUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gcmVmcmVzaEFY KCkgeworICAgICAgICAgICAgaWYgKCF0aGlzLl9hY2Nlc3NpYmlsaXR5U3VwcG9ydGVkKCkpCisg ICAgICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgICAgICAvLyBNYWtlIHN1cmUgdGhlIGRv bU5vZGUgaXMgYXZhaWxhYmxlIGluIHRoZSBjbG9zdXJlIHNjb3BlLgogICAgICAgICAgICAgZG9t Tm9kZSA9IHRoaXMuZG9tTm9kZTsKICAgICAgICAgICAgIGlmICghZG9tTm9kZSkKICAgICAgICAg ICAgICAgICByZXR1cm47CisKICAgICAgICAgICAgIGRvbU5vZGUuYWNjZXNzaWJpbGl0eVByb3Bl cnRpZXMoYWNjZXNzaWJpbGl0eVByb3BlcnRpZXNDYWxsYmFjay5iaW5kKHRoaXMpKTsKICAgICAg ICAgfQogCg==