164682 2016-11-12 11:10:26 -0800 Web Inspector: Type Profiler and Code Coverage Profiler should work in Workers 2016-12-09 16:23:31 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue joepeck mattbaker nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1250683 0 joepeck 2016-11-12 11:10:26 -0800 Summary: Type Profiler and Code Coverage Profiler should work in Workers Enable/Disable for Workers when enabling/disabling for the Page. 1250684 1 webkit-bug-importer 2016-11-12 11:13:20 -0800 <rdar://problem/29234906> 1250685 2 294621 joepeck 2016-11-12 11:13:49 -0800 Created attachment 294621 [PATCH] Proposed Fix 1250778 3 294621 darin 2016-11-12 21:18:24 -0800 Comment on attachment 294621 [PATCH] Proposed Fix Is there a way to test this code? 1250783 4 294621 commit-queue 2016-11-12 21:42:05 -0800 Comment on attachment 294621 [PATCH] Proposed Fix Clearing flags on attachment: 294621 Committed r208664: <http://trac.webkit.org/changeset/208664> 1250784 5 commit-queue 2016-11-12 21:42:09 -0800 All reviewed patches have been landed. Closing bug. 1258328 6 nvasilyev 2016-12-09 14:12:51 -0800 I noticed RuntimeAgent.enableTypeProfiler and RuntimeAgent.enableControlFlowProfiler in WebInspector.loaded method were unchanged. Was it on purpose? this.showJavaScriptTypeInformationSetting = new WebInspector.Setting("show-javascript-type-information", false); if (this.showJavaScriptTypeInformationSetting.value && window.RuntimeAgent && RuntimeAgent.enableTypeProfiler) RuntimeAgent.enableTypeProfiler(); this.enableControlFlowProfilerSetting = new WebInspector.Setting("enable-control-flow-profiler", false); if (this.enableControlFlowProfilerSetting.value && window.RuntimeAgent && RuntimeAgent.enableControlFlowProfiler) RuntimeAgent.enableControlFlowProfiler(); 1258433 7 joepeck 2016-12-09 16:06:25 -0800 (In reply to comment #6) > I noticed RuntimeAgent.enableTypeProfiler and > RuntimeAgent.enableControlFlowProfiler in WebInspector.loaded method were > unchanged. Was it on purpose? > > this.showJavaScriptTypeInformationSetting = new > WebInspector.Setting("show-javascript-type-information", false); > if (this.showJavaScriptTypeInformationSetting.value && > window.RuntimeAgent && RuntimeAgent.enableTypeProfiler) > RuntimeAgent.enableTypeProfiler(); > > this.enableControlFlowProfilerSetting = new > WebInspector.Setting("enable-control-flow-profiler", false); > if (this.enableControlFlowProfilerSetting.value && window.RuntimeAgent > && RuntimeAgent.enableControlFlowProfiler) > RuntimeAgent.enableControlFlowProfiler(); That code turns on the feature to match the initial value of the setting. The code I'm adding toggles the feature based on the setting changing. Both are necessary. 1258436 8 joepeck 2016-12-09 16:08:00 -0800 Oh I'm sorry, I commented thinking this was a different bugzilla bug. In this code no other Target will exist yet. Only the MainTarget which this is affecting. When other Targets are added, they run additional code. See WorkerTarget. 1258451 9 nvasilyev 2016-12-09 16:23:31 -0800 (In reply to comment #8) > Oh I'm sorry, I commented thinking this was a different bugzilla bug. > > In this code no other Target will exist yet. Only the MainTarget which this > is affecting. > > When other Targets are added, they run additional code. See WorkerTarget. I see, it makes sense. 294621 2016-11-12 11:13:49 -0800 2016-11-12 21:42:05 -0800 [PATCH] Proposed Fix type-profiler.patch text/plain 8839 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJiMmEwNDMuLmRlMTA4ZTg2ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTYtMTEtMTIgIEpvc2VwaCBQZWNv cmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBUeXBl IFByb2ZpbGVyIGFuZCBDb2RlIENvdmVyYWdlIFByb2ZpbGVyIHNob3VsZCB3b3JrIGluIFdvcmtl cnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NDY4 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9CYXNpY0Jsb2NrQW5ub3RhdG9yLmpzOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdFN5bnRheFRyZWUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2NyaXB0U3ludGF4VHJlZS5wcm90b3R5cGUudXBkYXRlVHlwZXMpOgorICAgICAg ICBVc2UgdGhlIHRhcmdldCBhc3NvY2lhdGVkIHdpdGggdGhlIFNjcmlwdC4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvVGFyZ2V0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LldvcmtlclRhcmdldC5wcm90b3R5cGUuaW5pdGlhbGl6ZSk6CisgICAgICAgIFdoZW4gaW5pdGlh bGl6aW5nIGEgV29ya2VyIFRhcmdldCwgbWF0Y2ggdGhlIGV4aXN0aW5nIHN0YXRlCisgICAgICAg IG9mIHRoZSBQYWdlIGZvciB0aGVzZSBwcm9maWxlcnMuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1Njb3BlQ2hhaW5EZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlLl90b2tlblRyYWNraW5nQ29u dHJvbGxlckhpZ2hsaWdodGVkSmF2YVNjcmlwdFR5cGVJbmZvcm1hdGlvbik6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlLndpbGxEaXNtaXNzUG9w b3Zlcik6CisgICAgICAgIFVzZSB0aGUgY29ycmVjdCB0YXJnZXQgZm9yIHRoaXMgU2NyaXB0IC8g UmVzb3VyY2UuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGV4dEVkaXRvci5w cm90b3R5cGUuX3NldFR5cGVUb2tlbkFubm90YXRvckVuYWJsZWRTdGF0ZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IucHJvdG90eXBlLnNldCBfYmFzaWNCbG9j a0Fubm90YXRvckVuYWJsZWQpOgorICAgICAgICBFbmFibGUgLyBkaXNhYmxlIGZvciBhbGwgdGFy Z2V0cyB3aGVuIHRvZ2dsaW5nIHByb2ZpbGVycy4KKwogMjAxNi0xMS0xMSAgSm9zZXBoIFBlY29y YXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFdvcmtl ciBkZWJ1Z2dpbmcgc2hvdWxkIHBhdXNlIGFsbCB0YXJnZXRzIGFuZCB2aWV3IGNhbGwgZnJhbWVz IGluIGFsbCB0YXJnZXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9CYXNpY0Jsb2NrQW5ub3RhdG9yLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQmFzaWNCbG9ja0Fubm90YXRvci5q cwppbmRleCAzNTlkZWUwLi5iNGI4NmY5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQmFzaWNCbG9ja0Fubm90YXRvci5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9CYXNpY0Js b2NrQW5ub3RhdG9yLmpzCkBAIC01Niw3ICs1Niw3IEBAIFdlYkluc3BlY3Rvci5CYXNpY0Jsb2Nr QW5ub3RhdG9yID0gY2xhc3MgQmFzaWNCbG9ja0Fubm90YXRvciBleHRlbmRzIFdlYkluc3BlY3Rv CiAgICAgICAgIHZhciBzb3VyY2VJRCA9IHRoaXMuX3NjcmlwdC5pZDsKICAgICAgICAgdmFyIHN0 YXJ0VGltZSA9IERhdGUubm93KCk7CiAKLSAgICAgICAgUnVudGltZUFnZW50LmdldEJhc2ljQmxv Y2tzKHNvdXJjZUlELCBmdW5jdGlvbihlcnJvciwgYmFzaWNCbG9ja3MpIHsKKyAgICAgICAgdGhp cy5fc2NyaXB0LnRhcmdldC5SdW50aW1lQWdlbnQuZ2V0QmFzaWNCbG9ja3Moc291cmNlSUQsIGZ1 bmN0aW9uKGVycm9yLCBiYXNpY0Jsb2NrcykgewogICAgICAgICAgICAgaWYgKGVycm9yKSB7CiAg ICAgICAgICAgICAgICAgY29uc29sZS5lcnJvcigiRXJyb3IgaW4gZ2V0dGluZyBiYXNpYyBibG9j ayBsb2NhdGlvbnM6ICIgKyBlcnJvcik7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdFN5 bnRheFRyZWUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv U2NyaXB0U3ludGF4VHJlZS5qcwppbmRleCA0OWRmYzZhLi4wNTA3MDI4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0U3ludGF4VHJl ZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2Ny aXB0U3ludGF4VHJlZS5qcwpAQCAtMjUzLDcgKzI1Myw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRT eW50YXhUcmVlID0gY2xhc3MgU2NyaXB0U3ludGF4VHJlZSBleHRlbmRzIFdlYkluc3BlY3Rvci5P YmplCiAgICAgICAgICAgICBjYWxsYmFjayhhbGxSZXF1ZXN0Tm9kZXMpOwogICAgICAgICB9CiAK LSAgICAgICAgUnVudGltZUFnZW50LmdldFJ1bnRpbWVUeXBlc0ZvclZhcmlhYmxlc0F0T2Zmc2V0 cyhhbGxSZXF1ZXN0cywgaGFuZGxlVHlwZXMpOworICAgICAgICB0aGlzLl9zY3JpcHQudGFyZ2V0 LlJ1bnRpbWVBZ2VudC5nZXRSdW50aW1lVHlwZXNGb3JWYXJpYWJsZXNBdE9mZnNldHMoYWxsUmVx dWVzdHMsIGhhbmRsZVR5cGVzKTsKICAgICB9CiAKICAgICAvLyBQcml2YXRlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9UYXJnZXQuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9UYXJnZXQuanMK aW5kZXggYmU3ZjQxNi4uZTg1M2Q5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvVGFyZ2V0LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1RhcmdldC5qcwpAQCAtMTQ5LDEwICsxNDksMTIg QEAgV2ViSW5zcGVjdG9yLldvcmtlclRhcmdldCA9IGNsYXNzIFdvcmtlclRhcmdldCBleHRlbmRz IFdlYkluc3BlY3Rvci5UYXJnZXQKICAgICAgICAgV2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VN YW5hZ2VyLmFkb3B0T3JwaGFuZWRSZXNvdXJjZXNGb3JUYXJnZXQodGhpcyk7CiAKICAgICAgICAg aWYgKHRoaXMuUnVudGltZUFnZW50KSB7Ci0gICAgICAgICAgICB0aGlzLlJ1bnRpbWVBZ2VudC5l bmFibGUoKTsKICAgICAgICAgICAgIHRoaXMuX2V4ZWN1dGlvbkNvbnRleHQgPSBuZXcgV2ViSW5z cGVjdG9yLkV4ZWN1dGlvbkNvbnRleHQodGhpcywgV2ViSW5zcGVjdG9yLlJ1bnRpbWVNYW5hZ2Vy LlRvcExldmVsQ29udGV4dEV4ZWN1dGlvbklkZW50aWZpZXIsIHRoaXMuZGlzcGxheU5hbWUsIGZh bHNlLCBudWxsKTsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBFbmFibGUgVHlwZSBQcm9maWxlcgot ICAgICAgICAgICAgLy8gRklYTUU6IEVuYWJsZSBDb2RlIENvdmVyYWdlIFByb2ZpbGVyCisgICAg ICAgICAgICB0aGlzLlJ1bnRpbWVBZ2VudC5lbmFibGUoKTsKKyAgICAgICAgICAgIGlmIChXZWJJ bnNwZWN0b3Iuc2hvd0phdmFTY3JpcHRUeXBlSW5mb3JtYXRpb25TZXR0aW5nICYmIFdlYkluc3Bl Y3Rvci5zaG93SmF2YVNjcmlwdFR5cGVJbmZvcm1hdGlvblNldHRpbmcudmFsdWUpCisgICAgICAg ICAgICAgICAgdGhpcy5SdW50aW1lQWdlbnQuZW5hYmxlVHlwZVByb2ZpbGVyKCk7CisgICAgICAg ICAgICBpZiAoV2ViSW5zcGVjdG9yLmVuYWJsZUNvbnRyb2xGbG93UHJvZmlsZXJTZXR0aW5nICYm IFdlYkluc3BlY3Rvci5lbmFibGVDb250cm9sRmxvd1Byb2ZpbGVyU2V0dGluZy52YWx1ZSkKKyAg ICAgICAgICAgICAgICB0aGlzLlJ1bnRpbWVBZ2VudC5lbmFibGVDb250cm9sRmxvd1Byb2ZpbGVy KCk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAodGhpcy5EZWJ1Z2dlckFnZW50KQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NvcGVDaGFp bkRldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCBiZTUxMjlm Li4wZGY5YWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY29wZUNoYWluRGV0YWlsc1NpZGViYXJQ YW5lbC5qcwpAQCAtMjY4LDEyICsyNjgsMTQgQEAgV2ViSW5zcGVjdG9yLlNjb3BlQ2hhaW5EZXRh aWxzU2lkZWJhclBhbmVsID0gY2xhc3MgU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwKICAg ICAgICAgaWYgKCF3YXRjaEV4cHJlc3Npb25zLmxlbmd0aCkgewogICAgICAgICAgICAgaWYgKHRo aXMuX3VzZWRXYXRjaEV4cHJlc3Npb25zT2JqZWN0R3JvdXApIHsKICAgICAgICAgICAgICAgICB0 aGlzLl91c2VkV2F0Y2hFeHByZXNzaW9uc09iamVjdEdyb3VwID0gZmFsc2U7Ci0gICAgICAgICAg ICAgICAgUnVudGltZUFnZW50LnJlbGVhc2VPYmplY3RHcm91cChXZWJJbnNwZWN0b3IuU2NvcGVD aGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuV2F0Y2hFeHByZXNzaW9uc09iamVjdEdyb3VwTmFtZSk7 CisgICAgICAgICAgICAgICAgZm9yIChsZXQgdGFyZ2V0IG9mIFdlYkluc3BlY3Rvci50YXJnZXRz KQorICAgICAgICAgICAgICAgICAgICB0YXJnZXQuUnVudGltZUFnZW50LnJlbGVhc2VPYmplY3RH cm91cChXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRlYmFyUGFuZWwuV2F0Y2hFeHBy ZXNzaW9uc09iamVjdEdyb3VwTmFtZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1 cm4gUHJvbWlzZS5yZXNvbHZlKG51bGwpOwogICAgICAgICB9CiAKLSAgICAgICAgUnVudGltZUFn ZW50LnJlbGVhc2VPYmplY3RHcm91cChXZWJJbnNwZWN0b3IuU2NvcGVDaGFpbkRldGFpbHNTaWRl YmFyUGFuZWwuV2F0Y2hFeHByZXNzaW9uc09iamVjdEdyb3VwTmFtZSk7CisgICAgICAgIGZvciAo bGV0IHRhcmdldCBvZiBXZWJJbnNwZWN0b3IudGFyZ2V0cykKKyAgICAgICAgICAgIHRhcmdldC5S dW50aW1lQWdlbnQucmVsZWFzZU9iamVjdEdyb3VwKFdlYkluc3BlY3Rvci5TY29wZUNoYWluRGV0 YWlsc1NpZGViYXJQYW5lbC5XYXRjaEV4cHJlc3Npb25zT2JqZWN0R3JvdXBOYW1lKTsKICAgICAg ICAgdGhpcy5fdXNlZFdhdGNoRXhwcmVzc2lvbnNPYmplY3RHcm91cCA9IHRydWU7CiAKICAgICAg ICAgbGV0IHdhdGNoRXhwcmVzc2lvbnNSZW1vdGVPYmplY3QgPSBXZWJJbnNwZWN0b3IuUmVtb3Rl T2JqZWN0LmNyZWF0ZUZha2VSZW1vdGVPYmplY3QoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRF ZGl0b3IuanMKaW5kZXggOGFiNTg5Yi4uYmM4MTNlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlQ29kZVRl eHRFZGl0b3IuanMKQEAgLTE1ODksNyArMTU4OSw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2Rl VGV4dEVkaXRvciA9IGNsYXNzIFNvdXJjZUNvZGVUZXh0RWRpdG9yIGV4dGVuZHMgV2ViSW5zcGVj CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBSdW50aW1lQWdlbnQuZ2V0UnVu dGltZVR5cGVzRm9yVmFyaWFibGVzQXRPZmZzZXRzKGFsbFJlcXVlc3RzLCBoYW5kbGVyLmJpbmQo dGhpcykpOworICAgICAgICB0aGlzLnRhcmdldC5SdW50aW1lQWdlbnQuZ2V0UnVudGltZVR5cGVz Rm9yVmFyaWFibGVzQXRPZmZzZXRzKGFsbFJlcXVlc3RzLCBoYW5kbGVyLmJpbmQodGhpcykpOwog ICAgIH0KIAogICAgIF9zaG93UG9wb3Zlcihjb250ZW50LCBib3VuZHMpCkBAIC0xNzMxLDcgKzE3 MzEsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IgPSBjbGFzcyBTb3VyY2VD b2RlVGV4dEVkaXRvciBleHRlbmRzIFdlYkluc3BlYwogICAgIHsKICAgICAgICAgdGhpcy50b2tl blRyYWNraW5nQ29udHJvbGxlci5yZW1vdmVIaWdobGlnaHRlZFJhbmdlKCk7CiAKLSAgICAgICAg UnVudGltZUFnZW50LnJlbGVhc2VPYmplY3RHcm91cCgicG9wb3ZlciIpOworICAgICAgICB0aGlz LnRhcmdldC5SdW50aW1lQWdlbnQucmVsZWFzZU9iamVjdEdyb3VwKCJwb3BvdmVyIik7CiAgICAg fQogCiAgICAgX2Rpc21pc3NQb3BvdmVyKCkKQEAgLTE4NzAsMTMgKzE4NzAsMTggQEAgV2ViSW5z cGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRpdG9yID0gY2xhc3MgU291cmNlQ29kZVRleHRFZGl0b3Ig ZXh0ZW5kcyBXZWJJbnNwZWMKIAogICAgICAgICBpZiAoc2hvdWxkQWN0aXZhdGUpIHsKICAgICAg ICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMudmlzaWJsZSwgIkFubm90YXRvcnMgc2hvdWxkIG5v dCBiZSBlbmFibGVkIGlmIHRoZSBUZXh0RWRpdG9yIGlzIG5vdCB2aXNpYmxlIik7Ci0gICAgICAg ICAgICBSdW50aW1lQWdlbnQuZW5hYmxlVHlwZVByb2ZpbGVyKCk7CisKKyAgICAgICAgICAgIGZv ciAobGV0IHRhcmdldCBvZiBXZWJJbnNwZWN0b3IudGFyZ2V0cykKKyAgICAgICAgICAgICAgICB0 YXJnZXQuUnVudGltZUFnZW50LmVuYWJsZVR5cGVQcm9maWxlcigpOworCiAgICAgICAgICAgICB0 aGlzLl90eXBlVG9rZW5Bbm5vdGF0b3IucmVzZXQoKTsKIAogICAgICAgICAgICAgaWYgKCF0aGlz Ll90eXBlVG9rZW5TY3JvbGxIYW5kbGVyKQogICAgICAgICAgICAgICAgIHRoaXMuX2VuYWJsZVNj cm9sbEV2ZW50c0ZvclR5cGVUb2tlbkFubm90YXRvcigpOwogICAgICAgICB9IGVsc2UgewotICAg ICAgICAgICAgUnVudGltZUFnZW50LmRpc2FibGVUeXBlUHJvZmlsZXIoKTsKKyAgICAgICAgICAg IGZvciAobGV0IHRhcmdldCBvZiBXZWJJbnNwZWN0b3IudGFyZ2V0cykKKyAgICAgICAgICAgICAg ICB0YXJnZXQuUnVudGltZUFnZW50LmRpc2FibGVUeXBlUHJvZmlsZXIoKTsKKwogICAgICAgICAg ICAgdGhpcy5fdHlwZVRva2VuQW5ub3RhdG9yLmNsZWFyKCk7CiAKICAgICAgICAgICAgIGlmICh0 aGlzLl90eXBlVG9rZW5TY3JvbGxIYW5kbGVyKQpAQCAtMTg5Niw3ICsxOTAxLDggQEAgV2ViSW5z cGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRpdG9yID0gY2xhc3MgU291cmNlQ29kZVRleHRFZGl0b3Ig ZXh0ZW5kcyBXZWJJbnNwZWMKICAgICAgICAgaWYgKHNob3VsZEFjdGl2YXRlKSB7CiAgICAgICAg ICAgICBjb25zb2xlLmFzc2VydCh0aGlzLnZpc2libGUsICJBbm5vdGF0b3JzIHNob3VsZCBub3Qg YmUgZW5hYmxlZCBpZiB0aGUgVGV4dEVkaXRvciBpcyBub3QgdmlzaWJsZSIpOwogCi0gICAgICAg ICAgICBSdW50aW1lQWdlbnQuZW5hYmxlQ29udHJvbEZsb3dQcm9maWxlcigpOworICAgICAgICAg ICAgZm9yIChsZXQgdGFyZ2V0IG9mIFdlYkluc3BlY3Rvci50YXJnZXRzKQorICAgICAgICAgICAg ICAgIHRhcmdldC5SdW50aW1lQWdlbnQuZW5hYmxlQ29udHJvbEZsb3dQcm9maWxlcigpOwogCiAg ICAgICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5fYmFzaWNCbG9ja0Fubm90YXRvci5pc0Fj dGl2ZSgpKTsKICAgICAgICAgICAgIHRoaXMuX2Jhc2ljQmxvY2tBbm5vdGF0b3IucmVzZXQoKTsK QEAgLTE5MDQsNyArMTkxMCw5IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGV4dEVkaXRvciA9 IGNsYXNzIFNvdXJjZUNvZGVUZXh0RWRpdG9yIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgICAg ICBpZiAoIXRoaXMuX2NvbnRyb2xGbG93U2Nyb2xsSGFuZGxlcikKICAgICAgICAgICAgICAgICB0 aGlzLl9lbmFibGVTY3JvbGxFdmVudHNGb3JDb250cm9sRmxvd0Fubm90YXRvcigpOwogICAgICAg ICB9IGVsc2UgewotICAgICAgICAgICAgUnVudGltZUFnZW50LmRpc2FibGVDb250cm9sRmxvd1By b2ZpbGVyKCk7CisgICAgICAgICAgICBmb3IgKGxldCB0YXJnZXQgb2YgV2ViSW5zcGVjdG9yLnRh cmdldHMpCisgICAgICAgICAgICAgICAgdGFyZ2V0LlJ1bnRpbWVBZ2VudC5kaXNhYmxlQ29udHJv bEZsb3dQcm9maWxlcigpOworCiAgICAgICAgICAgICB0aGlzLl9iYXNpY0Jsb2NrQW5ub3RhdG9y LmNsZWFyKCk7CiAKICAgICAgICAgICAgIGlmICh0aGlzLl9jb250cm9sRmxvd1Njcm9sbEhhbmRs ZXIpCg==