198803 2019-06-12 14:13:42 -0700 Web Inspector: Settings: split the General panel into sub panels so it's less crowded 2019-06-17 12:33:14 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1544226 0 hi 2019-06-12 14:13:42 -0700 It's a bit odd to have all of the "* Logging" be next to settings related to "Element Selection". Now that we have "enough" settings, it makes some sense to split it into separate panels (e.g. Elements, Console, Sources, etc.). 1544235 1 371986 hi 2019-06-12 14:39:12 -0700 Created attachment 371986 Patch 1545361 2 371986 commit-queue 2019-06-17 12:32:17 -0700 Comment on attachment 371986 Patch Clearing flags on attachment: 371986 Committed r246510: <https://trac.webkit.org/changeset/246510> 1545362 3 commit-queue 2019-06-17 12:32:19 -0700 All reviewed patches have been landed. Closing bug. 1545364 4 webkit-bug-importer 2019-06-17 12:33:14 -0700 <rdar://problem/51816245> 371986 2019-06-12 14:39:12 -0700 2019-06-17 12:32:17 -0700 Patch bug-198803-20190612143911.patch text/plain 10759 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGVhZWNhZTE1YmI1MWIzNGYyODAwZGM2YjU0YmU3 MjEzM2FkNzM2MGUuLmQxZjJkMjY1NzYwOTdkM2M2ZDllMjg0M2E3ZjY2YThlZGNhMjdmZTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTA2LTEyICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT ZXR0aW5nczogc3BsaXQgdGhlIEdlbmVyYWwgcGFuZWwgaW50byBzdWIgcGFuZWxzIHNvIGl0J3Mg bGVzcyBjcm93ZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xOTg4MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qczoKKyAg ICAgICAgKFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLmluaXRpYWxMYXlvdXQp OgorICAgICAgICAoV0kuU2V0dGluZ3NUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuX2NyZWF0ZUdl bmVyYWxTZXR0aW5nc1ZpZXcpOgorICAgICAgICBNYW55IG9mIHRoZSBzZXR0aW5ncyBpbiBHZW5l cmFsIG9ubHkgYWZmZWN0IGEgc3BlY2lmaWMgcGFydCBvZiBXZWIgSW5zcGVjdG9yLCBhbmQgdGhl cmVmb3JlCisgICAgICAgIGFyZW4ndCByZWFsbHkgImdlbmVyYWwiLgorCisgICAgICAgIChXSS5T ZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRWxlbWVudHNTZXR0aW5nc1Zp ZXcpOiBBZGRlZC4KKyAgICAgICAgIC0gRWxlbWVudCBTZWxlY3Rpb24KKyAgICAgICAgIC0gQ1NT IENoYW5nZXMKKworICAgICAgICAoV0kuU2V0dGluZ3NUYWJDb250ZW50Vmlldy5wcm90b3R5cGUu X2NyZWF0ZVNvdXJjZXNTZXR0aW5nc1ZpZXcpOiBBZGRlZC4KKyAgICAgICAgIC0gRGVidWdnZXIK KyAgICAgICAgIC0gU291cmNlIE1hcHMKKworICAgICAgICAoV0kuU2V0dGluZ3NUYWJDb250ZW50 Vmlldy5wcm90b3R5cGUuX2NyZWF0ZUNvbnNvbGVTZXR0aW5nc1ZpZXcpOiBBZGRlZC4KKyAgICAg ICAgIC0gVHJhY2VzIChyZW5hbWVkIGZyb20gIkNvbnNvbGUiKQorICAgICAgICAgLSBXZWJSVEMg TG9nZ2luZworICAgICAgICAgLSBNZWRpYSBMb2dnaW5nCisgICAgICAgICAtIE1TRSBMb2dnaW5n CisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6 CisKIDIwMTktMDYtMTAgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFRpbWVsaW5lczogaW1wb3J0ZWQgcmVjb3JkaW5ncyBkbyBub3Qg aGF2ZSBKYXZhU2NyaXB0IGNhbGwgdHJlZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz CmluZGV4IDlhM2M5ZWE0YzRhMzVlOThjMGFhNjQ0MGFlZTNmYzkxYWFlMTYyOTYuLmRlNzliNTRh YmE4MjQ1N2U5ZWI3Yjk4YzQzODA4OGIwNzMwYjQwNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcwpAQCAtMTQ4LDcgKzE0OCw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIkF1dGhvciBT dHlsZXNoZWV0Il0gPSAiQXV0aG9yIFN0eWxlc2hlZXQiOwogbG9jYWxpemVkU3RyaW5nc1siQXV0 byJdID0gIkF1dG8iOwogbG9jYWxpemVkU3RyaW5nc1siQXV0byAtICVzIl0gPSAiQXV0byAtICVz IjsKIGxvY2FsaXplZFN0cmluZ3NbIkF1dG8gSW5jcmVtZW50Il0gPSAiQXV0byBJbmNyZW1lbnQi OwotbG9jYWxpemVkU3RyaW5nc1siQXV0by1leHBhbmQgVHJhY2VzIl0gPSAiQXV0by1leHBhbmQg VHJhY2VzIjsKK2xvY2FsaXplZFN0cmluZ3NbIkF1dG8tZXhwYW5kIl0gPSAiQXV0by1leHBhbmQi OwogbG9jYWxpemVkU3RyaW5nc1siQXV0b21hdGljYWxseSBjb250aW51ZSBhZnRlciBldmFsdWF0 aW5nIl0gPSAiQXV0b21hdGljYWxseSBjb250aW51ZSBhZnRlciBldmFsdWF0aW5nIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkF2YWlsYWJsZSBTdHlsZSBTaGVldHMiXSA9ICJBdmFpbGFibGUgU3R5bGUg U2hlZXRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkF2ZXJhZ2UgQ1BVOiAlcyJdID0gIkF2ZXJhZ2Ug Q1BVOiAlcyI7CkBAIC0yNzAsNyArMjcwLDYgQEAgbG9jYWxpemVkU3RyaW5nc1siQ29uc29sZSBF dmFsdWF0aW9uICVkIl0gPSAiQ29uc29sZSBFdmFsdWF0aW9uICVkIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkNvbnNvbGUgUHJvZmlsZSBSZWNvcmRlZCJdID0gIkNvbnNvbGUgUHJvZmlsZSBSZWNvcmRl ZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb25zb2xlIGNsZWFyZWQgYXQgJXMiXSA9ICJDb25zb2xl IGNsZWFyZWQgYXQgJXMiOwogbG9jYWxpemVkU3RyaW5nc1siQ29uc29sZSBvcGVuZWQgYXQgJXMi XSA9ICJDb25zb2xlIG9wZW5lZCBhdCAlcyI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJDb25zb2xlOiJd ID0gIkNvbnNvbGU6IjsKIGxvY2FsaXplZFN0cmluZ3NbIkNvbnRhaW5pbmciXSA9ICJDb250YWlu aW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNvbnRlbnQiXSA9ICJDb250ZW50IjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkNvbnRlbnQgU2VjdXJpdHkgUG9saWN5IHZpb2xhdGlvbiBvZiBkaXJlY3RpdmU6 ICVzIl0gPSAiQ29udGVudCBTZWN1cml0eSBQb2xpY3kgdmlvbGF0aW9uIG9mIGRpcmVjdGl2ZTog JXMiOwpAQCAtMTAwNiw3ICsxMDA1LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siU29ja2V0cyJdID0g IlNvY2tldHMiOwogbG9jYWxpemVkU3RyaW5nc1siU29ydCBBc2NlbmRpbmciXSA9ICJTb3J0IEFz Y2VuZGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTb3J0IERlc2NlbmRpbmciXSA9ICJTb3J0IERl c2NlbmRpbmciOwogbG9jYWxpemVkU3RyaW5nc1siU291cmNlIl0gPSAiU291cmNlIjsKLWxvY2Fs aXplZFN0cmluZ3NbIlNvdXJjZSBtYXBzOiJdID0gIlNvdXJjZSBtYXBzOiI7Citsb2NhbGl6ZWRT dHJpbmdzWyJTb3VyY2UgTWFwczoiXSA9ICJTb3VyY2UgTWFwczoiOwogbG9jYWxpemVkU3RyaW5n c1siU291cmNlcyJdID0gIlNvdXJjZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU291cmNlczoiXSA9 ICJTb3VyY2VzOiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTcGFjZSJdID0gIlNwYWNlIjsKQEAgLTEx MjIsNiArMTEyMSw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIlRvdGFsOiAlcyJdID0gIlRvdGFsOiAl cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUb3RhbHM6Il0gPSAiVG90YWxzOiI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJUcmFjZSJdID0gIlRyYWNlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlRyYWNlOiAlcyJd ID0gIlRyYWNlOiAlcyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJUcmFjZXM6Il0gPSAiVHJhY2VzOiI7 CiAvKiBBbW91bnQgb2YgZGF0YSBzZW50IG92ZXIgdGhlIG5ldHdvcmsgZm9yIGEgc2luZ2xlIHJl c291cmNlICovCiBsb2NhbGl6ZWRTdHJpbmdzWyJUcmFuc2ZlciBTaXplIl0gPSAiVHJhbnNmZXIg U2l6ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUcmFuc2ZlcnJlZCJdID0gIlRyYW5zZmVycmVkIjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nl dHRpbmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IGQxYjA2MjEzOTQ5MTkz MTg5NjNjZmE2YmI5MjJlOTFjNzIxZTY2OTguLjE0YWFkZWRkYzA1ZDhiNmQ5MzBlMGFkZjVlMjA1 NzMwMTYxZmZiOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAt MTYyLDYgKzE2Miw5IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5n c1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAgICAgICAgIHRoaXMuYWRk U3Vidmlldyh0aGlzLl9uYXZpZ2F0aW9uQmFyKTsKIAogICAgICAgICB0aGlzLl9jcmVhdGVHZW5l cmFsU2V0dGluZ3NWaWV3KCk7CisgICAgICAgIHRoaXMuX2NyZWF0ZUVsZW1lbnRzU2V0dGluZ3NW aWV3KCk7CisgICAgICAgIHRoaXMuX2NyZWF0ZVNvdXJjZXNTZXR0aW5nc1ZpZXcoKTsKKyAgICAg ICAgdGhpcy5fY3JlYXRlQ29uc29sZVNldHRpbmdzVmlldygpOwogICAgICAgICB0aGlzLl9jcmVh dGVFeHBlcmltZW50YWxTZXR0aW5nc1ZpZXcoKTsKIAogICAgICAgICBXSS5ub3RpZmljYXRpb25z LmFkZEV2ZW50TGlzdGVuZXIoV0kuTm90aWZpY2F0aW9uLkRlYnVnVUlFbmFibGVkRGlkQ2hhbmdl LCB0aGlzLl91cGRhdGVEZWJ1Z1NldHRpbmdzVmlld1Zpc2liaWxpdHksIHRoaXMpOwpAQCAtMTc3 LDcgKzE4MCw2IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1Rh YkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAgICAgICAgIGxldCBnZW5lcmFs U2V0dGluZ3NWaWV3ID0gbmV3IFdJLlNldHRpbmdzVmlldygiZ2VuZXJhbCIsIFdJLlVJU3RyaW5n KCJHZW5lcmFsIikpOwogCiAgICAgICAgIGNvbnN0IGluZGVudFZhbHVlcyA9IFtXSS5VSVN0cmlu ZygiVGFicyIpLCBXSS5VSVN0cmluZygiU3BhY2VzIildOwotCiAgICAgICAgIGxldCBpbmRlbnRF ZGl0b3IgPSBnZW5lcmFsU2V0dGluZ3NWaWV3LmFkZEdyb3VwV2l0aEN1c3RvbVNldHRpbmcoV0ku VUlTdHJpbmcoIlByZWZlciBpbmRlbnQgdXNpbmc6IiksIFdJLlNldHRpbmdFZGl0b3IuVHlwZS5T ZWxlY3QsIHt2YWx1ZXM6IGluZGVudFZhbHVlc30pOwogICAgICAgICBpbmRlbnRFZGl0b3IudmFs dWUgPSBpbmRlbnRWYWx1ZXNbV0kuc2V0dGluZ3MuaW5kZW50V2l0aFRhYnMudmFsdWUgPyAwIDog MV07CiAgICAgICAgIGluZGVudEVkaXRvci5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmdFZGl0 b3IuRXZlbnQuVmFsdWVEaWRDaGFuZ2UsICgpID0+IHsKQEAgLTIwNiwyOCArMjA4LDEyIEBAIFdJ LlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4 dGVuZHMgV0kuVGFiQ29udGVudFZpCiAKICAgICAgICAgZ2VuZXJhbFNldHRpbmdzVmlldy5hZGRT ZXBhcmF0b3IoKTsKIAotICAgICAgICBnZW5lcmFsU2V0dGluZ3NWaWV3LmFkZFNldHRpbmcoV0ku VUlTdHJpbmcoIkRlYnVnZ2VyOiIpLCBXSS5zZXR0aW5ncy5zaG93U2NvcGVDaGFpbk9uUGF1c2Us IFdJLlVJU3RyaW5nKCJTaG93IFNjb3BlIENoYWluIG9uIHBhdXNlIikpOwotICAgICAgICBnZW5l cmFsU2V0dGluZ3NWaWV3LmFkZFNldHRpbmcoV0kuVUlTdHJpbmcoIlNvdXJjZSBtYXBzOiIpLCBX SS5zZXR0aW5ncy5zb3VyY2VNYXBzRW5hYmxlZCwgV0kuVUlTdHJpbmcoIkVuYWJsZSBzb3VyY2Ug bWFwcyIpKTsKLSAgICAgICAgZ2VuZXJhbFNldHRpbmdzVmlldy5hZGRTZXR0aW5nKFdJLlVJU3Ry aW5nKCJDb25zb2xlOiIpLCBXSS5zZXR0aW5ncy5jb25zb2xlQXV0b0V4cGFuZFRyYWNlLCBXSS5V SVN0cmluZygiQXV0by1leHBhbmQgVHJhY2VzIikpOwotCi0gICAgICAgIGdlbmVyYWxTZXR0aW5n c1ZpZXcuYWRkU2VwYXJhdG9yKCk7Ci0KICAgICAgICAgbGV0IHNlYXJjaEdyb3VwID0gZ2VuZXJh bFNldHRpbmdzVmlldy5hZGRHcm91cChXSS5VSVN0cmluZygiU2VhcmNoOiIsICJTZWFyY2g6IEAg U2V0dGluZ3MiLCAiU2V0dGluZ3MgdGFiIGxhYmVsIGZvciBzZWFyY2ggcmVsYXRlZCBzZXR0aW5n cyIpKTsKICAgICAgICAgc2VhcmNoR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5zZWFyY2hD YXNlU2Vuc2l0aXZlLCBXSS5VSVN0cmluZygiQ2FzZSBTZW5zaXRpdmUiLCAiQ2FzZSBTZW5zaXRp dmUgQCBTZXR0aW5ncyIsICJTZXR0aW5ncyB0YWIgY2hlY2tib3ggbGFiZWwgZm9yIHdoZXRoZXIg c2VhcmNoZXMgc2hvdWxkIGJlIGNhc2Ugc2Vuc2l0aXZlLiIpKTsKICAgICAgICAgc2VhcmNoR3Jv dXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5zZWFyY2hSZWd1bGFyRXhwcmVzc2lvbiwgV0kuVUlT dHJpbmcoIlJlZ3VsYXIgRXhwcmVzc2lvbiIsICJSZWd1bGFyIEV4cHJlc3Npb24gQCBTZXR0aW5n cyIsICJTZXR0aW5ncyB0YWIgY2hlY2tib3ggbGFiZWwgZm9yIHdoZXRoZXIgc2VhcmNoZXMgc2hv dWxkIGJlIHRyZWF0ZWQgYXMgcmVndWxhciBleHByZXNzaW9ucy4iKSk7CiAKICAgICAgICAgZ2Vu ZXJhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKIAotICAgICAgICBnZW5lcmFsU2V0dGlu Z3NWaWV3LmFkZFNldHRpbmcoV0kuVUlTdHJpbmcoIkNTUyBDaGFuZ2VzOiIpLCBXSS5zZXR0aW5n cy5jc3NDaGFuZ2VzUGVyTm9kZSwgV0kuVUlTdHJpbmcoIlNob3cgb25seSBmb3Igc2VsZWN0ZWQg bm9kZSIpKTsKLQotICAgICAgICBnZW5lcmFsU2V0dGluZ3NWaWV3LmFkZFNlcGFyYXRvcigpOwot Ci0gICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuRE9NICYmIEluc3BlY3RvckJh Y2tlbmQuZG9tYWlucy5ET00uc2V0SW5zcGVjdE1vZGVFbmFibGVkICYmIEluc3BlY3RvckJhY2tl bmQuZG9tYWlucy5ET00uc2V0SW5zcGVjdE1vZGVFbmFibGVkLnN1cHBvcnRzKCJzaG93UnVsZXJz IikpIHsKLSAgICAgICAgICAgIGdlbmVyYWxTZXR0aW5nc1ZpZXcuYWRkU2V0dGluZyhXSS5VSVN0 cmluZygiRWxlbWVudCBTZWxlY3Rpb246IiksIFdJLnNldHRpbmdzLnNob3dSdWxlcnNEdXJpbmdF bGVtZW50U2VsZWN0aW9uLCBXSS5VSVN0cmluZygiU2hvdyBwYWdlIHJ1bGVycyBhbmQgbm9kZSBi b3JkZXIgbGluZXMiKSk7Ci0KLSAgICAgICAgICAgIGdlbmVyYWxTZXR0aW5nc1ZpZXcuYWRkU2Vw YXJhdG9yKCk7Ci0gICAgICAgIH0KLQogICAgICAgICBjb25zdCB6b29tTGV2ZWxzID0gWzAuNiwg MC44LCAxLCAxLjIsIDEuNCwgMS42LCAxLjgsIDIsIDIuMiwgMi40XTsKICAgICAgICAgY29uc3Qg em9vbVZhbHVlcyA9IHpvb21MZXZlbHMubWFwKChsZXZlbCkgPT4gW2xldmVsLCBOdW1iZXIucGVy Y2VudGFnZVN0cmluZyhsZXZlbCwgMCldKTsKIApAQCAtMjM2LDcgKzIyMiw0OSBAQCBXSS5TZXR0 aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRz IFdJLlRhYkNvbnRlbnRWaQogICAgICAgICB6b29tRWRpdG9yLmFkZEV2ZW50TGlzdGVuZXIoV0ku U2V0dGluZ0VkaXRvci5FdmVudC5WYWx1ZURpZENoYW5nZSwgKCkgPT4geyBXSS5zZXRab29tRmFj dG9yKHpvb21FZGl0b3IudmFsdWUpOyB9KTsKICAgICAgICAgV0kuc2V0dGluZ3Muem9vbUZhY3Rv ci5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQuQ2hhbmdlZCwgKCkgPT4geyB6b29t RWRpdG9yLnZhbHVlID0gV0kuZ2V0Wm9vbUZhY3RvcigpLm1heERlY2ltYWxzKDIpOyB9KTsKIAor ICAgICAgICB0aGlzLmFkZFNldHRpbmdzVmlldyhnZW5lcmFsU2V0dGluZ3NWaWV3KTsKKyAgICB9 CisKKyAgICBfY3JlYXRlRWxlbWVudHNTZXR0aW5nc1ZpZXcoKQorICAgIHsKKyAgICAgICAgaWYg KCFJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuRE9NKQorICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgIGxldCBlbGVtZW50c1NldHRpbmdzVmlldyA9IG5ldyBXSS5TZXR0aW5nc1ZpZXcoImVs ZW1lbnRzIiwgV0kuVUlTdHJpbmcoIkVsZW1lbnRzIikpOworCisgICAgICAgIGlmIChJbnNwZWN0 b3JCYWNrZW5kLmRvbWFpbnMuRE9NLnNldEluc3BlY3RNb2RlRW5hYmxlZCAmJiBJbnNwZWN0b3JC YWNrZW5kLmRvbWFpbnMuRE9NLnNldEluc3BlY3RNb2RlRW5hYmxlZC5zdXBwb3J0cygic2hvd1J1 bGVycyIpKSB7CisgICAgICAgICAgICBlbGVtZW50c1NldHRpbmdzVmlldy5hZGRTZXR0aW5nKFdJ LlVJU3RyaW5nKCJFbGVtZW50IFNlbGVjdGlvbjoiKSwgV0kuc2V0dGluZ3Muc2hvd1J1bGVyc0R1 cmluZ0VsZW1lbnRTZWxlY3Rpb24sIFdJLlVJU3RyaW5nKCJTaG93IHBhZ2UgcnVsZXJzIGFuZCBu b2RlIGJvcmRlciBsaW5lcyIpKTsKKworICAgICAgICAgICAgZWxlbWVudHNTZXR0aW5nc1ZpZXcu YWRkU2VwYXJhdG9yKCk7CisgICAgICAgIH0KKworICAgICAgICBlbGVtZW50c1NldHRpbmdzVmll dy5hZGRTZXR0aW5nKFdJLlVJU3RyaW5nKCJDU1MgQ2hhbmdlczoiKSwgV0kuc2V0dGluZ3MuY3Nz Q2hhbmdlc1Blck5vZGUsIFdJLlVJU3RyaW5nKCJTaG93IG9ubHkgZm9yIHNlbGVjdGVkIG5vZGUi KSk7CisKKyAgICAgICAgdGhpcy5hZGRTZXR0aW5nc1ZpZXcoZWxlbWVudHNTZXR0aW5nc1ZpZXcp OworICAgIH0KKworICAgIF9jcmVhdGVTb3VyY2VzU2V0dGluZ3NWaWV3KCkKKyAgICB7CisgICAg ICAgIGxldCBzb3VyY2VzU2V0dGluZ3NWaWV3ID0gbmV3IFdJLlNldHRpbmdzVmlldygic291cmNl cyIsIFdJLlVJU3RyaW5nKCJTb3VyY2VzIikpOworCisgICAgICAgIHNvdXJjZXNTZXR0aW5nc1Zp ZXcuYWRkU2V0dGluZyhXSS5VSVN0cmluZygiRGVidWdnZXI6IiksIFdJLnNldHRpbmdzLnNob3dT Y29wZUNoYWluT25QYXVzZSwgV0kuVUlTdHJpbmcoIlNob3cgU2NvcGUgQ2hhaW4gb24gcGF1c2Ui KSk7CisKKyAgICAgICAgc291cmNlc1NldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKKworICAg ICAgICBzb3VyY2VzU2V0dGluZ3NWaWV3LmFkZFNldHRpbmcoV0kuVUlTdHJpbmcoIlNvdXJjZSBN YXBzOiIpLCBXSS5zZXR0aW5ncy5zb3VyY2VNYXBzRW5hYmxlZCwgV0kuVUlTdHJpbmcoIkVuYWJs ZSBzb3VyY2UgbWFwcyIpKTsKKworICAgICAgICB0aGlzLmFkZFNldHRpbmdzVmlldyhzb3VyY2Vz U2V0dGluZ3NWaWV3KTsKKyAgICB9CisKKyAgICBfY3JlYXRlQ29uc29sZVNldHRpbmdzVmlldygp CisgICAgeworICAgICAgICBsZXQgY29uc29sZVNldHRpbmdzVmlldyA9IG5ldyBXSS5TZXR0aW5n c1ZpZXcoImNvbnNvbGUiLCBXSS5VSVN0cmluZygiQ29uc29sZSIpKTsKKworICAgICAgICBjb25z b2xlU2V0dGluZ3NWaWV3LmFkZFNldHRpbmcoV0kuVUlTdHJpbmcoIlRyYWNlczoiKSwgV0kuc2V0 dGluZ3MuY29uc29sZUF1dG9FeHBhbmRUcmFjZSwgV0kuVUlTdHJpbmcoIkF1dG8tZXhwYW5kIikp OworCiAgICAgICAgIGlmIChXSS5Db25zb2xlTWFuYWdlci5zdXBwb3J0c0xvZ0NoYW5uZWxzKCkp IHsKKyAgICAgICAgICAgIGNvbnNvbGVTZXR0aW5nc1ZpZXcuYWRkU2VwYXJhdG9yKCk7CisKICAg ICAgICAgICAgIGNvbnN0IGxvZ0xldmVscyA9IFsKICAgICAgICAgICAgICAgICBbV0kuTG9nZ2lu Z0NoYW5uZWwuTGV2ZWwuT2ZmLCBXSS5VSVN0cmluZygiT2ZmIildLAogICAgICAgICAgICAgICAg IFtXSS5Mb2dnaW5nQ2hhbm5lbC5MZXZlbC5CYXNpYywgV0kuVUlTdHJpbmcoIkJhc2ljIildLApA QCAtMjUwLDcgKzI3OCw3IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0 aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAKICAgICAgICAgICAg IGxldCBjaGFubmVscyA9IFdJLmNvbnNvbGVNYW5hZ2VyLmN1c3RvbUxvZ2dpbmdDaGFubmVsczsK ICAgICAgICAgICAgIGZvciAobGV0IGNoYW5uZWwgb2YgY2hhbm5lbHMpIHsKLSAgICAgICAgICAg ICAgICBsZXQgbG9nRWRpdG9yID0gZ2VuZXJhbFNldHRpbmdzVmlldy5hZGRHcm91cFdpdGhDdXN0 b21TZXR0aW5nKGVkaXRvckxhYmVsc1tjaGFubmVsLnNvdXJjZV0sIFdJLlNldHRpbmdFZGl0b3Iu VHlwZS5TZWxlY3QsIHt2YWx1ZXM6IGxvZ0xldmVsc30pOworICAgICAgICAgICAgICAgIGxldCBs b2dFZGl0b3IgPSBjb25zb2xlU2V0dGluZ3NWaWV3LmFkZEdyb3VwV2l0aEN1c3RvbVNldHRpbmco ZWRpdG9yTGFiZWxzW2NoYW5uZWwuc291cmNlXSwgV0kuU2V0dGluZ0VkaXRvci5UeXBlLlNlbGVj dCwge3ZhbHVlczogbG9nTGV2ZWxzfSk7CiAgICAgICAgICAgICAgICAgbG9nRWRpdG9yLnZhbHVl ID0gY2hhbm5lbC5sZXZlbDsKICAgICAgICAgICAgICAgICBsb2dFZGl0b3IuYWRkRXZlbnRMaXN0 ZW5lcihXSS5TZXR0aW5nRWRpdG9yLkV2ZW50LlZhbHVlRGlkQ2hhbmdlLCAoKSA9PiB7CiAgICAg ICAgICAgICAgICAgICAgIGZvciAobGV0IHRhcmdldCBvZiBXSS50YXJnZXRzKQpAQCAtMjU5LDcg KzI4Nyw3IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNv bnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAgICAgICAgICAgICB9CiAgICAgICAg IH0KIAotICAgICAgICB0aGlzLmFkZFNldHRpbmdzVmlldyhnZW5lcmFsU2V0dGluZ3NWaWV3KTsK KyAgICAgICAgdGhpcy5hZGRTZXR0aW5nc1ZpZXcoY29uc29sZVNldHRpbmdzVmlldyk7CiAgICAg fQogCiAgICAgX2NyZWF0ZUV4cGVyaW1lbnRhbFNldHRpbmdzVmlldygpCg==