200280 2019-07-30 13:30:17 -0700 Web Inspector: Console: all navigation items should be shown in the split console 2019-08-02 14:08:20 -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 joepeck webkit-bug-importer oldest_to_newest 1557053 0 hi 2019-07-30 13:30:17 -0700 Right now, only the message source scope bar, GC, and clear buttons are shown. Since the Console's "Emulate User Gesture" (for example) has a global effect, it should be shown everywhere it could have an effect. 1557059 1 375173 hi 2019-07-30 13:59:14 -0700 Created attachment 375173 Patch 1558072 2 375173 joepeck 2019-08-02 13:09:37 -0700 Comment on attachment 375173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375173&action=review r=me > Source/WebInspectorUI/UserInterface/Views/FindBanner.js:44 > + this._inputField.placeholder = " "; // This is necessary for :placeholder-shown. Interesting! 1558114 3 375173 commit-queue 2019-08-02 14:07:13 -0700 Comment on attachment 375173 Patch Clearing flags on attachment: 375173 Committed r248180: <https://trac.webkit.org/changeset/248180> 1558116 4 commit-queue 2019-08-02 14:07:15 -0700 All reviewed patches have been landed. Closing bug. 1558118 5 webkit-bug-importer 2019-08-02 14:08:20 -0700 <rdar://problem/53878871> 375173 2019-07-30 13:59:14 -0700 2019-08-02 14:07:13 -0700 Patch bug-200280-20190730135913.patch text/plain 10133 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFkODUzMmJmMDlhN2FhYmQ1Yjk5NWNjOGNlM2Jh YjE1OTM1NWFlMmMuLmM1MTA2M2MyNTkwODUzMzFkZDEzMTU1Zjk2ZmM2NTQ2ZTY5NjkyMWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA3LTMwICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD b25zb2xlOiBhbGwgbmF2aWdhdGlvbiBpdGVtcyBzaG91bGQgYmUgc2hvd24gaW4gdGhlIHNwbGl0 IGNvbnNvbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMDI4MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkxv Z0NvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQg bmF2aWdhdGlvbkl0ZW1zKToKKyAgICAgICAgQWRqdXN0IHRoZSBgdmlzaWJpbGl0eVByaW9yaXR5 YCBvZiBlYWNoIGBuYXZpZ2F0aW9uSXRlbXNgIHNvIHRoYXQgdGhlIGZpbHRlci9zY29wZSBiYXJz IGFyZQorICAgICAgICBrZXB0IHZpc2libGUgZm9yIGxvbmdlciB0aGFuIHRoZSAiUHJlc2VydmUg TG9nIi8iRW11bGF0ZSBVc2VyIEdlc3R1cmUiIHRvZ2dsZXMuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanM6CisgICAgICAgIChXSS5GaW5kQmFubmVyKToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuY3NzOgorICAgICAgICAoLmZp bmQtYmFubmVyLmNvbnNvbGUtZmluZC1iYW5uZXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSk6Cisg ICAgICAgICguZmluZC1iYW5uZXIuY29uc29sZS1maW5kLWJhbm5lciA+IDptYXRjaGVzKGlucHV0 W3R5cGU9InNlYXJjaCJdLCBidXR0b24pKToKKyAgICAgICAgKC5maW5kLWJhbm5lci5jb25zb2xl LWZpbmQtYmFubmVyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMsIC5maW5kLWJhbm5lci5j b25zb2xlLWZpbmQtYmFubmVyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMgfiBidXR0b24s IC5maW5kLWJhbm5lci5jb25zb2xlLWZpbmQtYmFubmVyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06 bm90KDpwbGFjZWhvbGRlci1zaG93biksIC5maW5kLWJhbm5lci5jb25zb2xlLWZpbmQtYmFubmVy ID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06bm90KDpwbGFjZWhvbGRlci1zaG93bikgfiBidXR0b24g KTogQWRkZWQuCisgICAgICAgICguZmluZC1iYW5uZXIuY29uc29sZS1maW5kLWJhbm5lciA+IGlu cHV0W3R5cGU9InNlYXJjaCJdOjpwbGFjZWhvbGRlcik6IERlbGV0ZWQuCisgICAgICAgICguZmlu ZC1iYW5uZXIuY29uc29sZS1maW5kLWJhbm5lciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOmZvY3Vz KTogRGVsZXRlZC4KKyAgICAgICAgKC5maW5kLWJhbm5lci5jb25zb2xlLWZpbmQtYmFubmVyID4g aW5wdXRbdHlwZT0ic2VhcmNoIl06bm90KDpwbGFjZWhvbGRlci1zaG93bikpOiBEZWxldGVkLgor ICAgICAgICAoQG1lZGlhIChwcmVmZXJzLWNvbG9yLXNjaGVtZTogZGFyaykgLmZpbmQtYmFubmVy LmNvbnNvbGUtZmluZC1iYW5uZXIgPiBpbnB1dFt0eXBlPXNlYXJjaF06bm90KDpwbGFjZWhvbGRl ci1zaG93bikpOiBEZWxldGVkLgorICAgICAgICBNYWtlIHRoZSBgV0kuRmluZEJhbm5lcmAgYmxl bmQgaW4gd2l0aCB0aGUgc3Vycm91bmRpbmcgY29udGVudCB3aGVuIGl0J3Mgbm90IGZvY3VzZWQg b3IgaGFzCisgICAgICAgIG5vIGNvbnRlbnQuCisKIDIwMTktMDctMjYgIEdyZWcgRG9vbGl0dGxl ICA8Z3IzZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQVhJOiBBdWRpdDog VHlwbyBvZiAic29tZSIgYXMgInNvbWVlIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmNzcwppbmRleCBmOWZhODk0ZWM3 OTM0ODgyOGIzODE2MWY1NjUyNWE1ZTA3MDkzYjg1Li40Yzk3MDRmZTY4NTk4NmZmZDRkNDNjOTM5 MmU5MDNjOGUxMTBjMDUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmNzcwpAQCAtMjQ2LDggKzI0Niw2IEBAIGJv ZHkgLmZpbmQtYmFubmVyLmNvbnNvbGUtZmluZC1iYW5uZXIgewogICAgIHBhZGRpbmctdG9wOiAw OwogICAgIG91dGxpbmU6IG5vbmU7CiAgICAgYm9yZGVyOiAxcHggc29saWQgdmFyKC0tYm9yZGVy LWNvbG9yKTsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiBoc2xhKDAsIDAlLCAxMDAlLCAwLjIpOwot ICAgIGJhY2tncm91bmQtY2xpcDogcGFkZGluZy1ib3g7CiAKICAgICAtLWNvbnNvbGUtZmluZC1i YW5uZXItc2VhcmNoLWJveC1ib3JkZXItcmFkaXVzLXN0YXJ0OiAzcHg7CiAgICAgLS1jb25zb2xl LWZpbmQtYmFubmVyLXNlYXJjaC1ib3gtYm9yZGVyLXJhZGl1cy1lbmQ6IDA7CkBAIC0yNjgsMjUg KzI2NiwxOSBAQCBib2R5W2Rpcj1ydGxdIC5maW5kLWJhbm5lci5jb25zb2xlLWZpbmQtYmFubmVy ID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0gewogfQogCiAuZmluZC1iYW5uZXIuY29uc29sZS1maW5k LWJhbm5lciA+IDptYXRjaGVzKGlucHV0W3R5cGU9InNlYXJjaCJdLCBidXR0b24pIHsKKyAgICBi YWNrZ3JvdW5kLWNvbG9yOiBpbmhlcml0OwogICAgIGhlaWdodDogMjJweDsKIH0KIAotLmZpbmQt YmFubmVyLmNvbnNvbGUtZmluZC1iYW5uZXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTo6cGxhY2Vo b2xkZXIgewotICAgIGNvbG9yOiBoc2xhKDAsIDAlLCAwJSwgMC4zNSk7Ci19Ci0KIC5maW5kLWJh bm5lci5jb25zb2xlLWZpbmQtYmFubmVyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Oi13ZWJraXQt dGV4dGZpZWxkLWRlY29yYXRpb24tY29udGFpbmVyIHsKICAgICAtd2Via2l0LW1hcmdpbi1zdGFy dDogNHB4OwogfQogCi0uZmluZC1iYW5uZXIuY29uc29sZS1maW5kLWJhbm5lciA+IGlucHV0W3R5 cGU9InNlYXJjaCJdOmZvY3VzIHsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKLX0KLQot LyogTWFrZSB0aGUgc2VhcmNoIGZpZWxkJ3MgYmFja2dyb3VuZCB3aGl0ZSB3aGVuIGl0IGlzIG5v dCBmb2N1c2VkIGFuZCBoYXMgY29udGVudC4KLSAgIE5lZWRzIHRvIGJlIGEgc2VwYXJhdGUgcnVs ZS4gU2VlIGh0dHA6Ly93ZWJraXQub3JnL2IvMTE4MTYyICovCi0uZmluZC1iYW5uZXIuY29uc29s ZS1maW5kLWJhbm5lciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOm5vdCg6cGxhY2Vob2xkZXItc2hv d24pIHsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKy5maW5kLWJhbm5lci5jb25zb2xl LWZpbmQtYmFubmVyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMsCisuZmluZC1iYW5uZXIu Y29uc29sZS1maW5kLWJhbm5lciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOmZvY3VzIH4gYnV0dG9u LAorLmZpbmQtYmFubmVyLmNvbnNvbGUtZmluZC1iYW5uZXIgPiBpbnB1dFt0eXBlPSJzZWFyY2gi XTpub3QoOnBsYWNlaG9sZGVyLXNob3duKSwKKy5maW5kLWJhbm5lci5jb25zb2xlLWZpbmQtYmFu bmVyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06bm90KDpwbGFjZWhvbGRlci1zaG93bikgfiBidXR0 b24geworICAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLWJhY2tncm91bmQtY29sb3IpOwogfQog CiBAbWVkaWEgKHByZWZlcnMtY29sb3Itc2NoZW1lOiBkYXJrKSB7CkBAIC0zMDIsOSArMjk0LDQg QEAgYm9keVtkaXI9cnRsXSAuZmluZC1iYW5uZXIuY29uc29sZS1maW5kLWJhbm5lciA+IGlucHV0 W3R5cGU9InNlYXJjaCJdIHsKICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tYmFja2dy b3VuZC1jb2xvci1hbHRlcm5hdGUpOwogICAgICAgICBib3JkZXItY29sb3I6IHZhcigtLWJhY2tn cm91bmQtY29sb3Itc2VsZWN0ZWQpOwogICAgIH0KLQotICAgIC5maW5kLWJhbm5lci5jb25zb2xl LWZpbmQtYmFubmVyID4gaW5wdXRbdHlwZT1zZWFyY2hdOm5vdCg6cGxhY2Vob2xkZXItc2hvd24p IHsKLSAgICAgICAgY29sb3I6IHVuc2V0OwotICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB1bnNl dDsKLSAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvRmluZEJhbm5lci5qcwppbmRleCBkYzkyYzcwMWFiZDdkMTM0ZDBhZDk0YTdm MmJlZTE4MGNmN2EwNjFjLi4wNTc4M2FhODNlYWY2NGFmZjQwYjEwYjQ3MWZlM2MzYTE5MjVlMTMx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9G aW5kQmFubmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbmRCYW5uZXIuanMKQEAgLTQxLDYgKzQxLDcgQEAgV0kuRmluZEJhbm5lciA9IGNsYXNz IEZpbmRCYW5uZXIgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uSXRlbQogCiAgICAgICAgIHRoaXMuX2lu cHV0RmllbGQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbnB1dCIpOwogICAgICAgICB0aGlz Ll9pbnB1dEZpZWxkLnR5cGUgPSAic2VhcmNoIjsKKyAgICAgICAgdGhpcy5faW5wdXRGaWVsZC5w bGFjZWhvbGRlciA9ICIgIjsgLy8gVGhpcyBpcyBuZWNlc3NhcnkgZm9yIDpwbGFjZWhvbGRlci1z aG93bi4KICAgICAgICAgdGhpcy5faW5wdXRGaWVsZC5zcGVsbGNoZWNrID0gZmFsc2U7CiAgICAg ICAgIHRoaXMuX2lucHV0RmllbGQuaW5jcmVtZW50YWwgPSB0cnVlOwogICAgICAgICB0aGlzLl9p bnB1dEZpZWxkLnNldEF0dHJpYnV0ZSgicmVzdWx0cyIsIDUpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5q cwppbmRleCAzNTkyNGFlMzg2YjA0N2VhZDUxMDExNjJmNjNlNDUxZGNhMDI4YjIyLi44MGY4MmQ3 MmUxNmJiNTg2MThkMTAxZjE5MzNlMGNkMDJiNGY0Yzg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5q cwpAQCAtNjEsNiArNjEsNyBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKIAogICAgICAgICBjb25zdCBmaXhlZCA9IHRydWU7 CiAgICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIgPSBuZXcgV0kuRmluZEJhbm5lcih0aGlzLCAiY29u c29sZS1maW5kLWJhbm5lciIsIGZpeGVkKTsKKyAgICAgICAgdGhpcy5fZmluZEJhbm5lci52aXNp YmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuSGln aDsKICAgICAgICAgdGhpcy5fZmluZEJhbm5lci50YXJnZXRFbGVtZW50ID0gdGhpcy5lbGVtZW50 OwogCiAgICAgICAgIHRoaXMuX2N1cnJlbnRTZWFyY2hRdWVyeSA9ICIiOwpAQCAtNjksNiArNzAs NyBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0ku Q29udGVudFZpZXcKICAgICAgICAgdGhpcy5fc2VsZWN0ZWRTZWFyY2hNYXRjaElzVmFsaWQgPSBm YWxzZTsKIAogICAgICAgICB0aGlzLl9wcmVzZXJ2ZUxvZ05hdmlnYXRpb25JdGVtID0gbmV3IFdJ LkNoZWNrYm94TmF2aWdhdGlvbkl0ZW0oInByZXNlcnZlLWxvZyIsIFdJLlVJU3RyaW5nKCJQcmVz ZXJ2ZSBMb2ciKSwgIVdJLnNldHRpbmdzLmNsZWFyTG9nT25OYXZpZ2F0ZS52YWx1ZSk7CisgICAg ICAgIHRoaXMuX3ByZXNlcnZlTG9nTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0g V0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKICAgICAgICAgdGhpcy5f cHJlc2VydmVMb2dOYXZpZ2F0aW9uSXRlbS50b29sdGlwID0gV0kuVUlTdHJpbmcoIkRvIG5vdCBj bGVhciB0aGUgY29uc29sZSBvbiBuZXcgcGFnZSBsb2FkcyIpOwogICAgICAgICB0aGlzLl9wcmVz ZXJ2ZUxvZ05hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ2hlY2tib3hOYXZpZ2F0 aW9uSXRlbS5FdmVudC5DaGVja2VkRGlkQ2hhbmdlLCAoKSA9PiB7CiAgICAgICAgICAgICBXSS5z ZXR0aW5ncy5jbGVhckxvZ09uTmF2aWdhdGUudmFsdWUgPSAhV0kuc2V0dGluZ3MuY2xlYXJMb2dP bk5hdmlnYXRlLnZhbHVlOwpAQCAtNzYsNiArNzgsNyBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNs YXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAgICAgICAgV0kuc2V0 dGluZ3MuY2xlYXJMb2dPbk5hdmlnYXRlLmFkZEV2ZW50TGlzdGVuZXIoV0kuU2V0dGluZy5FdmVu dC5DaGFuZ2VkLCB0aGlzLl9oYW5kbGVDbGVhckxvZ09uTmF2aWdhdGVTZXR0aW5nQ2hhbmdlZCwg dGhpcyk7CiAKICAgICAgICAgdGhpcy5fZW11bGF0ZUluVXNlckdlc3R1cmVOYXZpZ2F0aW9uSXRl bSA9IG5ldyBXSS5DaGVja2JveE5hdmlnYXRpb25JdGVtKCJlbXVsYXRlLWluLXVzZXItZ2VzdHVy ZSIsIFdJLlVJU3RyaW5nKCJFbXVsYXRlIFVzZXIgR2VzdHVyZSIpLCBXSS5zZXR0aW5ncy5lbXVs YXRlSW5Vc2VyR2VzdHVyZS52YWx1ZSk7CisgICAgICAgIHRoaXMuX2VtdWxhdGVJblVzZXJHZXN0 dXJlTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0u VmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKICAgICAgICAgdGhpcy5fZW11bGF0ZUluVXNlckdlc3R1 cmVOYXZpZ2F0aW9uSXRlbS50b29sdGlwID0gV0kuVUlTdHJpbmcoIlJ1biBjb25zb2xlIGNvbW1h bmRzIGFzIGlmIGluc2lkZSBhIHVzZXIgZ2VzdHVyZSIpOwogICAgICAgICB0aGlzLl9lbXVsYXRl SW5Vc2VyR2VzdHVyZU5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ2hlY2tib3hO YXZpZ2F0aW9uSXRlbS5FdmVudC5DaGVja2VkRGlkQ2hhbmdlLCAoKSA9PiB7CiAgICAgICAgICAg ICBXSS5zZXR0aW5ncy5lbXVsYXRlSW5Vc2VyR2VzdHVyZS52YWx1ZSA9ICFXSS5zZXR0aW5ncy5l bXVsYXRlSW5Vc2VyR2VzdHVyZS52YWx1ZTsKQEAgLTEwMCw2ICsxMDMsNyBAQCBXSS5Mb2dDb250 ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKICAg ICAgICAgfQogCiAgICAgICAgIHRoaXMuX3Njb3BlQmFyID0gbmV3IFdJLlNjb3BlQmFyKCJsb2ct c2NvcGUtYmFyIiwgc2NvcGVCYXJJdGVtcywgc2NvcGVCYXJJdGVtc1swXSk7CisgICAgICAgIHRo aXMuX3Njb3BlQmFyLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2li aWxpdHlQcmlvcml0eS5IaWdoOwogICAgICAgICB0aGlzLl9zY29wZUJhci5hZGRFdmVudExpc3Rl bmVyKFdJLlNjb3BlQmFyLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQsIHRoaXMuX3Njb3BlQmFyU2Vs ZWN0aW9uRGlkQ2hhbmdlLCB0aGlzKTsKIAogICAgICAgICB0aGlzLl9oYXNOb25EZWZhdWx0TG9n Q2hhbm5lbE1lc3NhZ2UgPSBmYWxzZTsKQEAgLTExNiwxMSArMTIwLDkgQEAgV0kuTG9nQ29udGVu dFZpZXcgPSBjbGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAg ICAgIH0KIAogICAgICAgICB0aGlzLl9nYXJiYWdlQ29sbGVjdE5hdmlnYXRpb25JdGVtID0gbmV3 IFdJLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJnYXJiYWdlLWNvbGxlY3QiLCBXSS5VSVN0cmluZygi Q29sbGVjdCBnYXJiYWdlIiksICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1HYXJiYWdlQ29sbGVjdC5z dmciLCAxNiwgMTYpOwotICAgICAgICB0aGlzLl9nYXJiYWdlQ29sbGVjdE5hdmlnYXRpb25JdGVt LnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0 eS5Mb3c7CiAgICAgICAgIHRoaXMuX2dhcmJhZ2VDb2xsZWN0TmF2aWdhdGlvbkl0ZW0uYWRkRXZl bnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9n YXJiYWdlQ29sbGVjdCwgdGhpcyk7CiAKICAgICAgICAgdGhpcy5fY2xlYXJMb2dOYXZpZ2F0aW9u SXRlbSA9IG5ldyBXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiY2xlYXItbG9nIiwgV0kuVUlTdHJp bmcoIkNsZWFyIGxvZyAoJXMgb3IgJXMpIikuZm9ybWF0KFdJLmNsZWFyS2V5Ym9hcmRTaG9ydGN1 dC5kaXNwbGF5TmFtZSwgdGhpcy5fbG9nVmlld0NvbnRyb2xsZXIubWVzc2FnZXNBbHRlcm5hdGVD bGVhcktleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpLCAiSW1hZ2VzL05hdmlnYXRpb25JdGVt VHJhc2guc3ZnIiwgMTUsIDE1KTsKLSAgICAgICAgdGhpcy5fY2xlYXJMb2dOYXZpZ2F0aW9uSXRl bS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3Jp dHkuTG93OwogICAgICAgICB0aGlzLl9jbGVhckxvZ05hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlz dGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fY2xlYXJM b2csIHRoaXMpOwogCiAgICAgICAgIHRoaXMuX3Nob3dDb25zb2xlVGFiTmF2aWdhdGlvbkl0ZW0g PSBuZXcgV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInNob3ctdGFiIiwgV0kuVUlTdHJpbmcoIlNo b3cgQ29uc29sZSB0YWIiKSwgIkltYWdlcy9TcGxpdFRvZ2dsZVVwLnN2ZyIsIDE2LCAxNik7CkBA IC0xNDEsNyArMTQzLDEzIEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogCiAgICAgZ2V0IG5hdmlnYXRpb25JdGVtcygpCiAg ICAgewotICAgICAgICBsZXQgbmF2aWdhdGlvbkl0ZW1zID0gW3RoaXMuX3Njb3BlQmFyLCBuZXcg V0kuRGl2aWRlck5hdmlnYXRpb25JdGVtXTsKKyAgICAgICAgbGV0IG5hdmlnYXRpb25JdGVtcyA9 IFsKKyAgICAgICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIsCisgICAgICAgICAgICB0aGlzLl9jaGVj a2JveGVzTmF2aWdhdGlvbkl0ZW1Hcm91cCwKKyAgICAgICAgICAgIG5ldyBXSS5EaXZpZGVyTmF2 aWdhdGlvbkl0ZW0sCisgICAgICAgICAgICB0aGlzLl9zY29wZUJhciwKKyAgICAgICAgICAgIG5l dyBXSS5EaXZpZGVyTmF2aWdhdGlvbkl0ZW0KKyAgICAgICAgXTsKIAogICAgICAgICBpZiAodGhp cy5faGFzTm9uRGVmYXVsdExvZ0NoYW5uZWxNZXNzYWdlICYmIHRoaXMuX21lc3NhZ2VTb3VyY2VC YXIpCiAgICAgICAgICAgICBuYXZpZ2F0aW9uSXRlbXMucHVzaCh0aGlzLl9tZXNzYWdlU291cmNl QmFyLCBuZXcgV0kuRGl2aWRlck5hdmlnYXRpb25JdGVtKTsKQEAgLTE1Myw4ICsxNjEsNiBAQCBX SS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVu dFZpZXcKIAogICAgICAgICBpZiAoV0kuaXNTaG93aW5nU3BsaXRDb25zb2xlKCkpCiAgICAgICAg ICAgICBuYXZpZ2F0aW9uSXRlbXMucHVzaChuZXcgV0kuRGl2aWRlck5hdmlnYXRpb25JdGVtLCB0 aGlzLl9zaG93Q29uc29sZVRhYk5hdmlnYXRpb25JdGVtKTsKLSAgICAgICAgZWxzZSBpZiAoV0ku aXNTaG93aW5nQ29uc29sZVRhYigpKQotICAgICAgICAgICAgbmF2aWdhdGlvbkl0ZW1zLnVuc2hp ZnQodGhpcy5fZmluZEJhbm5lciwgdGhpcy5fY2hlY2tib3hlc05hdmlnYXRpb25JdGVtR3JvdXAp OwogCiAgICAgICAgIHJldHVybiBuYXZpZ2F0aW9uSXRlbXM7CiAgICAgfQo=