144112 2015-04-23 12:22:19 -0700 Web Inspector: Make Console work in a tab world 2015-04-25 18:36:17 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 timothy timothy graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1087923 0 timothy 2015-04-23 12:22:19 -0700 Make split console and a console tab work. 1087924 1 251466 timothy 2015-04-23 12:24:22 -0700 Created attachment 251466 Patch 1087988 2 251466 joepeck 2015-04-23 14:03:19 -0700 Comment on attachment 251466 Patch r=me 1088648 3 timothy 2015-04-25 18:36:17 -0700 r183322 – r183342 http://trac.webkit.org/log/?revs=183322-183342 251466 2015-04-23 12:24:22 -0700 2015-04-23 14:03:19 -0700 Patch bug-144112-20150423122318.patch text/plain 21228 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi MjFhY2E5MzUwZDhjMWExOWUyYWRhNmY2Nzc1MmNkOTk4MTU2MmEyLi5hM2U2YTk3OTBjNzAzNzcw NDQ1NTQ0NmI2ZTUwNzM0NjFjYTQ1MDVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NCBAQAogMjAxNS0wNC0yMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSBDb25zb2xlIHdvcmsgaW4gYSB0YWIg d29ybGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NDExMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuY29udGVu dExvYWRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuaXNTaG93aW5nQ29uc29sZVRhYik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVUlTdHJpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnRv Z2dsZU5hdmlnYXRpb25TaWRlYmFyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci50b2dnbGVEZXRh aWxzU2lkZWJhcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IudGFiQ29udGVudFZpZXdDbGFzc0Zv clJlcHJlc2VudGVkT2JqZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5saW5raWZ5U3RyaW5n QXNGcmFnbWVudCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9JbWFnZXMvQ29uc29sZS5zdmc6 IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yRnJvbnRl bmRBUEkuanM6CisgICAgICAgIChJbnNwZWN0b3JGcm9udGVuZEFQSS5zaG93Q29uc29sZSk6Cisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlVGFiQ29udGVudFZpZXcuanM6IEFk ZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVUYWJDb250ZW50Vmlldyk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5zaG93bik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5z aG93UmVwcmVzZW50ZWRPYmplY3QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVUYWJD b250ZW50Vmlldy5wcm90b3R5cGUuY2FuU2hvd1JlcHJlc2VudGVkT2JqZWN0KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Db25zb2xlVGFiQ29udGVudFZpZXcucHJvdG90eXBlLmdldCBzdXBwb3J0 c1NwbGl0Q29udGVudEJyb3dzZXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGVm YXVsdERhc2hib2FyZFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVmYXVsdERhc2hi b2FyZFZpZXcucHJvdG90eXBlLl9jb25zb2xlSXRlbVdhc0NsaWNrZWQpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuTG9nQ29udGVudFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3 LnByb3RvdHlwZS5nZXQgbmF2aWdhdGlvbkl0ZW1zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5M b2dDb250ZW50Vmlldy5wcm90b3R5cGUuc2hvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxv Z0NvbnRlbnRWaWV3LnByb3RvdHlwZS5kaWRBcHBlbmRDb25zb2xlTWVzc2FnZVZpZXcpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fc2hvd0NvbnNvbGVU YWIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTG9nSWNvbi5jc3M6CisgICAgICAg ICgubG9nLWljb24gLmljb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTWFpbi5j c3M6CisgICAgICAgICgjc3BsaXQtY29udGVudC1icm93c2VyIC5oaWVyYXJjaGljYWwtcGF0aC1j b21wb25lbnQubG9nLWljb24gLmljb24pOgorICAgICAgICAoI3NwbGl0LWNvbnRlbnQtYnJvd3Nl ciAuaGllcmFyY2hpY2FsLXBhdGgtY29tcG9uZW50LmxvZy1pY29uIC50aXRsZSk6CisgICAgICAg ICgjc3BsaXQtY29udGVudC1icm93c2VyIC5oaWVyYXJjaGljYWwtcGF0aC1jb21wb25lbnQubG9n LWljb24gc2VsZWN0KToKKworMjAxNS0wNC0yMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBh cHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSBzaG93aW5nIGEgY29udGVu dCB2aWV3IHdvcmsgaW4gdGhlIHRhYiB3b3JsZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0MTEwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCA5ZmFkMjdiMDY4NDQ4ODM3NDk3NWZi ZGZkMzIxNTUzN2VmYWE1YjZmLi41ZWFmMTAzNWE2YTY1MDFiYTczYTNiMjVlZjMyOTg1MDk2Y2I0 ZWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNl L01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9N YWluLmpzCkBAIC0yMjcsNyArMjI3LDcgQEAgV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQgPSBm dW5jdGlvbigpCiAKICAgICB0aGlzLl9jb25zb2xlUmVwcmVzZW50ZWRPYmplY3QgPSBuZXcgV2Vi SW5zcGVjdG9yLkxvZ09iamVjdDsKICAgICB0aGlzLl9jb25zb2xlVHJlZUVsZW1lbnQgPSBuZXcg V2ViSW5zcGVjdG9yLkxvZ1RyZWVFbGVtZW50KHRoaXMuX2NvbnNvbGVSZXByZXNlbnRlZE9iamVj dCk7Ci0gICAgdGhpcy5jb25zb2xlQ29udGVudFZpZXcgPSBXZWJJbnNwZWN0b3IuY29udGVudEJy b3dzZXIuY29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdCh0aGlzLl9jb25zb2xlUmVwcmVz ZW50ZWRPYmplY3QpOworICAgIHRoaXMuY29uc29sZUNvbnRlbnRWaWV3ID0gV2ViSW5zcGVjdG9y LnNwbGl0Q29udGVudEJyb3dzZXIuY29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdCh0aGlz Ll9jb25zb2xlUmVwcmVzZW50ZWRPYmplY3QpOwogICAgIHRoaXMuY29uc29sZUxvZ1ZpZXdDb250 cm9sbGVyID0gdGhpcy5jb25zb2xlQ29udGVudFZpZXcubG9nVmlld0NvbnRyb2xsZXI7CiAKICAg ICAvLyBGSVhNRTogVGhlIHNpZGViYXJzIHNob3VsZCBiZSBmbGlwcGVkIGluIFJUTCBsYW5ndWFn ZXMuCkBAIC0yNDQsNyArMjQ0LDcgQEAgV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQgPSBmdW5j dGlvbigpCiAgICAgdGhpcy5fcmVsb2FkUGFnZUtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9k aWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgIlIiLCB0aGlzLl9yZWxvYWRQYWdlLmJpbmQodGhpcykp OwogICAgIHRoaXMuX3JlbG9hZFBhZ2VJZ25vcmluZ0NhY2hlS2V5Ym9hcmRTaG9ydGN1dCA9IG5l dyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sIHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuTW9kaWZpZXIuU2hpZnQsICJSIiwgdGhpcy5fcmVsb2FkUGFnZUlnbm9yaW5nQ2FjaGUu YmluZCh0aGlzKSk7CiAKLSAgICB0aGlzLl9jb25zb2xlS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1 dC5Nb2RpZmllci5PcHRpb24gfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmll ci5Db21tYW5kT3JDb250cm9sLCAiQyIsIHRoaXMudG9nZ2xlQ29uc29sZVZpZXcuYmluZCh0aGlz KSk7CisgICAgdGhpcy5fY29uc29sZUtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIu T3B0aW9uIHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9y Q29udHJvbCwgIkMiLCB0aGlzLl9zaG93Q29uc29sZVRhYi5iaW5kKHRoaXMpKTsKIAogICAgIHRo aXMuX2luc3BlY3RNb2RlS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5k T3JDb250cm9sIHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQs ICJDIiwgdGhpcy5fdG9nZ2xlSW5zcGVjdE1vZGUuYmluZCh0aGlzKSk7CiAKQEAgLTQxOSwxMiAr NDE5LDggQEAgV2ViSW5zcGVjdG9yLnNpZGViYXJQYW5lbEZvclJlcHJlc2VudGVkT2JqZWN0ID0g ZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmplY3QpCiBXZWJJbnNwZWN0b3IuY29udGVudEJyb3dzZXJU cmVlRWxlbWVudEZvclJlcHJlc2VudGVkT2JqZWN0ID0gZnVuY3Rpb24oY29udGVudEJyb3dzZXIs IHJlcHJlc2VudGVkT2JqZWN0KQogewogICAgIC8vIFRoZSBjb25zb2xlIGRvZXMgbm90IGhhdmUg YSBzaWRlYmFyLCBzbyByZXR1cm4gYSB0cmVlIGVsZW1lbnQgaGVyZSBzbyBzb21ldGhpbmcgaXMg c2hvd24uCi0gICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9y LkxvZ09iamVjdCkKKyAgICBpZiAocmVwcmVzZW50ZWRPYmplY3QgPT09IHRoaXMuX2NvbnNvbGVS ZXByZXNlbnRlZE9iamVjdCkKICAgICAgICAgcmV0dXJuIHRoaXMuX2NvbnNvbGVUcmVlRWxlbWVu dDsKLQotICAgIHZhciBzaWRlYmFyUGFuZWwgPSB0aGlzLnNpZGViYXJQYW5lbEZvclJlcHJlc2Vu dGVkT2JqZWN0KHJlcHJlc2VudGVkT2JqZWN0KTsKLSAgICBpZiAoc2lkZWJhclBhbmVsKQotICAg ICAgICByZXR1cm4gc2lkZWJhclBhbmVsLnRyZWVFbGVtZW50Rm9yUmVwcmVzZW50ZWRPYmplY3Qo cmVwcmVzZW50ZWRPYmplY3QpOwogICAgIHJldHVybiBudWxsOwogfTsKIApAQCAtNTc1LDE2ICs1 NzEsMTYgQEAgV2ViSW5zcGVjdG9yLmlzU2hvd2luZ1NwbGl0Q29uc29sZSA9IGZ1bmN0aW9uKCkK ICAgICByZXR1cm4gIXRoaXMuc3BsaXRDb250ZW50QnJvd3Nlci5lbGVtZW50LmNsYXNzTGlzdC5j b250YWlucygiaGlkZGVuIik7CiB9OwogCi1XZWJJbnNwZWN0b3IuY3VycmVudFZpZXdTdXBwb3J0 c1NwbGl0Q29udGVudEJyb3dzZXIgPSBmdW5jdGlvbigpCitXZWJJbnNwZWN0b3IuZG9lc0N1cnJl bnRUYWJTdXBwb3J0U3BsaXRDb250ZW50QnJvd3NlciA9IGZ1bmN0aW9uKCkKIHsKLSAgICB2YXIg Y3VycmVudENvbnRlbnRWaWV3ID0gdGhpcy5jb250ZW50QnJvd3Nlci5jdXJyZW50Q29udGVudFZp ZXc7CisgICAgdmFyIGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMudGFiQnJvd3Nlci5zZWxlY3Rl ZFRhYkNvbnRlbnRWaWV3OwogICAgIHJldHVybiAhY3VycmVudENvbnRlbnRWaWV3IHx8IGN1cnJl bnRDb250ZW50Vmlldy5zdXBwb3J0c1NwbGl0Q29udGVudEJyb3dzZXI7CiB9OwogCiBXZWJJbnNw ZWN0b3IudG9nZ2xlU3BsaXRDb25zb2xlID0gZnVuY3Rpb24oKQogewotICAgIGlmICghdGhpcy5j dXJyZW50Vmlld1N1cHBvcnRzU3BsaXRDb250ZW50QnJvd3NlcigpKSB7Ci0gICAgICAgIHRoaXMu dG9nZ2xlQ29uc29sZVZpZXcoKTsKKyAgICBpZiAoIXRoaXMuZG9lc0N1cnJlbnRUYWJTdXBwb3J0 U3BsaXRDb250ZW50QnJvd3NlcigpKSB7CisgICAgICAgIHRoaXMuc2hvd0NvbnNvbGVUYWIoKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNTk2LDggKzU5Miw4IEBAIFdlYkluc3BlY3Rv ci50b2dnbGVTcGxpdENvbnNvbGUgPSBmdW5jdGlvbigpCiAKIFdlYkluc3BlY3Rvci5zaG93U3Bs aXRDb25zb2xlID0gZnVuY3Rpb24oKQogewotICAgIGlmICghdGhpcy5jdXJyZW50Vmlld1N1cHBv cnRzU3BsaXRDb250ZW50QnJvd3NlcigpKSB7Ci0gICAgICAgIHRoaXMuc2hvd0Z1bGxIZWlnaHRD b25zb2xlKCk7CisgICAgaWYgKCF0aGlzLmRvZXNDdXJyZW50VGFiU3VwcG9ydFNwbGl0Q29udGVu dEJyb3dzZXIoKSkgeworICAgICAgICB0aGlzLnNob3dDb25zb2xlVGFiKCk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKQEAgLTYwNiwxOCArNjAyLDE0IEBAIFdlYkluc3BlY3Rvci5zaG93U3Bs aXRDb25zb2xlID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX3Nob3dpbmdTcGxpdENvbnNvbGVTZXR0 aW5nLnZhbHVlID0gdHJ1ZTsKIAogICAgIGlmICh0aGlzLnNwbGl0Q29udGVudEJyb3dzZXIuY3Vy cmVudENvbnRlbnRWaWV3ICE9PSB0aGlzLmNvbnNvbGVDb250ZW50VmlldykgewotICAgICAgICB2 YXIgd2FzU2hvd2luZ0Z1bGxDb25zb2xlID0gdGhpcy5pc1Nob3dpbmdDb25zb2xlVmlldygpOwot Ci0gICAgICAgIC8vIEJlIHN1cmUgdG8gY2xvc2UgYW55IGV4aXN0aW5nIGxvZyB2aWV3IGluIHRo ZSBtYWluIGNvbnRlbnQgYnJvd3NlciBiZWZvcmUgc2hvd2luZyBpdCBpbiB0aGUKKyAgICAgICAg Ly8gQmUgc3VyZSB0byBjbG9zZSB0aGUgdmlldyBpbiB0aGUgdGFiIGNvbnRlbnQgYnJvd3NlciBi ZWZvcmUgc2hvd2luZyBpdCBpbiB0aGUKICAgICAgICAgLy8gc3BsaXQgY29udGVudCBicm93c2Vy LiBXZSBjYW4gb25seSBzaG93IGEgY29udGVudCB2aWV3IGluIG9uZSBicm93c2VyIGF0IGEgdGlt ZS4KLSAgICAgICAgdGhpcy5jb250ZW50QnJvd3Nlci5jb250ZW50Vmlld0NvbnRhaW5lci5jbG9z ZUFsbENvbnRlbnRWaWV3c09mUHJvdG90eXBlKFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldyk7 CisgICAgICAgIGlmICh0aGlzLmNvbnNvbGVDb250ZW50Vmlldy5wYXJlbnRDb250YWluZXIpCisg ICAgICAgICAgICB0aGlzLmNvbnNvbGVDb250ZW50Vmlldy5wYXJlbnRDb250YWluZXIuY2xvc2VD b250ZW50Vmlldyh0aGlzLmNvbnNvbGVDb250ZW50Vmlldyk7CiAgICAgICAgIHRoaXMuc3BsaXRD b250ZW50QnJvd3Nlci5zaG93Q29udGVudFZpZXcodGhpcy5jb25zb2xlQ29udGVudFZpZXcpOwot Ci0gICAgICAgIGlmICh3YXNTaG93aW5nRnVsbENvbnNvbGUgJiYgIXRoaXMuY29udGVudEJyb3dz ZXIuY3VycmVudENvbnRlbnRWaWV3KQotICAgICAgICAgICAgdGhpcy5yZXNvdXJjZVNpZGViYXJQ YW5lbC5zaG93RGVmYXVsdENvbnRlbnRWaWV3KCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8g VGhpcyBjYXVzZXMgdGhlIHZpZXcgdG8ga25vdyBpdCB3YXMgc2hvd24gYW5kIGZvY3VzIHRoZSBw cm9tcHQuCi0gICAgICAgIHRoaXMuc3BsaXRDb250ZW50QnJvd3Nlci5jb250ZW50Vmlld0NvbnRh aW5lci5zaG93bigpOworICAgICAgICB0aGlzLnNwbGl0Q29udGVudEJyb3dzZXIuc2hvd24oKTsK ICAgICB9CiAKICAgICB0aGlzLnF1aWNrQ29uc29sZS5jb25zb2xlTG9nVmlzaWJpbGl0eUNoYW5n ZWQodHJ1ZSk7CkBAIC02MjUsNjMgKzYxNyw0MCBAQCBXZWJJbnNwZWN0b3Iuc2hvd1NwbGl0Q29u c29sZSA9IGZ1bmN0aW9uKCkKIAogV2ViSW5zcGVjdG9yLmhpZGVTcGxpdENvbnNvbGUgPSBmdW5j dGlvbigpCiB7CisgICAgaWYgKCF0aGlzLmlzU2hvd2luZ1NwbGl0Q29uc29sZSgpKQorICAgICAg ICByZXR1cm47CisKICAgICB0aGlzLnNwbGl0Q29udGVudEJyb3dzZXIuZWxlbWVudC5jbGFzc0xp c3QuYWRkKCJoaWRkZW4iKTsKIAogICAgIHRoaXMuX3Nob3dpbmdTcGxpdENvbnNvbGVTZXR0aW5n LnZhbHVlID0gZmFsc2U7CiAKICAgICAvLyBUaGlzIGNhdXNlcyB0aGUgdmlldyB0byBrbm93IGl0 IHdhcyBoaWRkZW4uCi0gICAgdGhpcy5zcGxpdENvbnRlbnRCcm93c2VyLmNvbnRlbnRWaWV3Q29u dGFpbmVyLmhpZGRlbigpOworICAgIHRoaXMuc3BsaXRDb250ZW50QnJvd3Nlci5oaWRkZW4oKTsK IAogICAgIHRoaXMucXVpY2tDb25zb2xlLmNvbnNvbGVMb2dWaXNpYmlsaXR5Q2hhbmdlZChmYWxz ZSk7CiB9OwogCi1XZWJJbnNwZWN0b3Iuc2hvd0Z1bGxIZWlnaHRDb25zb2xlID0gZnVuY3Rpb24o cmVxdWVzdGVkU2NvcGUpCitXZWJJbnNwZWN0b3Iuc2hvd0NvbnNvbGVUYWIgPSBmdW5jdGlvbihy ZXF1ZXN0ZWRTY29wZSkKIHsKLSAgICB0aGlzLnNwbGl0Q29udGVudEJyb3dzZXIuZWxlbWVudC5j bGFzc0xpc3QuYWRkKCJoaWRkZW4iKTsKLQotICAgIHRoaXMuX3Nob3dpbmdTcGxpdENvbnNvbGVT ZXR0aW5nLnZhbHVlID0gZmFsc2U7CisgICAgdGhpcy5oaWRlU3BsaXRDb25zb2xlKCk7CiAKICAg ICB2YXIgc2NvcGUgPSByZXF1ZXN0ZWRTY29wZSB8fCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZp ZXcuU2NvcGVzLkFsbDsKIAogICAgIC8vIElmIHRoZSByZXF1ZXN0ZWQgc2NvcGUgaXMgYWxyZWFk eSBzZWxlY3RlZCBhbmQgdGhlIGNvbnNvbGUgaXMgc2hvd2luZywgdGhlbiBzd2l0Y2ggYmFjayB0 byBBbGwuCi0gICAgaWYgKHRoaXMuaXNTaG93aW5nQ29uc29sZVZpZXcoKSAmJiB0aGlzLmNvbnNv bGVDb250ZW50Vmlldy5zY29wZUJhci5pdGVtKHNjb3BlKS5zZWxlY3RlZCkKKyAgICBpZiAodGhp cy5pc1Nob3dpbmdDb25zb2xlVGFiKCkgJiYgdGhpcy5jb25zb2xlQ29udGVudFZpZXcuc2NvcGVC YXIuaXRlbShzY29wZSkuc2VsZWN0ZWQpCiAgICAgICAgIHNjb3BlID0gV2ViSW5zcGVjdG9yLkxv Z0NvbnRlbnRWaWV3LlNjb3Blcy5BbGw7CiAKICAgICBpZiAocmVxdWVzdGVkU2NvcGUgfHwgIXRo aXMuY29uc29sZUNvbnRlbnRWaWV3LnNjb3BlQmFyLnNlbGVjdGVkSXRlbXMubGVuZ3RoKQogICAg ICAgICB0aGlzLmNvbnNvbGVDb250ZW50Vmlldy5zY29wZUJhci5pdGVtKHNjb3BlKS5zZWxlY3Rl ZCA9IHRydWU7CiAKLSAgICBpZiAoIXRoaXMuY29udGVudEJyb3dzZXIuY3VycmVudENvbnRlbnRW aWV3IHx8IHRoaXMuY29udGVudEJyb3dzZXIuY3VycmVudENvbnRlbnRWaWV3ICE9PSB0aGlzLmNv bnNvbGVDb250ZW50VmlldykgewotICAgICAgICAvLyBCZSBzdXJlIHRvIGNsb3NlIGFueSBleGlz dGluZyBsb2cgdmlldyBpbiB0aGUgc3BsaXQgY29udGVudCBicm93c2VyIGJlZm9yZSBzaG93aW5n IGl0IGluIHRoZQotICAgICAgICAvLyBtYWluIGNvbnRlbnQgYnJvd3Nlci4gV2UgY2FuIG9ubHkg c2hvdyBhIGNvbnRlbnQgdmlldyBpbiBvbmUgYnJvd3NlciBhdCBhIHRpbWUuCi0gICAgICAgIHRo aXMuc3BsaXRDb250ZW50QnJvd3Nlci5jb250ZW50Vmlld0NvbnRhaW5lci5jbG9zZUFsbENvbnRl bnRWaWV3c09mUHJvdG90eXBlKFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldyk7Ci0gICAgICAg IHRoaXMuY29udGVudEJyb3dzZXIuc2hvd0NvbnRlbnRWaWV3KHRoaXMuY29uc29sZUNvbnRlbnRW aWV3KTsKLSAgICB9CisgICAgdGhpcy5zaG93UmVwcmVzZW50ZWRPYmplY3QodGhpcy5fY29uc29s ZVJlcHJlc2VudGVkT2JqZWN0KTsKIAotICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuaXNTaG93aW5n Q29uc29sZVZpZXcoKSk7Ci0gICAgY29uc29sZS5hc3NlcnQodGhpcy5fY29uc29sZVRvb2xiYXJC dXR0b24uYWN0aXZhdGVkKTsKLQotICAgIHRoaXMucXVpY2tDb25zb2xlLmNvbnNvbGVMb2dWaXNp YmlsaXR5Q2hhbmdlZCh0cnVlKTsKKyAgICBjb25zb2xlLmFzc2VydCh0aGlzLmlzU2hvd2luZ0Nv bnNvbGVUYWIoKSk7CiB9OwogCi1XZWJJbnNwZWN0b3IuaXNTaG93aW5nQ29uc29sZVZpZXcgPSBm dW5jdGlvbigpCitXZWJJbnNwZWN0b3IuaXNTaG93aW5nQ29uc29sZVRhYiA9IGZ1bmN0aW9uKCkK IHsKLSAgICByZXR1cm4gdGhpcy5jb250ZW50QnJvd3Nlci5jdXJyZW50Q29udGVudFZpZXcgaW5z dGFuY2VvZiBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXc7Ci19OwotCi1XZWJJbnNwZWN0b3Iu c2hvd0NvbnNvbGVWaWV3ID0gZnVuY3Rpb24oc2NvcGUpCi17Ci0gICAgdGhpcy5zaG93RnVsbEhl aWdodENvbnNvbGUoc2NvcGUpOwotfTsKLQotV2ViSW5zcGVjdG9yLnRvZ2dsZUNvbnNvbGVWaWV3 ID0gZnVuY3Rpb24oKQotewotICAgIGlmICh0aGlzLmlzU2hvd2luZ0NvbnNvbGVWaWV3KCkpIHsK LSAgICAgICAgaWYgKHRoaXMuY29udGVudEJyb3dzZXIuY2FuR29CYWNrKCkpCi0gICAgICAgICAg ICB0aGlzLmNvbnRlbnRCcm93c2VyLmdvQmFjaygpOwotICAgICAgICBlbHNlCi0gICAgICAgICAg ICB0aGlzLnJlc291cmNlU2lkZWJhclBhbmVsLnNob3dEZWZhdWx0Q29udGVudFZpZXcoKTsKLSAg ICB9IGVsc2UKLSAgICAgICAgdGhpcy5zaG93RnVsbEhlaWdodENvbnNvbGUoKTsKKyAgICByZXR1 cm4gdGhpcy50YWJCcm93c2VyLnNlbGVjdGVkVGFiQ29udGVudFZpZXcgaW5zdGFuY2VvZiBXZWJJ bnNwZWN0b3IuQ29uc29sZVRhYkNvbnRlbnRWaWV3OwogfTsKIAogV2ViSW5zcGVjdG9yLlVJU3Ry aW5nID0gZnVuY3Rpb24oc3RyaW5nLCB2YXJhcmcpCkBAIC0xNjU3LDYgKzE2MjYsMTEgQEAgV2Vi SW5zcGVjdG9yLl90b2dnbGVJbnNwZWN0TW9kZSA9IGZ1bmN0aW9uKGV2ZW50KQogICAgIHRoaXMu ZG9tVHJlZU1hbmFnZXIuaW5zcGVjdE1vZGVFbmFibGVkID0gIXRoaXMuZG9tVHJlZU1hbmFnZXIu aW5zcGVjdE1vZGVFbmFibGVkOwogfTsKIAorV2ViSW5zcGVjdG9yLl9zaG93Q29uc29sZVRhYiA9 IGZ1bmN0aW9uKGV2ZW50KQoreworICAgIHRoaXMuc2hvd0NvbnNvbGVUYWIoKTsKK307CisKIFdl Ykluc3BlY3Rvci5fZm9jdXNlZENvbnRlbnRWaWV3ID0gZnVuY3Rpb24oKQogewogICAgIGlmICh0 aGlzLmNvbnRlbnRCcm93c2VyLmVsZW1lbnQuaXNTZWxmT3JBbmNlc3Rvcih0aGlzLmN1cnJlbnRG b2N1c0VsZW1lbnQpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvSW1hZ2VzL0NvbnNvbGUuc3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvSW1hZ2VzL0NvbnNvbGUuc3ZnCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE4ZTlhMjhmZGU5YTkwODQ2Njlm MWY5MDIwNGZkZTBkYmU4MDRkMzUKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQ29uc29sZS5zdmcKQEAgLTAsMCArMSw5IEBACis8 P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgorPCEtLSBDb3B5cmlnaHQgwqkg MjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIC0tPgorPHN2ZyB2aWV3Qm94PSIw IDAgMTYgMTYiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3Zn Ij4KKyAgICA8cmVjdCB4PSIwLjUiIHk9IjAuNSIgd2lkdGg9IjE1IiBoZWlnaHQ9IjE1IiByeD0i MiIgY2xhc3M9InN0cm9rZWQiIGZpbGw9Im5vbmUiIHN0cm9rZT0iYmxhY2siLz4KKyAgICA8cGF0 aCBkPSJNIDQgNCBMIDggOCBMIDQgMTIiIGNsYXNzPSJzdHJva2VkIiBmaWxsPSJub25lIiBzdHJv a2U9ImJsYWNrIi8+CisgICAgPHBhdGggZD0iTSA4IDQuNSBMIDEyIDQuNSIgY2xhc3M9InN0cm9r ZWQiIGZpbGw9Im5vbmUiIHN0cm9rZT0iYmxhY2siLz4KKyAgICA8cGF0aCBkPSJNIDEwIDggTCAx MiA4IiBjbGFzcz0ic3Ryb2tlZCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSJibGFjayIvPgorICAgIDxw YXRoIGQ9Ik0gOCAxMS41IEwgMTIgMTEuNSIgY2xhc3M9InN0cm9rZWQiIGZpbGw9Im5vbmUiIHN0 cm9rZT0iYmxhY2siLz4KKzwvc3ZnPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yRnJvbnRlbmRBUEkuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JGcm9udGVuZEFQ SS5qcwppbmRleCA1Mjc3NzdhZGJmYzkzNDcyYTJlZWJiYzZmMmU3ZWU5MTdlODUxMzQzLi5iZjk2 NDdiOTZmZmFmZmZjMGEwMmQyM2MwNWJmYTA2ODYwYTEzMDQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JGcm9udGVuZEFQ SS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9J bnNwZWN0b3JGcm9udGVuZEFQSS5qcwpAQCAtNjMsNyArNjMsNyBAQCBJbnNwZWN0b3JGcm9udGVu ZEFQSSA9IHsKIAogICAgIHNob3dDb25zb2xlOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBX ZWJJbnNwZWN0b3Iuc2hvd0NvbnNvbGVWaWV3KCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5zaG93 Q29uc29sZVRhYigpOwogCiAgICAgICAgIFdlYkluc3BlY3Rvci5xdWlja0NvbnNvbGUucHJvbXB0 LmZvY3VzKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvbnNvbGVUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVUYWJDb250ZW50Vmlldy5qcwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li4xNGE0NWQ5YmJhOTVkM2U3MWVkZDIwZGM4YmRkNzEzZDA5MjAzNjQyCi0tLSAvZGV2L251bGwK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZVRh YkNvbnRlbnRWaWV3LmpzCkBAIC0wLDAgKzEsNzMgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIw MTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICog bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBj b2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJl ZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhl ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMg U09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBg YEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBB UkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJ QlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFM LCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lO RVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9G IExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9S IFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4g QU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCitXZWJJbnNwZWN0 b3IuQ29uc29sZVRhYkNvbnRlbnRWaWV3ID0gZnVuY3Rpb24oaWRlbnRpZmllcikKK3sKKyAgICB2 YXIgdGFiQmFySXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuVGFiQmFySXRlbSgiSW1hZ2VzL0NvbnNv bGUuc3ZnIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb25zb2xlIikpOworCisgICAgV2ViSW5z cGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuY2FsbCh0aGlzLCBpZGVudGlmaWVy IHx8ICJjb25zb2xlIiwgImNvbnNvbGUiLCB0YWJCYXJJdGVtLCBudWxsLCBudWxsLCB0cnVlKTsK K307CisKK1dlYkluc3BlY3Rvci5Db25zb2xlVGFiQ29udGVudFZpZXcucHJvdG90eXBlID0gewor ICAgIGNvbnN0cnVjdG9yOiBXZWJJbnNwZWN0b3IuQ29uc29sZVRhYkNvbnRlbnRWaWV3LAorICAg IF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcucHJv dG90eXBlLAorCisgICAgLy8gUHVibGljCisKKyAgICBzaG93bjogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcucHJvdG90 eXBlLnNob3duLmNhbGwodGhpcyk7CisKKyAgICAgICAgaWYgKHRoaXMuY29udGVudEJyb3dzZXIu Y3VycmVudENvbnRlbnRWaWV3ID09PSBXZWJJbnNwZWN0b3IuY29uc29sZUNvbnRlbnRWaWV3KQor ICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIC8vIEJlIHN1cmUgdG8gY2xvc2UgdGhlIHZp ZXcgaW4gdGhlIHNwbGl0IGNvbnRlbnQgYnJvd3NlciBiZWZvcmUgc2hvd2luZyBpdCBpbiB0aGUK KyAgICAgICAgLy8gdGFiIGNvbnRlbnQgYnJvd3Nlci4gV2UgY2FuIG9ubHkgc2hvdyBhIGNvbnRl bnQgdmlldyBpbiBvbmUgYnJvd3NlciBhdCBhIHRpbWUuCisgICAgICAgIGlmIChXZWJJbnNwZWN0 b3IuY29uc29sZUNvbnRlbnRWaWV3LnBhcmVudENvbnRhaW5lcikKKyAgICAgICAgICAgIFdlYklu c3BlY3Rvci5jb25zb2xlQ29udGVudFZpZXcucGFyZW50Q29udGFpbmVyLmNsb3NlQ29udGVudFZp ZXcoV2ViSW5zcGVjdG9yLmNvbnNvbGVDb250ZW50Vmlldyk7CisKKyAgICAgICAgdGhpcy5jb250 ZW50QnJvd3Nlci5zaG93Q29udGVudFZpZXcoV2ViSW5zcGVjdG9yLmNvbnNvbGVDb250ZW50Vmll dyk7CisKKyAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5jb250ZW50QnJvd3Nlci5jdXJyZW50 Q29udGVudFZpZXcgPT09IFdlYkluc3BlY3Rvci5jb25zb2xlQ29udGVudFZpZXcpOworICAgIH0s CisKKyAgICBzaG93UmVwcmVzZW50ZWRPYmplY3Q6IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0 LCBjb29raWUpCisgICAgeworICAgICAgICAvLyBEbyBub3RoaW5nLiBUaGUgc2hvd24gZnVuY3Rp b24gd2lsbCBoYW5kbGUgdGhpbmdzLiBDYWxsaW5nCisgICAgICAgIC8vIENvbnRlbnRCcm93c2Vy VGFiQ29udGVudFZpZXcuc2hvd24gd2lsbCBjYXVzZSBhIG5ldyBMb2dDb250ZW50VmlldworICAg ICAgICAvLyB0byBiZSBjcmVhdGVkIGluc3RlYWQgb2YgcmV1c2luZyBXZWJJbnNwZWN0b3IuY29u c29sZUNvbnRlbnRWaWV3LgorICAgICAgICBjb25zb2xlLmFzc2VydChyZXByZXNlbnRlZE9iamVj dCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Mb2dPYmplY3QpOworICAgIH0sCisKKyAgICBjYW5T aG93UmVwcmVzZW50ZWRPYmplY3Q6IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0KQorICAgIHsK KyAgICAgICAgcmV0dXJuIHJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9y LkxvZ09iamVjdDsKKyAgICB9LAorCisgICAgZ2V0IHN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3Nl cigpCisgICAgeworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorfTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlZmF1bHREYXNoYm9h cmRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVm YXVsdERhc2hib2FyZFZpZXcuanMKaW5kZXggZjdmMzcwNmRkNmYxMjM2YTYyMzZkNWQxMDMzZTUw OTViZDJmZWE3ZC4uZmUxYWRjYTIxMTliOWFjYmVmMzc0M2YzM2JhMWM1Y2JlMzc3N2U3ZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGVmYXVs dERhc2hib2FyZFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRGVmYXVsdERhc2hib2FyZFZpZXcuanMKQEAgLTEyMiw3ICsxMjIsNyBAQCBXZWJJ bnNwZWN0b3IuRGVmYXVsdERhc2hib2FyZFZpZXcgPSBjbGFzcyBEZWZhdWx0RGFzaGJvYXJkVmll dyBleHRlbmRzIFdlYkluc3BlYwogCiAgICAgX2NvbnNvbGVJdGVtV2FzQ2xpY2tlZChzY29wZSkK ICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5zaG93Q29uc29sZVZpZXcoc2NvcGUpOworICAg ICAgICBXZWJJbnNwZWN0b3Iuc2hvd0NvbnNvbGVUYWIoc2NvcGUpOwogICAgIH0KIAogICAgIF9z ZXRDb25zb2xlSXRlbVZhbHVlKGl0ZW1OYW1lLCBuZXdWYWx1ZSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcu anMKaW5kZXggNDZmOTMwZGI5MTI4N2RjYjdiMmFkNWExZGUyZTk3NjY3MTAyYjY0OC4uMjc1OTkw NTdiYTQ2MjBhN2U5M2JkNmM5M2NlYzY0MjNmYWYxMmRiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcu anMKQEAgLTc5LDEyICs3OSw5IEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50VmlldyA9IGZ1bmN0 aW9uKHJlcHJlc2VudGVkT2JqZWN0KQogCiAgICAgdGhpcy5fY2xlYXJMb2dPblJlbG9hZFNldHRp bmcgPSBuZXcgV2ViSW5zcGVjdG9yLlNldHRpbmcoImNsZWFyLWxvZy1vbi1yZWxvYWQiLCB0cnVl KTsKIAotICAgIHZhciB0b29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IHNwbGl0 IGNvbnNvbGUiKTsKLSAgICB2YXIgYWx0VG9vbFRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi U2hvdyBmdWxsLWhlaWdodCBjb25zb2xlIik7Ci0KLSAgICB0aGlzLl90b2dnbGVTcGxpdE5hdmln YXRpb25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5Ub2dnbGVCdXR0b25OYXZpZ2F0aW9uSXRlbSgi c3BsaXQtdG9nZ2xlIiwgdG9vbFRpcCwgYWx0VG9vbFRpcCwgcGxhdGZvcm1JbWFnZVBhdGgoIlNw bGl0VG9nZ2xlRG93bi5zdmciKSwgcGxhdGZvcm1JbWFnZVBhdGgoIlNwbGl0VG9nZ2xlVXAuc3Zn IiksIDE2LCAxNik7Ci0gICAgdGhpcy5fdG9nZ2xlU3BsaXROYXZpZ2F0aW9uSXRlbS5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2Vk LCB0aGlzLl90b2dnbGVTcGxpdCwgdGhpcyk7Ci0gICAgdGhpcy5fdG9nZ2xlU3BsaXROYXZpZ2F0 aW9uSXRlbS50b2dnbGVkID0gV2ViSW5zcGVjdG9yLmlzU2hvd2luZ1NwbGl0Q29uc29sZSgpOwor ICAgIHZhciB0b29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IGNvbnNvbGUgdGFi Iik7CisgICAgdGhpcy5fc2hvd0NvbnNvbGVUYWJOYXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNw ZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInNob3ctdGFiIiwgdG9vbFRpcCwgcGxhdGZvcm1J bWFnZVBhdGgoIlNwbGl0VG9nZ2xlVXAuc3ZnIiksIDE2LCAxNik7CisgICAgdGhpcy5fc2hvd0Nv bnNvbGVUYWJOYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5CdXR0 b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9zaG93Q29uc29sZVRhYiwgdGhp cyk7CiAKICAgICB0aGlzLm1lc3NhZ2VzRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0 bWVudSIsIHRoaXMuX2hhbmRsZUNvbnRleHRNZW51RXZlbnQuYmluZCh0aGlzKSwgZmFsc2UpOwog CkBAIC0xMTgsNyArMTE1LDEwIEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5 cGUgPSB7CiAKICAgICBnZXQgbmF2aWdhdGlvbkl0ZW1zKCkKICAgICB7Ci0gICAgICAgIHJldHVy biBbdGhpcy5fc2VhcmNoQmFyLCB0aGlzLl9zY29wZUJhciwgdGhpcy5fY2xlYXJMb2dOYXZpZ2F0 aW9uSXRlbSwgdGhpcy5fdG9nZ2xlU3BsaXROYXZpZ2F0aW9uSXRlbV07CisgICAgICAgIHZhciBu YXZpZ2F0aW9uSXRlbXMgPSBbdGhpcy5fc2VhcmNoQmFyLCB0aGlzLl9zY29wZUJhciwgdGhpcy5f Y2xlYXJMb2dOYXZpZ2F0aW9uSXRlbV07CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuaXNTaG93 aW5nU3BsaXRDb25zb2xlKCkpCisgICAgICAgICAgICBuYXZpZ2F0aW9uSXRlbXMucHVzaCh0aGlz Ll9zaG93Q29uc29sZVRhYk5hdmlnYXRpb25JdGVtKTsKKyAgICAgICAgcmV0dXJuIG5hdmlnYXRp b25JdGVtczsKICAgICB9LAogCiAgICAgZ2V0IHNjb3BlQmFyKCkKQEAgLTE0MCw4ICsxNDAsNiBA QCBXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAgc2hvd246 IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3RvZ2dsZVNwbGl0TmF2aWdhdGlvbkl0 ZW0udG9nZ2xlZCA9IFdlYkluc3BlY3Rvci5pc1Nob3dpbmdTcGxpdENvbnNvbGUoKTsKLQogICAg ICAgICB0aGlzLnByb21wdC5mb2N1cygpOwogICAgIH0sCiAKQEAgLTIwNCw3ICsyMDIsNyBAQCBX ZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAgICBpZiAodHlw ZSAhPT0gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLlJlc3VsdCkKICAg ICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5pc1Nob3dpbmdD b25zb2xlVmlldygpKQorICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5pc1Nob3dpbmdDb25zb2xl VGFiKCkpCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NwbGl0Q29uc29sZSgpOwogCiAg ICAgICAgIHRoaXMuX2xvZ1ZpZXdDb250cm9sbGVyLnNjcm9sbFRvQm90dG9tKCk7CkBAIC02Mzks MTIgKzYzNyw5IEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHRoaXMuX2lnbm9yZURpZENsZWFyTWVzc2FnZXMgPSBmYWxzZTsKICAgICB9LAogCi0g ICAgX3RvZ2dsZVNwbGl0OiBmdW5jdGlvbigpCisgICAgX3Nob3dDb25zb2xlVGFiOiBmdW5jdGlv bigpCiAgICAgewotICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLmlzU2hvd2luZ1NwbGl0Q29uc29s ZSgpKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dGdWxsSGVpZ2h0Q29uc29sZSgpOwot ICAgICAgICBlbHNlCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NwbGl0Q29uc29sZSgp OworICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd0NvbnNvbGVUYWIoKTsKICAgICB9LAogCiAgICAg X3RvZ2dsZUNsZWFyTG9nT25SZWxvYWRTZXR0aW5nOiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dJY29uLmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0ljb24uY3NzCmluZGV4 IDA5YjVmMDlkYzdiZDBmMTc0MjRiYmEwMGNkOWQwODFkOWMxYTJkYzQuLjNlYzE5ZTc5MGE0Y2Q2 ODg5MjYxNzYxMGYwNjE3NTFmMDJhZDdhNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0ljb24uY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0ljb24uY3NzCkBAIC0yNCw1ICsyNCw1IEBA CiAgKi8KIAogLmxvZy1pY29uIC5pY29uIHsKLSAgICBjb250ZW50OiAtd2Via2l0LWltYWdlLXNl dCh1cmwoLi4vSW1hZ2VzL0xvZy5wbmcpIDF4LCB1cmwoLi4vSW1hZ2VzL0xvZ0AyeC5wbmcpIDJ4 KTsKKyAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL0NvbnNvbGUuc3ZnKTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01haW4uY3NzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWFpbi5jc3MKaW5kZXgg M2Q4ZjVjNzEwZjlhNWE5NWU5MTQ0NzFjMmYwMTU5MGQ2YzNkNDdiYS4uYzUyZDNjNjU0YTQxZWQ1 YTUyNDgzZjM1ODcyMjAwMjk1ZDFlOGJhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWFpbi5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWFpbi5jc3MKQEAgLTE3NCw2ICsxNzQsMjAgQEAgYm9k eS5tYWMtcGxhdGZvcm0ubGVnYWN5ICNzcGxpdC1jb250ZW50LWJyb3dzZXIgPiAubmF2aWdhdGlv bi1iYXIgewogICAgIGN1cnNvcjogZGVmYXVsdDsKIH0KIAorI3NwbGl0LWNvbnRlbnQtYnJvd3Nl ciAuaGllcmFyY2hpY2FsLXBhdGgtY29tcG9uZW50LmxvZy1pY29uIC5pY29uIHsKKyAgICBtYXJn aW4tbGVmdDogNnB4OworICAgIG1hcmdpbi1yaWdodDogNnB4OworICAgIG9wYWNpdHk6IDAuNzsK K30KKworI3NwbGl0LWNvbnRlbnQtYnJvd3NlciAuaGllcmFyY2hpY2FsLXBhdGgtY29tcG9uZW50 LmxvZy1pY29uIC50aXRsZSB7CisgICAgY29sb3I6IHJnYmEoMCwgMCwgMCwgMC43NSk7Cit9CisK KyNzcGxpdC1jb250ZW50LWJyb3dzZXIgLmhpZXJhcmNoaWNhbC1wYXRoLWNvbXBvbmVudC5sb2ct aWNvbiBzZWxlY3QgeworICAgIGRpc3BsYXk6IG5vbmU7Cit9CisKICNkZXRhaWxzLXNpZGViYXIg ewogICAgIHdpZHRoOiAzMDBweDsKIH0K