221246 2021-02-01 22:57:28 -0800 Web Inspector: remove experimental setting and enable Layout sidebar 2021-03-15 22:55:25 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 223209 1 bburg nvasilyev bburg ews-watchlist hi inspector-bugzilla-changes nvasilyev webkit-bug-importer oldest_to_newest 1724533 0 bburg 2021-02-01 22:57:28 -0800 Placeholder bug for later. 1724534 1 bburg 2021-02-01 23:00:56 -0800 As part of this, the engineering-only context menu items for showing/hiding grid overlays should be removed. At that point they will no longer be necessary. 1726958 2 webkit-bug-importer 2021-02-08 22:58:12 -0800 <rdar://problem/74130753> 1739596 3 nvasilyev 2021-03-15 12:37:45 -0700 (In reply to BJ Burg from comment #1) > As part of this, the engineering-only context menu items for showing/hiding > grid overlays should be removed. At that point they will no longer be > necessary. This was removed in Web Inspector: CSS Grid Inspector clean-up https://trac.webkit.org/changeset/274229/webkit 1739597 4 423221 nvasilyev 2021-03-15 12:41:13 -0700 Created attachment 423221 Patch 1739604 5 423223 nvasilyev 2021-03-15 12:47:54 -0700 Created attachment 423223 Patch 1739609 6 423223 hi 2021-03-15 12:50:35 -0700 Comment on attachment 423223 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423223&action=review > Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js:33 > + WI.LayoutDetailsSidebarPanel, Shouldn't this only be added if the backend has `CSS.nodeLayoutContextTypeChanged` (and/or any of the other new protocol things)? 1739734 7 423264 nvasilyev 2021-03-15 16:59:08 -0700 Created attachment 423264 Patch 1739737 8 423264 nvasilyev 2021-03-15 17:00:45 -0700 Comment on attachment 423264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423264&action=review > Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js:36 > + // COMPATIBILITY (iOS 14.5): `DOM.showGridOverlay` did not exist yet. > + if (InspectorBackend.hasCommand("DOM.showGridOverlay")) I don't know if should check for anything else here. Other commands were added around the same time, and it looks like we usually check for only one command elsewhere in our codebase. 1739843 9 423264 bburg 2021-03-15 22:44:20 -0700 Comment on attachment 423264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423264&action=review r=me >> Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js:36 >> + if (InspectorBackend.hasCommand("DOM.showGridOverlay")) > > I don't know if should check for anything else here. Other commands were added around the same time, and it looks like we usually check for only one command elsewhere in our codebase. This is fine. 1739846 10 ews-feeder 2021-03-15 22:55:24 -0700 Committed r274466: <https://commits.webkit.org/r274466> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423264. 423221 2021-03-15 12:41:13 -0700 2021-03-15 12:47:54 -0700 Patch patch.txt text/plain 4438 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU2NGMzMGIxNGY4NS4uYmQwYjMzZDIyM2Q3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMS0wMy0xNSAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZW1vdmUgZXhwZXJpbWVudGFsIHNldHRpbmcgYW5kIGVuYWJsZSBMYXlvdXQgc2lkZWJh cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxMjQ2 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDEzMDc1Mz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRz VGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3KToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6 CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRXhw ZXJpbWVudGFsU2V0dGluZ3NWaWV3KToKKwogMjAyMS0wMy0xMSAgRGV2aW4gUm91c3NvICA8ZHJv dXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYFdJLk9iamVjdC5zaW5n bGVGaXJlRXZlbnRMaXN0ZW5lcmAgc2hvdWxkIG5vdCBrZWVwIGEgc3Ryb25nIHJlZmVyZW5jZSB0 byBgdGhpc09iamVjdGAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDQ2ZjUz MjJlZjZmYy4uMWYxMWM5NzFmZGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMK QEAgLTEzMTYsNyArMTMxNiw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgQWxsIE5vZGVzICgl ZCBNb3JlKSJdID0gIlNob3cgQWxsIE5vZGVzICglZCBNb3JlKSI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJTaG93IENvbnNvbGUiXSA9ICJTaG93IENvbnNvbGUiOwogbG9jYWxpemVkU3RyaW5nc1siU2hv dyBDb25zb2xlIHRhYiJdID0gIlNob3cgQ29uc29sZSB0YWIiOwogbG9jYWxpemVkU3RyaW5nc1si U2hvdyBFbGVtZW50cyJdID0gIlNob3cgRWxlbWVudHMiOwotbG9jYWxpemVkU3RyaW5nc1siU2hv dyBMYXlvdXQgcGFuZWwiXSA9ICJTaG93IExheW91dCBwYW5lbCI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJTaG93IFBhdGgiXSA9ICJTaG93IFBhdGgiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBSZW1h aW5pbmcgKCVkKSJdID0gIlNob3cgUmVtYWluaW5nICglZCkiOwogbG9jYWxpemVkU3RyaW5nc1si U2hvdyBTY29wZSBDaGFpbiBvbiBwYXVzZSJdID0gIlNob3cgU2NvcGUgQ2hhaW4gb24gcGF1c2Ui OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RWxlbWVudHNUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanMKaW5kZXggOWYyMzJlYzdkZDdh Li42NmE1MzUxYTVmODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5qcwpA QCAtMzAsMTEgKzMwLDkgQEAgV0kuRWxlbWVudHNUYWJDb250ZW50VmlldyA9IGNsYXNzIEVsZW1l bnRzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3MKICAgICAgICAgbGV0IGRl dGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMgPSBbCiAgICAgICAgICAgICBXSS5SdWxlc1N0 eWxlRGV0YWlsc1NpZGViYXJQYW5lbCwKICAgICAgICAgICAgIFdJLkNvbXB1dGVkU3R5bGVEZXRh aWxzU2lkZWJhclBhbmVsLAorICAgICAgICAgICAgV0kuTGF5b3V0RGV0YWlsc1NpZGViYXJQYW5l bCwKICAgICAgICAgXTsKIAotICAgICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5h YmxlTGF5b3V0UGFuZWwudmFsdWUpCi0gICAgICAgICAgICBkZXRhaWxzU2lkZWJhclBhbmVsQ29u c3RydWN0b3JzLnB1c2goV0kuTGF5b3V0RGV0YWlsc1NpZGViYXJQYW5lbCk7Ci0KICAgICAgICAg Ly8gQ09NUEFUSUJJTElUWSAoaU9TIDE0LjApOiBgQ1NTLmdldEZvbnREYXRhRm9yTm9kZWAgZGlk IG5vdCBleGlzdCB5ZXQuCiAgICAgICAgIGlmIChJbnNwZWN0b3JCYWNrZW5kLmhhc0NvbW1hbmQo IkNTUy5nZXRGb250RGF0YUZvck5vZGUiKSkKICAgICAgICAgICAgIGRldGFpbHNTaWRlYmFyUGFu ZWxDb25zdHJ1Y3RvcnMucHVzaChXSS5Gb250RGV0YWlsc1NpZGViYXJQYW5lbCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1Rh YkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwppbmRleCBkMmUwZDliZjI4N2IuLjUxMWZmZjRh YmYxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0zOTgsNyAr Mzk4LDYgQEAgV0kuU2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFiQ29u dGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50VmkKICAgICAgICAgICAgIGxldCBzdHlsZXNH cm91cCA9IGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRHcm91cChXSS5VSVN0cmluZygiU3R5 bGVzOiIpKTsKICAgICAgICAgICAgIHN0eWxlc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3Mu ZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvRWZmZWN0aXZlLCBXSS5VSVN0cmluZygiU2hv dyBqdW1wIHRvIGVmZmVjdGl2ZSBwcm9wZXJ0eSBidXR0b24iKSk7CiAgICAgICAgICAgICBzdHls ZXNHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0p1 bXBUb1ZhcmlhYmxlRGVjbGFyYXRpb24sIFdJLlVJU3RyaW5nKCJTaG93IGp1bXAgdG8gdmFyaWFi bGUgZGVjbGFyYXRpb24gYnV0dG9uIikpOwotICAgICAgICAgICAgc3R5bGVzR3JvdXAuYWRkU2V0 dGluZyhXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVMYXlvdXRQYW5lbCwgV0kuVUlTdHJp bmcoIlNob3cgTGF5b3V0IHBhbmVsIikpOwogICAgICAgICAgICAgc3R5bGVzR3JvdXAuYWRkU2V0 dGluZyhXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVHcmlkQmFkZ2VzLCBXSS51bmxvY2Fs aXplZFN0cmluZygiU2hvdyBcImdyaWRcIiBiYWRnZXMiKSk7CiAKICAgICAgICAgICAgIGV4cGVy aW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKQEAgLTQyOSw3ICs0MjgsNiBAQCBX SS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBl eHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGlu Z3MuZXhwZXJpbWVudGFsRW5hYmxlUHJldmlld0ZlYXR1cmVzKTsKIAogICAgICAgICBpZiAoaGFz Q1NTRG9tYWluKSB7Ci0gICAgICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhw ZXJpbWVudGFsRW5hYmxlTGF5b3V0UGFuZWwpOwogICAgICAgICAgICAgbGlzdGVuRm9yQ2hhbmdl KFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUdyaWRCYWRnZXMpOwogICAgICAgICAgICAg bGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0p1bXBU b0VmZmVjdGl2ZSk7CiAgICAgICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhw ZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvVmFyaWFibGVEZWNsYXJhdGlvbik7Cg== 423223 2021-03-15 12:47:54 -0700 2021-03-15 16:59:08 -0700 Patch patch.txt text/plain 5442 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU2NGMzMGIxNGY4NS4uYTY1YjQwNDVkYWUxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0wMy0xNSAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZW1vdmUgZXhwZXJpbWVudGFsIHNldHRpbmcgYW5kIGVuYWJsZSBMYXlvdXQgc2lkZWJh cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxMjQ2 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDEzMDc1Mz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5q czoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcu anM6CisgICAgICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5T ZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRXhwZXJpbWVudGFsU2V0dGlu Z3NWaWV3KToKKwogMjAyMS0wMy0xMSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYFdJLk9iamVjdC5zaW5nbGVGaXJlRXZlbnRMaXN0 ZW5lcmAgc2hvdWxkIG5vdCBrZWVwIGEgc3Ryb25nIHJlZmVyZW5jZSB0byBgdGhpc09iamVjdGAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDQ2ZjUzMjJlZjZmYy4uMWYxMWM5 NzFmZGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9l bi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9M b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTEzMTYsNyArMTMx Niw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgQWxsIE5vZGVzICglZCBNb3JlKSJdID0gIlNo b3cgQWxsIE5vZGVzICglZCBNb3JlKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IENvbnNvbGUi XSA9ICJTaG93IENvbnNvbGUiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBDb25zb2xlIHRhYiJd ID0gIlNob3cgQ29uc29sZSB0YWIiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBFbGVtZW50cyJd ID0gIlNob3cgRWxlbWVudHMiOwotbG9jYWxpemVkU3RyaW5nc1siU2hvdyBMYXlvdXQgcGFuZWwi XSA9ICJTaG93IExheW91dCBwYW5lbCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFBhdGgiXSA9 ICJTaG93IFBhdGgiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBSZW1haW5pbmcgKCVkKSJdID0g IlNob3cgUmVtYWluaW5nICglZCkiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBTY29wZSBDaGFp biBvbiBwYXVzZSJdID0gIlNob3cgU2NvcGUgQ2hhaW4gb24gcGF1c2UiOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IDEw ODIyMDViNzNkOC4uM2RmYmM5NTA4Njc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCkBAIC0yMjgsNyArMjI4LDYgQEAgV0ku c2V0dGluZ3MgPSB7CiAgICAgZXhwZXJpbWVudGFsRW5hYmxlUHJldmlld0ZlYXR1cmVzOiBuZXcg V0kuU2V0dGluZygiZXhwZXJpbWVudGFsLWVuYWJsZS1wcmV2aWV3LWZlYXR1cmVzIiwgdHJ1ZSks CiAgICAgZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvRWZmZWN0aXZlOiBuZXcgV0kuU2V0 dGluZygiZXhwZXJpbWVudGFsLXN0eWxlcy1qdW1wLXRvLWVmZmVjdGl2ZSIsIGZhbHNlKSwKICAg ICBleHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9WYXJpYWJsZURlY2xhcmF0aW9uOiBuZXcg V0kuU2V0dGluZygiZXhwZXJpbWVudGFsLXN0eWxlcy1qdW1wLXRvLXZhcmlhYmxlLWRlY2xhcmF0 aW9uIiwgZmFsc2UpLAotICAgIGV4cGVyaW1lbnRhbEVuYWJsZUxheW91dFBhbmVsOiBuZXcgV0ku U2V0dGluZygiZXhwZXJpbWVudGFsLWVuYWJsZS1sYXlvdXQtcGFuZWwiLCBmYWxzZSksCiAgICAg ZXhwZXJpbWVudGFsRW5hYmxlR3JpZEJhZGdlczogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRh bC1lbmFibGUtZ3JpZC1iYWRnZXMiLCBmYWxzZSksCiAgICAgZXhwZXJpbWVudGFsQ29sbGFwc2VC bGFja2JveGVkQ2FsbEZyYW1lczogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1jb2xsYXBz ZS1ibGFja2JveGVkLWNhbGwtZnJhbWVzIiwgZmFsc2UpLAogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNU YWJDb250ZW50Vmlldy5qcwppbmRleCA5ZjIzMmVjN2RkN2EuLjY2YTUzNTFhNWY4OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNU YWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0zMCwxMSArMzAsOSBAQCBXSS5F bGVtZW50c1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgRWxlbWVudHNUYWJDb250ZW50VmlldyBleHRl bmRzIFdJLkNvbnRlbnRCcm93cwogICAgICAgICBsZXQgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0 cnVjdG9ycyA9IFsKICAgICAgICAgICAgIFdJLlJ1bGVzU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVs LAogICAgICAgICAgICAgV0kuQ29tcHV0ZWRTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwsCisgICAg ICAgICAgICBXSS5MYXlvdXREZXRhaWxzU2lkZWJhclBhbmVsLAogICAgICAgICBdOwogCi0gICAg ICAgIGlmIChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVMYXlvdXRQYW5lbC52YWx1ZSkK LSAgICAgICAgICAgIGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMucHVzaChXSS5MYXlv dXREZXRhaWxzU2lkZWJhclBhbmVsKTsKLQogICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1Mg MTQuMCk6IGBDU1MuZ2V0Rm9udERhdGFGb3JOb2RlYCBkaWQgbm90IGV4aXN0IHlldC4KICAgICAg ICAgaWYgKEluc3BlY3RvckJhY2tlbmQuaGFzQ29tbWFuZCgiQ1NTLmdldEZvbnREYXRhRm9yTm9k ZSIpKQogICAgICAgICAgICAgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycy5wdXNoKFdJ LkZvbnREZXRhaWxzU2lkZWJhclBhbmVsKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRW aWV3LmpzCmluZGV4IGQyZTBkOWJmMjg3Yi4uNTExZmZmNGFiZjFmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nl dHRpbmdzVGFiQ29udGVudFZpZXcuanMKQEAgLTM5OCw3ICszOTgsNiBAQCBXSS5TZXR0aW5nc1Rh YkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRh YkNvbnRlbnRWaQogICAgICAgICAgICAgbGV0IHN0eWxlc0dyb3VwID0gZXhwZXJpbWVudGFsU2V0 dGluZ3NWaWV3LmFkZEdyb3VwKFdJLlVJU3RyaW5nKCJTdHlsZXM6IikpOwogICAgICAgICAgICAg c3R5bGVzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVTdHls ZXNKdW1wVG9FZmZlY3RpdmUsIFdJLlVJU3RyaW5nKCJTaG93IGp1bXAgdG8gZWZmZWN0aXZlIHBy b3BlcnR5IGJ1dHRvbiIpKTsKICAgICAgICAgICAgIHN0eWxlc0dyb3VwLmFkZFNldHRpbmcoV0ku c2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvVmFyaWFibGVEZWNsYXJhdGlv biwgV0kuVUlTdHJpbmcoIlNob3cganVtcCB0byB2YXJpYWJsZSBkZWNsYXJhdGlvbiBidXR0b24i KSk7Ci0gICAgICAgICAgICBzdHlsZXNHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmV4cGVy aW1lbnRhbEVuYWJsZUxheW91dFBhbmVsLCBXSS5VSVN0cmluZygiU2hvdyBMYXlvdXQgcGFuZWwi KSk7CiAgICAgICAgICAgICBzdHlsZXNHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmV4cGVy aW1lbnRhbEVuYWJsZUdyaWRCYWRnZXMsIFdJLnVubG9jYWxpemVkU3RyaW5nKCJTaG93IFwiZ3Jp ZFwiIGJhZGdlcyIpKTsKIAogICAgICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFk ZFNlcGFyYXRvcigpOwpAQCAtNDI5LDcgKzQyOCw2IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZp ZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZp CiAgICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVQ cmV2aWV3RmVhdHVyZXMpOwogCiAgICAgICAgIGlmIChoYXNDU1NEb21haW4pIHsKLSAgICAgICAg ICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVMYXlvdXRQ YW5lbCk7CiAgICAgICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVu dGFsRW5hYmxlR3JpZEJhZGdlcyk7CiAgICAgICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0 dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvRWZmZWN0aXZlKTsKICAgICAgICAg ICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVTdHlsZXNK dW1wVG9WYXJpYWJsZURlY2xhcmF0aW9uKTsK 423264 2021-03-15 16:59:08 -0700 2021-03-15 22:55:25 -0700 Patch patch.txt text/plain 5299 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU2NGMzMGIxNGY4NS4uYTY1YjQwNDVkYWUxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMS0wMy0xNSAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiByZW1vdmUgZXhwZXJpbWVudGFsIHNldHRpbmcgYW5kIGVuYWJsZSBMYXlvdXQgc2lkZWJh cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxMjQ2 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDEzMDc1Mz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5q czoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcu anM6CisgICAgICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5T ZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRXhwZXJpbWVudGFsU2V0dGlu Z3NWaWV3KToKKwogMjAyMS0wMy0xMSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYFdJLk9iamVjdC5zaW5nbGVGaXJlRXZlbnRMaXN0 ZW5lcmAgc2hvdWxkIG5vdCBrZWVwIGEgc3Ryb25nIHJlZmVyZW5jZSB0byBgdGhpc09iamVjdGAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDQ2ZjUzMjJlZjZmYy4uMWYxMWM5 NzFmZGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9l bi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9M b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTEzMTYsNyArMTMx Niw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgQWxsIE5vZGVzICglZCBNb3JlKSJdID0gIlNo b3cgQWxsIE5vZGVzICglZCBNb3JlKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IENvbnNvbGUi XSA9ICJTaG93IENvbnNvbGUiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBDb25zb2xlIHRhYiJd ID0gIlNob3cgQ29uc29sZSB0YWIiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBFbGVtZW50cyJd ID0gIlNob3cgRWxlbWVudHMiOwotbG9jYWxpemVkU3RyaW5nc1siU2hvdyBMYXlvdXQgcGFuZWwi XSA9ICJTaG93IExheW91dCBwYW5lbCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTaG93IFBhdGgiXSA9 ICJTaG93IFBhdGgiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBSZW1haW5pbmcgKCVkKSJdID0g IlNob3cgUmVtYWluaW5nICglZCkiOwogbG9jYWxpemVkU3RyaW5nc1siU2hvdyBTY29wZSBDaGFp biBvbiBwYXVzZSJdID0gIlNob3cgU2NvcGUgQ2hhaW4gb24gcGF1c2UiOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IDEw ODIyMDViNzNkOC4uM2RmYmM5NTA4Njc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCkBAIC0yMjgsNyArMjI4LDYgQEAgV0ku c2V0dGluZ3MgPSB7CiAgICAgZXhwZXJpbWVudGFsRW5hYmxlUHJldmlld0ZlYXR1cmVzOiBuZXcg V0kuU2V0dGluZygiZXhwZXJpbWVudGFsLWVuYWJsZS1wcmV2aWV3LWZlYXR1cmVzIiwgdHJ1ZSks CiAgICAgZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvRWZmZWN0aXZlOiBuZXcgV0kuU2V0 dGluZygiZXhwZXJpbWVudGFsLXN0eWxlcy1qdW1wLXRvLWVmZmVjdGl2ZSIsIGZhbHNlKSwKICAg ICBleHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9WYXJpYWJsZURlY2xhcmF0aW9uOiBuZXcg V0kuU2V0dGluZygiZXhwZXJpbWVudGFsLXN0eWxlcy1qdW1wLXRvLXZhcmlhYmxlLWRlY2xhcmF0 aW9uIiwgZmFsc2UpLAotICAgIGV4cGVyaW1lbnRhbEVuYWJsZUxheW91dFBhbmVsOiBuZXcgV0ku U2V0dGluZygiZXhwZXJpbWVudGFsLWVuYWJsZS1sYXlvdXQtcGFuZWwiLCBmYWxzZSksCiAgICAg ZXhwZXJpbWVudGFsRW5hYmxlR3JpZEJhZGdlczogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRh bC1lbmFibGUtZ3JpZC1iYWRnZXMiLCBmYWxzZSksCiAgICAgZXhwZXJpbWVudGFsQ29sbGFwc2VC bGFja2JveGVkQ2FsbEZyYW1lczogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1jb2xsYXBz ZS1ibGFja2JveGVkLWNhbGwtZnJhbWVzIiwgZmFsc2UpLAogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNU YWJDb250ZW50Vmlldy5qcwppbmRleCA5ZjIzMmVjN2RkN2EuLjJjOGRhZTg5ODNmYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNU YWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0zMiw3ICszMiw4IEBAIFdJLkVs ZW1lbnRzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBFbGVtZW50c1RhYkNvbnRlbnRWaWV3IGV4dGVu ZHMgV0kuQ29udGVudEJyb3dzCiAgICAgICAgICAgICBXSS5Db21wdXRlZFN0eWxlRGV0YWlsc1Np ZGViYXJQYW5lbCwKICAgICAgICAgXTsKIAotICAgICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJp bWVudGFsRW5hYmxlTGF5b3V0UGFuZWwudmFsdWUpCisgICAgICAgIC8vIENPTVBBVElCSUxJVFkg KGlPUyAxNC41KTogYERPTS5zaG93R3JpZE92ZXJsYXlgIGRpZCBub3QgZXhpc3QgeWV0LgorICAg ICAgICBpZiAoSW5zcGVjdG9yQmFja2VuZC5oYXNDb21tYW5kKCJET00uc2hvd0dyaWRPdmVybGF5 IikpCiAgICAgICAgICAgICBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzLnB1c2goV0ku TGF5b3V0RGV0YWlsc1NpZGViYXJQYW5lbCk7CiAKICAgICAgICAgLy8gQ09NUEFUSUJJTElUWSAo aU9TIDE0LjApOiBgQ1NTLmdldEZvbnREYXRhRm9yTm9kZWAgZGlkIG5vdCBleGlzdCB5ZXQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0 aW5nc1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwppbmRleCBkMmUwZDliZjI4N2IuLjUx MWZmZjRhYmYxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0z OTgsNyArMzk4LDYgQEAgV0kuU2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdz VGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50VmkKICAgICAgICAgICAgIGxldCBz dHlsZXNHcm91cCA9IGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRHcm91cChXSS5VSVN0cmlu ZygiU3R5bGVzOiIpKTsKICAgICAgICAgICAgIHN0eWxlc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0 dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvRWZmZWN0aXZlLCBXSS5VSVN0cmlu ZygiU2hvdyBqdW1wIHRvIGVmZmVjdGl2ZSBwcm9wZXJ0eSBidXR0b24iKSk7CiAgICAgICAgICAg ICBzdHlsZXNHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVN0 eWxlc0p1bXBUb1ZhcmlhYmxlRGVjbGFyYXRpb24sIFdJLlVJU3RyaW5nKCJTaG93IGp1bXAgdG8g dmFyaWFibGUgZGVjbGFyYXRpb24gYnV0dG9uIikpOwotICAgICAgICAgICAgc3R5bGVzR3JvdXAu YWRkU2V0dGluZyhXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVMYXlvdXRQYW5lbCwgV0ku VUlTdHJpbmcoIlNob3cgTGF5b3V0IHBhbmVsIikpOwogICAgICAgICAgICAgc3R5bGVzR3JvdXAu YWRkU2V0dGluZyhXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVHcmlkQmFkZ2VzLCBXSS51 bmxvY2FsaXplZFN0cmluZygiU2hvdyBcImdyaWRcIiBiYWRnZXMiKSk7CiAKICAgICAgICAgICAg IGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKQEAgLTQyOSw3ICs0Mjgs NiBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50 VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0ku c2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlUHJldmlld0ZlYXR1cmVzKTsKIAogICAgICAgICBp ZiAoaGFzQ1NTRG9tYWluKSB7Ci0gICAgICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGlu Z3MuZXhwZXJpbWVudGFsRW5hYmxlTGF5b3V0UGFuZWwpOwogICAgICAgICAgICAgbGlzdGVuRm9y Q2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUdyaWRCYWRnZXMpOwogICAgICAg ICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVN0eWxl c0p1bXBUb0VmZmVjdGl2ZSk7CiAgICAgICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGlu Z3MuZXhwZXJpbWVudGFsRW5hYmxlU3R5bGVzSnVtcFRvVmFyaWFibGVEZWNsYXJhdGlvbik7Cg==