144352 2015-04-28 13:38:14 -0700 Web Inspector: Scope Chain sidebar should be selected immediately when paused 2015-04-30 13:05:17 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck timothy benjamin commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1089715 0 joepeck 2015-04-28 13:38:14 -0700 * SUMMARY Scope Chain sidebar should be selected immediately when paused. I think this might be a regression in the new Tab UI. I'm pretty sure we were forcing it selected when we paused before. If you were showing the sidebar, and you had Resources selected, when the Scope Chain sidebar appears, it isn't selected. This leads to a poorer debugging experience because developers don't know that the scope chain sidebar is available. Also, maybe the Resources sidebar is not very useful in the Debugger sidebar. Perhaps we should drop it here. 1089717 1 webkit-bug-importer 2015-04-28 13:39:02 -0700 <rdar://problem/20733530> 1089750 2 timothy 2015-04-28 14:50:37 -0700 Yes, this is a regression. Should be a simple fix. 1090436 3 252057 timothy 2015-04-30 07:32:43 -0700 Created attachment 252057 Patch 1090437 4 252057 timothy 2015-04-30 07:37:25 -0700 Comment on attachment 252057 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252057&action=review > Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js:-131 > - this._contentBrowserRepresentedObjectsDidChange(); Silly git. I moved the body of the _contentBrowserRepresentedObjectsDidChange function into here. So the diff things I moved the other functions instead. 1090530 5 252057 joepeck 2015-04-30 12:16:06 -0700 Comment on attachment 252057 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252057&action=review > Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js:71 > + showScopeChainDetailsSidebarPanel: function() I wonder if "activate" or "select" might be better naming. For a while I was confused about this showing up at all, instead of it being selected or not. Either way, r=me. 1090546 6 252057 commit-queue 2015-04-30 13:05:13 -0700 Comment on attachment 252057 Patch Clearing flags on attachment: 252057 Committed r183642: <http://trac.webkit.org/changeset/183642> 1090547 7 commit-queue 2015-04-30 13:05:17 -0700 All reviewed patches have been landed. Closing bug. 252057 2015-04-30 07:32:43 -0700 2015-04-30 13:05:13 -0700 Patch bug-144352-20150430073133.patch text/plain 9680 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw YTk0N2RiNWI2ZWIzZWU1NDFjZmE5ZDBiNWNjNzI1M2RjZTdjNTIzLi42ODBiMjY2MjVjNTdkY2Yz OGY2NzcxZTgwNGE4Y2M2Y2YwNTg5NTlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNS0wNC0zMCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU2NvcGUgQ2hhaW4gc2lkZWJhciBzaG91bGQg YmUgc2VsZWN0ZWQgaW1tZWRpYXRlbHkgd2hlbiBwYXVzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDM1MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3Iuc2hvd0RlYnVnZ2VyVGFiKTogQWRkZWQgc2hvd1Njb3Bl Q2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsIGFyZ3VtZW50LgorICAgICAgICAoV2ViSW5zcGVjdG9y Ll9kZWJ1Z2dlckRpZFBhdXNlKTogUGFzcyB0cnVlIGZvciBzaG93U2NvcGVDaGFpbkRldGFpbHNT aWRlYmFyUGFuZWwuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nl clRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2Vy VGFiQ29udGVudFZpZXcpOiBXaXJlIHRoZSBldmVudCB0byBzaG93RGV0YWlsc1NpZGViYXJQYW5l bHMgaW5zdGVhZCBvZgorICAgICAgICBfY29udGVudEJyb3dzZXJSZXByZXNlbnRlZE9iamVjdHNE aWRDaGFuZ2UsIGFsbG93aW5nIHN1YmNsYXNzZXMgdG8gZG8gd29yayBkdXJpbmcgdGhlIGV2ZW50 LgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcucHJv dG90eXBlLnNob3dEZXRhaWxzU2lkZWJhclBhbmVscyk6IE1vdmVkIGNvbnRlbnQgb2YKKyAgICAg ICAgX2NvbnRlbnRCcm93c2VyUmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlIGhlcmUuCisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5wcm90b3R5cGUu X2NvbnRlbnRCcm93c2VyUmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlKTogRGVsZXRlZC4KKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyVGFiQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuc2hv d0RldGFpbHNTaWRlYmFyUGFuZWxzKTogQWRkZWQuIFNob3cgdGhlIHNjb3BlIHNpZGViYXIgcGFu ZWwKKyAgICAgICAgaWYgaXQgaXMgYXZhaWxhYmxlIGFuZCBpdCB3YXMgcmVxdWVzdGVkIGJ5IHNo b3dTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbCgpLgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlYnVnZ2VyVGFiQ29udGVudFZpZXcucHJvdG90eXBlLnNob3dTY29wZUNoYWluRGV0YWlsc1Np ZGViYXJQYW5lbCk6IEFkZGVkLgorCiAyMDE1LTA0LTI5ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1v dGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgRnJhbWVDb250 ZW50Vmlldy5qcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzCmluZGV4IDc3MTZjODNlMGMxM2YwMjZiYzA1ZWM5ZTQyMDMwNDJhYmU0ZTVmOTAu LmY3Mzc1YzVkZGU5NTEyOTBjZmVkYzE0YzcyMmYyNmE1ODM1Y2QwZDYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAgLTczOCw3ICs3 MzgsNyBAQCBXZWJJbnNwZWN0b3Iuc2hvd0VsZW1lbnRzVGFiID0gZnVuY3Rpb24oKQogICAgIHRo aXMudGFiQnJvd3Nlci5zaG93VGFiRm9yQ29udGVudFZpZXcodGFiQ29udGVudFZpZXcpOwogfTsK IAotV2ViSW5zcGVjdG9yLnNob3dEZWJ1Z2dlclRhYiA9IGZ1bmN0aW9uKGJyZWFrcG9pbnRUb1Nl bGVjdCkKK1dlYkluc3BlY3Rvci5zaG93RGVidWdnZXJUYWIgPSBmdW5jdGlvbihicmVha3BvaW50 VG9TZWxlY3QsIHNob3dTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbCkKIHsKICAgICB2YXIg dGFiQ29udGVudFZpZXcgPSB0aGlzLnRhYkJyb3dzZXIuYmVzdFRhYkNvbnRlbnRWaWV3Rm9yQ2xh c3MoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyVGFiQ29udGVudFZpZXcpOwogICAgIGlmICghdGFiQ29u dGVudFZpZXcpCkBAIC03NDcsNiArNzQ3LDkgQEAgV2ViSW5zcGVjdG9yLnNob3dEZWJ1Z2dlclRh YiA9IGZ1bmN0aW9uKGJyZWFrcG9pbnRUb1NlbGVjdCkKICAgICBpZiAoYnJlYWtwb2ludFRvU2Vs ZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQpCiAgICAgICAgIHRhYkNvbnRl bnRWaWV3LnJldmVhbEFuZFNlbGVjdEJyZWFrcG9pbnQoYnJlYWtwb2ludFRvU2VsZWN0KTsKIAor ICAgIGlmIChzaG93U2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwpCisgICAgICAgIHRhYkNv bnRlbnRWaWV3LnNob3dTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbCgpOworCiAgICAgdGhp cy50YWJCcm93c2VyLnNob3dUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50Vmlldyk7CiB9Owog CkBAIC0xMDY4LDcgKzEwNzEsNyBAQCBXZWJJbnNwZWN0b3IuX2NhcHR1cmVEaWRTdGFydCA9IGZ1 bmN0aW9uKGV2ZW50KQogCiBXZWJJbnNwZWN0b3IuX2RlYnVnZ2VyRGlkUGF1c2UgPSBmdW5jdGlv bihldmVudCkKIHsKLSAgICB0aGlzLnNob3dEZWJ1Z2dlclRhYigpOworICAgIHRoaXMuc2hvd0Rl YnVnZ2VyVGFiKG51bGwsIHRydWUpOwogCiAgICAgdGhpcy5fZGFzaGJvYXJkQ29udGFpbmVyLnNo b3dEYXNoYm9hcmRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QodGhpcy5kYXNoYm9hcmRNYW5hZ2Vy LmRhc2hib2FyZHMuZGVidWdnZXIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJU YWJDb250ZW50Vmlldy5qcwppbmRleCAyNTI3ZjkxOWQ2ZTIwMmRjZGI5N2VmYWE5YjdmNzhkMWI0 MjZkYWIyLi4wMjVjZWQwNTM4NGI3OGNmZThiNTlhOWYzZmQzNDhlMjU3MTMxNzM2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJv d3NlclRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanMKQEAgLTM4LDcgKzM4 LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcgPSBmdW5jdGlv bihpZGVudGlmaWVyLCBzdHlsZUNsYXNzTmFtZXMKICAgICB0aGlzLl9sYXN0U2VsZWN0ZWREZXRh aWxzU2lkZWJhclBhbmVsU2V0dGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuU2V0dGluZyhpZGVudGlm aWVyICsgIi1sYXN0LXNlbGVjdGVkLWRldGFpbHMtc2lkZWJhci1wYW5lbCIsIG51bGwpOwogCiAg ICAgdGhpcy5fY29udGVudEJyb3dzZXIgPSBjb250ZW50QnJvd3NlcjsKLSAgICB0aGlzLl9jb250 ZW50QnJvd3Nlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlci5F dmVudC5DdXJyZW50UmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdlLCB0aGlzLl9jb250ZW50QnJv d3NlclJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZSwgdGhpcyk7CisgICAgdGhpcy5fY29udGVu dEJyb3dzZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIuRXZl bnQuQ3VycmVudFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZSwgdGhpcy5zaG93RGV0YWlsc1Np ZGViYXJQYW5lbHMsIHRoaXMpOwogICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLkV2ZW50LkN1cnJlbnRDb250ZW50Vmll d0RpZENoYW5nZSwgdGhpcy5fY29udGVudEJyb3dzZXJDdXJyZW50Q29udGVudFZpZXdEaWRDaGFu Z2UsIHRoaXMpOwogCiAgICAgaWYgKG5hdmlnYXRpb25TaWRlYmFyUGFuZWwpIHsKQEAgLTEyOCw1 OSArMTI4LDYgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcucHJv dG90eXBlID0gewogCiAgICAgc2hvd0RldGFpbHNTaWRlYmFyUGFuZWxzOiBmdW5jdGlvbigpCiAg ICAgewotICAgICAgICB0aGlzLl9jb250ZW50QnJvd3NlclJlcHJlc2VudGVkT2JqZWN0c0RpZENo YW5nZSgpOwotICAgIH0sCi0KLSAgICBzaG93UmVwcmVzZW50ZWRPYmplY3Q6IGZ1bmN0aW9uKHJl cHJlc2VudGVkT2JqZWN0LCBjb29raWUpCi0gICAgewotICAgICAgICB0aGlzLmNvbnRlbnRCcm93 c2VyLnNob3dDb250ZW50Vmlld0ZvclJlcHJlc2VudGVkT2JqZWN0KHJlcHJlc2VudGVkT2JqZWN0 LCBjb29raWUpOwotICAgIH0sCi0KLSAgICAvLyBDb250ZW50QnJvd3NlciBEZWxlZ2F0ZQotCi0g ICAgY29udGVudEJyb3dzZXJUcmVlRWxlbWVudEZvclJlcHJlc2VudGVkT2JqZWN0OiBmdW5jdGlv bihjb250ZW50QnJvd3NlciwgcmVwcmVzZW50ZWRPYmplY3QpCi0gICAgewotICAgICAgICBpZiAo dGhpcy5uYXZpZ2F0aW9uU2lkZWJhclBhbmVsKQotICAgICAgICAgICAgcmV0dXJuIHRoaXMubmF2 aWdhdGlvblNpZGViYXJQYW5lbC50cmVlRWxlbWVudEZvclJlcHJlc2VudGVkT2JqZWN0KHJlcHJl c2VudGVkT2JqZWN0KTsKLSAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgfSwKLQotICAgIC8vIFBy aXZhdGUKLQotICAgIF9uYXZpZ2F0aW9uU2lkZWJhckNvbGxhcHNlZFN0YXRlRGlkQ2hhbmdlOiBm dW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3Nob3dOYXZpZ2F0aW9uU2lkZWJh ckl0ZW0uYWN0aXZhdGVkID0gIVdlYkluc3BlY3Rvci5uYXZpZ2F0aW9uU2lkZWJhci5jb2xsYXBz ZWQ7Ci0gICAgfSwKLQotICAgIF9kZXRhaWxzU2lkZWJhckNvbGxhcHNlZFN0YXRlRGlkQ2hhbmdl OiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhpcy52aXNpYmxlKQotICAg ICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHRoaXMuX3Nob3dEZXRhaWxzU2lkZWJhckl0ZW0u YWN0aXZhdGVkID0gIVdlYkluc3BlY3Rvci5kZXRhaWxzU2lkZWJhci5jb2xsYXBzZWQ7Ci0gICAg ICAgIHRoaXMuX3Nob3dEZXRhaWxzU2lkZWJhckl0ZW0uZW5hYmxlZCA9IFdlYkluc3BlY3Rvci5k ZXRhaWxzU2lkZWJhci5zaWRlYmFyUGFuZWxzLmxlbmd0aDsKLQotICAgICAgICBpZiAodGhpcy5f aWdub3JlRGV0YWlsc1NpZGViYXJQYW5lbENvbGxhcHNlZEV2ZW50KQotICAgICAgICAgICAgcmV0 dXJuOwotCi0gICAgICAgIHRoaXMuZGV0YWlsc1NpZGViYXJDb2xsYXBzZWRTZXR0aW5nLnZhbHVl ID0gV2ViSW5zcGVjdG9yLmRldGFpbHNTaWRlYmFyLmNvbGxhcHNlZDsKLSAgICB9LAotCi0gICAg X2RldGFpbHNTaWRlYmFyUGFuZWxTZWxlY3RlZDogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAg ICAgICBpZiAoIXRoaXMudmlzaWJsZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB0 aGlzLl9zaG93RGV0YWlsc1NpZGViYXJJdGVtLmVuYWJsZWQgPSBXZWJJbnNwZWN0b3IuZGV0YWls c1NpZGViYXIuc2lkZWJhclBhbmVscy5sZW5ndGg7Ci0KLSAgICAgICAgaWYgKCFXZWJJbnNwZWN0 b3IuZGV0YWlsc1NpZGViYXIuc2VsZWN0ZWRTaWRlYmFyUGFuZWwgfHwgdGhpcy5faWdub3JlRGV0 YWlsc1NpZGViYXJQYW5lbFNlbGVjdGVkRXZlbnQpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAg ICAgICAgdGhpcy5fbGFzdFNlbGVjdGVkRGV0YWlsc1NpZGViYXJQYW5lbFNldHRpbmcudmFsdWUg PSBXZWJJbnNwZWN0b3IuZGV0YWlsc1NpZGViYXIuc2VsZWN0ZWRTaWRlYmFyUGFuZWwuaWRlbnRp ZmllcjsKLSAgICB9LAotCi0gICAgX2NvbnRlbnRCcm93c2VyUmVwcmVzZW50ZWRPYmplY3RzRGlk Q2hhbmdlOiBmdW5jdGlvbigpCi0gICAgewogICAgICAgICBpZiAoIXRoaXMudmlzaWJsZSkKICAg ICAgICAgICAgIHJldHVybjsKIApAQCAtMjMxLDYgKzE3OCw1NCBAQCBXZWJJbnNwZWN0b3IuQ29u dGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3No b3dEZXRhaWxzU2lkZWJhckl0ZW0uZW5hYmxlZCA9IFdlYkluc3BlY3Rvci5kZXRhaWxzU2lkZWJh ci5zaWRlYmFyUGFuZWxzLmxlbmd0aDsKICAgICB9LAogCisgICAgc2hvd1JlcHJlc2VudGVkT2Jq ZWN0OiBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCwgY29va2llKQorICAgIHsKKyAgICAgICAg dGhpcy5jb250ZW50QnJvd3Nlci5zaG93Q29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdChy ZXByZXNlbnRlZE9iamVjdCwgY29va2llKTsKKyAgICB9LAorCisgICAgLy8gQ29udGVudEJyb3dz ZXIgRGVsZWdhdGUKKworICAgIGNvbnRlbnRCcm93c2VyVHJlZUVsZW1lbnRGb3JSZXByZXNlbnRl ZE9iamVjdDogZnVuY3Rpb24oY29udGVudEJyb3dzZXIsIHJlcHJlc2VudGVkT2JqZWN0KQorICAg IHsKKyAgICAgICAgaWYgKHRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5lbCkKKyAgICAgICAgICAg IHJldHVybiB0aGlzLm5hdmlnYXRpb25TaWRlYmFyUGFuZWwudHJlZUVsZW1lbnRGb3JSZXByZXNl bnRlZE9iamVjdChyZXByZXNlbnRlZE9iamVjdCk7CisgICAgICAgIHJldHVybiBudWxsOworICAg IH0sCisKKyAgICAvLyBQcml2YXRlCisKKyAgICBfbmF2aWdhdGlvblNpZGViYXJDb2xsYXBzZWRT dGF0ZURpZENoYW5nZTogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9zaG93 TmF2aWdhdGlvblNpZGViYXJJdGVtLmFjdGl2YXRlZCA9ICFXZWJJbnNwZWN0b3IubmF2aWdhdGlv blNpZGViYXIuY29sbGFwc2VkOworICAgIH0sCisKKyAgICBfZGV0YWlsc1NpZGViYXJDb2xsYXBz ZWRTdGF0ZURpZENoYW5nZTogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICBpZiAoIXRo aXMudmlzaWJsZSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9zaG93RGV0 YWlsc1NpZGViYXJJdGVtLmFjdGl2YXRlZCA9ICFXZWJJbnNwZWN0b3IuZGV0YWlsc1NpZGViYXIu Y29sbGFwc2VkOworICAgICAgICB0aGlzLl9zaG93RGV0YWlsc1NpZGViYXJJdGVtLmVuYWJsZWQg PSBXZWJJbnNwZWN0b3IuZGV0YWlsc1NpZGViYXIuc2lkZWJhclBhbmVscy5sZW5ndGg7CisKKyAg ICAgICAgaWYgKHRoaXMuX2lnbm9yZURldGFpbHNTaWRlYmFyUGFuZWxDb2xsYXBzZWRFdmVudCkK KyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLmRldGFpbHNTaWRlYmFyQ29sbGFw c2VkU2V0dGluZy52YWx1ZSA9IFdlYkluc3BlY3Rvci5kZXRhaWxzU2lkZWJhci5jb2xsYXBzZWQ7 CisgICAgfSwKKworICAgIF9kZXRhaWxzU2lkZWJhclBhbmVsU2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2 ZW50KQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLnZpc2libGUpCisgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgdGhpcy5fc2hvd0RldGFpbHNTaWRlYmFySXRlbS5lbmFibGVkID0gV2Vi SW5zcGVjdG9yLmRldGFpbHNTaWRlYmFyLnNpZGViYXJQYW5lbHMubGVuZ3RoOworCisgICAgICAg IGlmICghV2ViSW5zcGVjdG9yLmRldGFpbHNTaWRlYmFyLnNlbGVjdGVkU2lkZWJhclBhbmVsIHx8 IHRoaXMuX2lnbm9yZURldGFpbHNTaWRlYmFyUGFuZWxTZWxlY3RlZEV2ZW50KQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX2xhc3RTZWxlY3RlZERldGFpbHNTaWRlYmFyUGFu ZWxTZXR0aW5nLnZhbHVlID0gV2ViSW5zcGVjdG9yLmRldGFpbHNTaWRlYmFyLnNlbGVjdGVkU2lk ZWJhclBhbmVsLmlkZW50aWZpZXI7CisgICAgfSwKKwogICAgIF9jb250ZW50QnJvd3NlckN1cnJl bnRDb250ZW50Vmlld0RpZENoYW5nZTogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB2 YXIgY3VycmVudENvbnRlbnRWaWV3ID0gdGhpcy5fY29udGVudEJyb3dzZXIuY3VycmVudENvbnRl bnRWaWV3OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRGVidWdnZXJUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RlYnVnZ2VyVGFiQ29udGVudFZpZXcuanMKaW5kZXggMDEzNDQ3 MTAzOWJiNTQwYTliZjA1NjBhNWZiZDc2ZGQwZWRjNTk0OS4uNDMzMTE4ZmQ5OWQyNDVmZmMwYWYx ZTQ5OTI4ZTU5Y2Y0ZTIwMDExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRGVidWdnZXJUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9EZWJ1Z2dlclRhYkNvbnRlbnRWaWV3 LmpzCkBAIC01Niw2ICs1NiwyMyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJUYWJDb250ZW50Vmll dy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiByZXByZXNlbnRlZE9iamVjdC50eXBlID09 PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5Eb2N1bWVudCB8fCByZXByZXNlbnRlZE9iamVj dC50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZS5TY3JpcHQ7CiAgICAgfSwKIAor ICAgIHNob3dEZXRhaWxzU2lkZWJhclBhbmVsczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg V2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcucHJvdG90eXBlLnNob3dE ZXRhaWxzU2lkZWJhclBhbmVscy5jYWxsKHRoaXMpOworCisgICAgICAgIGlmICghdGhpcy5fc2hv d1Njb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsIHx8ICFXZWJJbnNwZWN0b3Iuc2NvcGVDaGFp bkRldGFpbHNTaWRlYmFyUGFuZWwucGFyZW50U2lkZWJhcikKKyAgICAgICAgICAgIHJldHVybjsK KworICAgICAgICBXZWJJbnNwZWN0b3Iuc2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuc2hv dygpOworCisgICAgICAgIHRoaXMuX3Nob3dTY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbCA9 IGZhbHNlOworICAgIH0sCisKKyAgICBzaG93U2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWw6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Nob3dTY29wZUNoYWluRGV0YWlsc1Np ZGViYXJQYW5lbCA9IHRydWU7CisgICAgfSwKKwogICAgIHJldmVhbEFuZFNlbGVjdEJyZWFrcG9p bnQ6IGZ1bmN0aW9uKGJyZWFrcG9pbnQpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChi cmVha3BvaW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkJyZWFrcG9pbnQpOwo=