230923 2021-09-28 16:32:20 -0700 Web Inspector: add settings option for 'Show Mock Web Extension Tab' in engineering builds 2021-09-28 23:32:39 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg ews-watchlist hi inspector-bugzilla-changes pangle webkit-bug-importer oldest_to_newest 1798098 0 bburg 2021-09-28 16:32:20 -0700 . 1798100 1 439543 bburg 2021-09-28 16:42:23 -0700 Created attachment 439543 Patch v1.0 1798110 2 439543 hi 2021-09-28 16:56:37 -0700 Comment on attachment 439543 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=439543&action=review r=me with some fixes > Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js:153 > + let enabled = WI.settings.engineeringShowMockWebExtensionTab.value; > + if (!enabled) { NIT: you don't need to save this to a variable if it's only used once > Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js:155 > + mockWebExtension = null; this doesn't appear to be created anywhere > Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js:161 > + console.error("Problem creating mock web extension: " + error); Do you wanna `WI.reportInternalError` so that the Uncaught Exception Reporter is shown? > Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js:167 > + console.error("Problem creating mock web extension tab: " + result); ditto (:161) > Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js:171 > + WI.settings.engineeringShowMockWebExtensionTab.addEventListener(WI.Setting.Event.Changed, updateMockWebExtensionTab, null); I think the `null` will cause an assertion to fail, as we need to have a `thisObject` in order for `WeakRef` to work properly. You can use `WI.settings.engineeringShowMockWebExtensionTab` as the `thisObject` since it's the first thing checked inside the listener (and it matches other things). 1798113 3 webkit-bug-importer 2021-09-28 16:58:02 -0700 <rdar://problem/83647450> 1798183 4 439543 bburg 2021-09-28 22:25:57 -0700 Comment on attachment 439543 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=439543&action=review >> Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js:155 >> + mockWebExtension = null; > > this doesn't appear to be created anywhere Oops. >> Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js:161 >> + console.error("Problem creating mock web extension: " + error); > > Do you wanna `WI.reportInternalError` so that the Uncaught Exception Reporter is shown? Good idea. >> Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js:171 >> + WI.settings.engineeringShowMockWebExtensionTab.addEventListener(WI.Setting.Event.Changed, updateMockWebExtensionTab, null); > > I think the `null` will cause an assertion to fail, as we need to have a `thisObject` in order for `WeakRef` to work properly. You can use `WI.settings.engineeringShowMockWebExtensionTab` as the `thisObject` since it's the first thing checked inside the listener (and it matches other things). Oh, I totally forgot about that change, but it's coming back to me now. Thanks for explaining. 1798185 5 439567 bburg 2021-09-28 22:41:17 -0700 Created attachment 439567 Patch v1.1 (for landing) 1798196 6 ews-feeder 2021-09-28 23:32:37 -0700 Committed r283212 (242254@main): <https://commits.webkit.org/242254@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439567. 439543 2021-09-28 16:42:23 -0700 2021-09-28 22:41:16 -0700 Patch v1.0 bug-230923-20210928164223.patch text/plain 7788 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA4 MDNhZDIyYjMzMGI4NmFiMDI4YTU3NTgzZjIzMTliYzhlMzkwZDJlLi42YTFhMDNmMmNhOWJjMWIw YTA5NmIzYmUwNjQ4YmE5NThkNDViMjM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAyMS0wOS0yOCAgQkogQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgc2V0dGluZ3Mgb3B0aW9uIGZvciAnU2hvdyBNb2NrIFdl YiBFeHRlbnNpb24gVGFiJyBpbiBlbmdpbmVlcmluZyBidWlsZHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDkyMworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYW4gZW5naW5lZXJpbmctb25s eSBmYWNpbGl0eSB0byBxdWlja2x5IGNoZWNrIHRoZSBiZWhhdmlvciBvZgorICAgICAgICBXZWJJ bnNwZWN0b3JFeHRlbnNpb25UYWJDb250ZW50VmlldyAoYWthIFdlYiBFeHRlbnNpb24gVGFicyku IFRoZSBiZWhhdmlvcgorICAgICAgICBvZiB0aGVzZSB0YWJzIGRpZmZlcnMgZnJvbSBvdGhlciB0 YWJzLCBzbyBpdCBpcyBpbXBvcnRhbnQgdG8gbWFrZSB0aGlzIGVhc3kgdG8gdmVyaWZ5LgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanM6IEFkZCBuZXcgc2V0dGluZy4K KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0RlYnVnL0Jvb3RzdHJhcC5qczoKKyAgICAgICAgKHVw ZGF0ZU1vY2tXZWJFeHRlbnNpb25UYWIpOgorICAgICAgICAoV0kucnVuQm9vdHN0cmFwT3BlcmF0 aW9ucyk6CisgICAgICAgIENhbGwgdGhlIEluc3BlY3RvckZyb250ZW5kQVBJIGNvbW1hbmRzIHRo YXQgd291bGQgYmUgY2FsbGVkIGJ5IFdlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlcgor ICAgICAgICB0byByZWdpc3RlciBhbiBleHRlbnNpb24gYW5kIGNyZWF0ZSBhIHRhYiBmb3IgaXQu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0RlYnVnL01vY2tXZWJFeHRlbnNpb25UYWIuaHRt bDogQWRkZWQuCisgICAgICAgIFRoaXMgaXMgYWRhcHRlZCBmcm9tIEluc3BlY3RvckV4dGVuc2lv bi1iYXNpYy10YWIuaHRtbCBhcyB1c2VkIGluIFRlc3RXZWJLaXRBUEkuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1Byb3RvY29sL0luc3BlY3RvckZyb250ZW5kQVBJLmpzOiBGaXggYSB0eXBv IGluIHRoZSBoZWFkZXJkb2MKKyAgICAgICAgZm9yIGNyZWF0ZVRhYkZvckV4dGVuc2lvbi4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qczoK KyAgICAgICAgKFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9jcmVhdGVFbmdp bmVlcmluZ1NldHRpbmdzVmlldyk6CisKIDIwMjEtMDktMjcgIEJKIEJ1cmcgIDxiYnVyZ0BhcHBs ZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBhZGQgX1dLSW5zcGVjdG9yRXh0ZW5zaW9uIFNQSSB0 byBldmFsdWF0ZSBzY3JpcHQgb24gYW4gZXh0ZW5zaW9uIHRhYgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IGJhYjE1MzVj ODYxNjhiYTNhZmQ5ZTA2MGFhOGIyMTQwYzRmZTAyMTEuLmQyZWIyNWI3ZWNlMWE4NDE4MTkyZDE2 YjJhMmJlNDZiZTJlNjNhMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKQEAgLTI0NSw2ICsyNDUsNyBAQCBXSS5zZXR0aW5n cyA9IHsKICAgICBlbmdpbmVlcmluZ1Nob3dJbnRlcm5hbE9iamVjdHNJbkhlYXBTbmFwc2hvdDog bmV3IFdJLkVuZ2luZWVyaW5nU2V0dGluZygiZW5naW5lZXJpbmctc2hvdy1pbnRlcm5hbC1vYmpl Y3RzLWluLWhlYXAtc25hcHNob3QiLCBmYWxzZSksCiAgICAgZW5naW5lZXJpbmdTaG93UHJpdmF0 ZVN5bWJvbHNJbkhlYXBTbmFwc2hvdDogbmV3IFdJLkVuZ2luZWVyaW5nU2V0dGluZygiZW5naW5l ZXJpbmctc2hvdy1wcml2YXRlLXN5bWJvbHMtaW4taGVhcC1zbmFwc2hvdCIsIGZhbHNlKSwKICAg ICBlbmdpbmVlcmluZ0FsbG93RWRpdGluZ1VzZXJBZ2VudFNoYWRvd1RyZWVzOiBuZXcgV0kuRW5n aW5lZXJpbmdTZXR0aW5nKCJlbmdpbmVlcmluZy1hbGxvdy1lZGl0aW5nLXVzZXItYWdlbnQtc2hh ZG93LXRyZWVzIiwgZmFsc2UpLAorICAgIGVuZ2luZWVyaW5nU2hvd01vY2tXZWJFeHRlbnNpb25U YWI6IG5ldyBXSS5FbmdpbmVlcmluZ1NldHRpbmcoImVuZ2luZWVyaW5nLXNob3ctbW9jay13ZWIt ZXh0ZW5zaW9uLXRhYiIsIGZhbHNlKSwKIAogICAgIC8vIERlYnVnCiAgICAgZGVidWdTaG93Q29u c29sZUV2YWx1YXRpb25zOiBuZXcgV0kuRGVidWdTZXR0aW5nKCJkZWJ1Zy1zaG93LWNvbnNvbGUt ZXZhbHVhdGlvbnMiLCBmYWxzZSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9EZWJ1Zy9Cb290c3RyYXAuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9EZWJ1Zy9Cb290c3RyYXAuanMKaW5kZXggM2MwNWFiYjY4NjkzODc2NjI3 NTliNWNmYzBmYTQzNzBjZWVkNzU4My4uNTNmZTZkNzRlMTA4YmE3NWI5YmM4Nzk0MzE1ZDI1ZjM4 NmJhNDAyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv RGVidWcvQm9vdHN0cmFwLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0RlYnVnL0Jvb3RzdHJhcC5qcwpAQCAtMTM5LDYgKzEzOSwzOCBAQCBXSS5ydW5Cb290c3Ry YXBPcGVyYXRpb25zID0gZnVuY3Rpb24oKSB7CiAgICAgICAgIFdJLnRhYkJhci5uZWVkc0xheW91 dCgpOwogICAgIH0KIAorICAgIGZ1bmN0aW9uIHVwZGF0ZU1vY2tXZWJFeHRlbnNpb25UYWIoKSB7 CisgICAgICAgIGxldCBtb2NrRGF0YSA9IHsKKyAgICAgICAgICAgIGV4dGVuc2lvbklEOiAiMTIz NDU2Nzg5MEFCQ0RFRiIsCisgICAgICAgICAgICBkaXNwbGF5TmFtZTogV0kudW5sb2NhbGl6ZWRT dHJpbmcoIk1vY2sgRXh0ZW5zaW9uIiksCisgICAgICAgICAgICB0YWJOYW1lOiBXSS51bmxvY2Fs aXplZFN0cmluZygiTW9jayIpLAorICAgICAgICAgICAgdGFiSWNvblVSTDogIkltYWdlcy9JbmZv LnN2ZyIsCisgICAgICAgICAgICBzb3VyY2VVUkw6ICJEZWJ1Zy9Nb2NrV2ViRXh0ZW5zaW9uVGFi Lmh0bWwiLAorICAgICAgICB9OworCisgICAgICAgIC8vIFNpbXVsYXRlcyB0aGUgc3RlcHMgdGFr ZW4gYnkgV2ViSW5zcGVjdG9yVUlFeHRlbnNpb25Db250cm9sbGVyIHRvIGNyZWF0ZSBhbiBleHRl bnNpb24gdGFiIGluIFdlYkluc3BlY3RvclVJLgorICAgICAgICBsZXQgZW5hYmxlZCA9IFdJLnNl dHRpbmdzLmVuZ2luZWVyaW5nU2hvd01vY2tXZWJFeHRlbnNpb25UYWIudmFsdWU7CisgICAgICAg IGlmICghZW5hYmxlZCkgeworICAgICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRBUEkudW5yZWdp c3RlckV4dGVuc2lvbihtb2NrRGF0YS5leHRlbnNpb25JRCk7CisgICAgICAgICAgICBtb2NrV2Vi RXh0ZW5zaW9uID0gbnVsbDsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAg ICAgIGxldCBlcnJvciA9IEluc3BlY3RvckZyb250ZW5kQVBJLnJlZ2lzdGVyRXh0ZW5zaW9uKG1v Y2tEYXRhLmV4dGVuc2lvbklELCBtb2NrRGF0YS5kaXNwbGF5TmFtZSk7CisgICAgICAgIGlmIChl cnJvcikgeworICAgICAgICAgICAgY29uc29sZS5lcnJvcigiUHJvYmxlbSBjcmVhdGluZyBtb2Nr IHdlYiBleHRlbnNpb246ICIgKyBlcnJvcik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IH0KKworICAgICAgICBsZXQgcmVzdWx0ID0gSW5zcGVjdG9yRnJvbnRlbmRBUEkuY3JlYXRlVGFi Rm9yRXh0ZW5zaW9uKG1vY2tEYXRhLmV4dGVuc2lvbklELCBtb2NrRGF0YS50YWJOYW1lLCBtb2Nr RGF0YS50YWJJY29uVVJMLCBtb2NrRGF0YS5zb3VyY2VVUkwpOworICAgICAgICBpZiAoIXJlc3Vs dD8uZXh0ZW5zaW9uVGFiSUQpIHsKKyAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIlByb2JsZW0g Y3JlYXRpbmcgbW9jayB3ZWIgZXh0ZW5zaW9uIHRhYjogIiArIHJlc3VsdCk7CisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KKyAgICB9CisgICAgV0kuc2V0dGluZ3MuZW5naW5lZXJpbmdT aG93TW9ja1dlYkV4dGVuc2lvblRhYi5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZlbnQu Q2hhbmdlZCwgdXBkYXRlTW9ja1dlYkV4dGVuc2lvblRhYiwgbnVsbCk7CisgICAgdXBkYXRlTW9j a1dlYkV4dGVuc2lvblRhYigpOworCiAgICAgV0kuc2hvd0RlYnVnVUlTZXR0aW5nLmFkZEV2ZW50 TGlzdGVuZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCBmdW5jdGlvbihldmVudCkgewogICAg ICAgICB1cGRhdGVEZWJ1Z1VJKCk7CiAgICAgfSwgZ3JvdXBOYXZpZ2F0aW9uSXRlbSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Zy9Nb2NrV2Vi RXh0ZW5zaW9uVGFiLmh0bWwgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9E ZWJ1Zy9Nb2NrV2ViRXh0ZW5zaW9uVGFiLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTFlNGNiMTViNzMzMjNh ODNjYjNhNWY4ZGQzOTIyZjI1MTNhMjNlMQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RlYnVnL01vY2tXZWJFeHRlbnNpb25UYWIuaHRtbApA QCAtMCwwICsxLDI0IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK3dpbmRvdy5fc2VjcmV0 VmFsdWUgPSB7YW5zd2VyOjQyfTsKKword2luZG93LmdldFVuaXF1ZVZhbHVlID0gZnVuY3Rpb24o KSB7CisgICAgaWYgKCF3aW5kb3cuX2NhY2hlZFVuaXF1ZVZhbHVlKQorICAgICAgICB3aW5kb3cu X2NhY2hlZFVuaXF1ZVZhbHVlID0gTWF0aC5mbG9vcihNYXRoLnJhbmRvbSgpICogMTBlOSk7CisK KyAgICByZXR1cm4gd2luZG93Ll9jYWNoZWRVbmlxdWVWYWx1ZTsKK30KKworZnVuY3Rpb24gaW5p dGlhbGl6ZSgpIHsKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidW5pcXVlVmFsdWVGaWVs ZCIpLmlubmVyVGV4dCA9IHdpbmRvdy5nZXRVbmlxdWVWYWx1ZSgpOworfTsKKzwvc2NyaXB0Pgor PGJvZHkgb25sb2FkPSJpbml0aWFsaXplKCkiPgorPGgxPlRoaXMgaXMgYSB0ZXN0IGV4dGVuc2lv bi48L2gxPgorPHA+SW4gYSBub3JtYWwgZXh0ZW5zaW9uLCB0aGlzIGFyZWEgd291bGQgc2hvdyB0 aGUgZXh0ZW5zaW9uJ3MgdXNlciBpbnRlcmZhY2UuPC9wPgorPHA+VGhlIHVuaXF1ZSB2YWx1ZSBm b3IgdGhpcyBpZnJhbWUncyBleGVjdXRpb24gY29udGV4dCBpczoKKyAgICA8c3BhbiBpZD0idW5p cXVlVmFsdWVGaWVsZCI+VEJEPC9zcGFuPgorPC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVj dG9yRnJvbnRlbmRBUEkuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Q cm90b2NvbC9JbnNwZWN0b3JGcm9udGVuZEFQSS5qcwppbmRleCA5MmE5NThlZDU5YmQ4OTQ1NDg2 OWQxM2ZjNjBiMTljZTBkYThlOThlLi5jNmMwYWVkNzNhYTNiNGU2NmM5NGJhOWFmNjU4MThmNzZi Y2Q2ZGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Q cm90b2NvbC9JbnNwZWN0b3JGcm9udGVuZEFQSS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JGcm9udGVuZEFQSS5qcwpAQCAtMjEx LDcgKzIxMSw3IEBAIEluc3BlY3RvckZyb250ZW5kQVBJID0gewogICAgIH0sCiAKICAgICAvLyBS ZXR1cm5zIGEgV0kuV2ViSW5zcGVjdG9yRXh0ZW5zaW9uLkVycm9yQ29kZSBpZiBhbiBlcnJvciBv Y2N1cnJlZCwgb3RoZXJ3aXNlIGFuIG9iamVjdAotICAgIC8vIHdpdGggYW4gJ2luc3BlY3RvckV4 dGVuc2lvbklEJyBrZXkgcmVwcmVzZW50aW5nIHRoZSB0YWIgaWRlbnRpZmllciBmb3IgdGhlIG5l d2x5IGNyZWF0ZWQgdGFiLgorICAgIC8vIHdpdGggYW4gJ2V4dGVuc2lvblRhYklEJyBrZXkgcmVw cmVzZW50aW5nIHRoZSB0YWIgaWRlbnRpZmllciBmb3IgdGhlIG5ld2x5IGNyZWF0ZWQgdGFiLgog ICAgIGNyZWF0ZVRhYkZvckV4dGVuc2lvbihleHRlbnNpb25JRCwgdGFiTmFtZSwgdGFiSWNvblVS TCwgc291cmNlVVJMKQogICAgIHsKICAgICAgICAgcmV0dXJuIFdJLnNoYXJlZEFwcC5leHRlbnNp b25Db250cm9sbGVyLmNyZWF0ZVRhYkZvckV4dGVuc2lvbihleHRlbnNpb25JRCwgdGFiTmFtZSwg dGFiSWNvblVSTCwgc291cmNlVVJMKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 LmpzCmluZGV4IDUxOTA0MjlkYmIxYmU2NmY5ZTZjN2NlZjZjYmJjZDBiZWM1YzI1MTIuLjVlNDlm Zjk2M2RmYzNjNTA3NjEzZjU5MzhlMWM1M2ZjNjc1NzZmZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGlu Z3NUYWJDb250ZW50Vmlldy5qcwpAQCAtNDY1LDYgKzQ2NSw5IEBAIFdJLlNldHRpbmdzVGFiQ29u dGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29u dGVudFZpCiAgICAgICAgIGhlYXBTbmFwc2hvdEdyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3Mu ZW5naW5lZXJpbmdTaG93SW50ZXJuYWxPYmplY3RzSW5IZWFwU25hcHNob3QsIFdJLnVubG9jYWxp emVkU3RyaW5nKCJTaG93IEludGVybmFsIE9iamVjdHMiKSk7CiAgICAgICAgIGhlYXBTbmFwc2hv dEdyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZW5naW5lZXJpbmdTaG93UHJpdmF0ZVN5bWJv bHNJbkhlYXBTbmFwc2hvdCwgV0kudW5sb2NhbGl6ZWRTdHJpbmcoIlNob3cgUHJpdmF0ZSBTeW1i b2xzIikpOwogCisgICAgICAgIGxldCBleHRlbnNpb25zR3JvdXAgPSBlbmdpbmVlcmluZ1NldHRp bmdzVmlldy5hZGRHcm91cChXSS51bmxvY2FsaXplZFN0cmluZygiV2ViIEV4dGVuc2lvbnM6Iikp OworICAgICAgICBleHRlbnNpb25zR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5lbmdpbmVl cmluZ1Nob3dNb2NrV2ViRXh0ZW5zaW9uVGFiLCBXSS51bmxvY2FsaXplZFN0cmluZygiU2hvdyBN b2NrIFdlYiBFeHRlbnNpb24gdGFiIikpOworCiAgICAgICAgIHRoaXMuYWRkU2V0dGluZ3NWaWV3 KGVuZ2luZWVyaW5nU2V0dGluZ3NWaWV3KTsKICAgICB9CiAK 439567 2021-09-28 22:41:17 -0700 2021-09-28 23:32:38 -0700 Patch v1.1 (for landing) bug-230923-20210928224117.patch text/plain 7776 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA4 MDNhZDIyYjMzMGI4NmFiMDI4YTU3NTgzZjIzMTliYzhlMzkwZDJlLi43OGY4NjAzYTk3MDlmNDdl YWVjYTY3M2M3YzgwYWIzYjRmYThmZTY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAyMS0wOS0yOCAgQkogQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgc2V0dGluZ3Mgb3B0aW9uIGZvciAnU2hvdyBNb2NrIFdl YiBFeHRlbnNpb24gVGFiJyBpbiBlbmdpbmVlcmluZyBidWlsZHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDkyMworCisgICAgICAgIFJldmlld2Vk IGJ5IERldmluIFJvdXNzby4KKworICAgICAgICBUaGlzIGlzIGFuIGVuZ2luZWVyaW5nLW9ubHkg ZmFjaWxpdHkgdG8gcXVpY2tseSBjaGVjayB0aGUgYmVoYXZpb3Igb2YKKyAgICAgICAgV2ViSW5z cGVjdG9yRXh0ZW5zaW9uVGFiQ29udGVudFZpZXcgKGFrYSBXZWIgRXh0ZW5zaW9uIFRhYnMpLiBU aGUgYmVoYXZpb3IKKyAgICAgICAgb2YgdGhlc2UgdGFicyBkaWZmZXJzIGZyb20gb3RoZXIgdGFi cywgc28gaXQgaXMgaW1wb3J0YW50IHRvIG1ha2UgdGhpcyBlYXN5IHRvIHZlcmlmeS4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOiBBZGQgbmV3IHNldHRpbmcuCisg ICAgICAgICogVXNlckludGVyZmFjZS9EZWJ1Zy9Cb290c3RyYXAuanM6CisgICAgICAgICh1cGRh dGVNb2NrV2ViRXh0ZW5zaW9uVGFiKToKKyAgICAgICAgKFdJLnJ1bkJvb3RzdHJhcE9wZXJhdGlv bnMpOgorICAgICAgICBDYWxsIHRoZSBJbnNwZWN0b3JGcm9udGVuZEFQSSBjb21tYW5kcyB0aGF0 IHdvdWxkIGJlIGNhbGxlZCBieSBXZWJJbnNwZWN0b3JVSUV4dGVuc2lvbkNvbnRyb2xsZXIKKyAg ICAgICAgdG8gcmVnaXN0ZXIgYW4gZXh0ZW5zaW9uIGFuZCBjcmVhdGUgYSB0YWIgZm9yIGl0Lgor CisgICAgICAgICogVXNlckludGVyZmFjZS9EZWJ1Zy9Nb2NrV2ViRXh0ZW5zaW9uVGFiLmh0bWw6 IEFkZGVkLgorICAgICAgICBUaGlzIGlzIGFkYXB0ZWQgZnJvbSBJbnNwZWN0b3JFeHRlbnNpb24t YmFzaWMtdGFiLmh0bWwgYXMgdXNlZCBpbiBUZXN0V2ViS2l0QVBJLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JGcm9udGVuZEFQSS5qczogRml4IGEgdHlwbyBp biB0aGUgaGVhZGVyZG9jCisgICAgICAgIGZvciBjcmVhdGVUYWJGb3JFeHRlbnNpb24uCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRlRW5naW5l ZXJpbmdTZXR0aW5nc1ZpZXcpOgorCiAyMDIxLTA5LTI3ICBCSiBCdXJnICA8YmJ1cmdAYXBwbGUu Y29tPgogCiAgICAgICAgIFtDb2NvYV0gYWRkIF9XS0luc3BlY3RvckV4dGVuc2lvbiBTUEkgdG8g ZXZhbHVhdGUgc2NyaXB0IG9uIGFuIGV4dGVuc2lvbiB0YWIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcwppbmRleCBiYWIxNTM1Yzg2 MTY4YmEzYWZkOWUwNjBhYThiMjE0MGM0ZmUwMjExLi5kMmViMjViN2VjZTFhODQxODE5MmQxNmIy YTJiZTQ2YmUyZTYzYTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL1NldHRpbmcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCkBAIC0yNDUsNiArMjQ1LDcgQEAgV0kuc2V0dGluZ3Mg PSB7CiAgICAgZW5naW5lZXJpbmdTaG93SW50ZXJuYWxPYmplY3RzSW5IZWFwU25hcHNob3Q6IG5l dyBXSS5FbmdpbmVlcmluZ1NldHRpbmcoImVuZ2luZWVyaW5nLXNob3ctaW50ZXJuYWwtb2JqZWN0 cy1pbi1oZWFwLXNuYXBzaG90IiwgZmFsc2UpLAogICAgIGVuZ2luZWVyaW5nU2hvd1ByaXZhdGVT eW1ib2xzSW5IZWFwU25hcHNob3Q6IG5ldyBXSS5FbmdpbmVlcmluZ1NldHRpbmcoImVuZ2luZWVy aW5nLXNob3ctcHJpdmF0ZS1zeW1ib2xzLWluLWhlYXAtc25hcHNob3QiLCBmYWxzZSksCiAgICAg ZW5naW5lZXJpbmdBbGxvd0VkaXRpbmdVc2VyQWdlbnRTaGFkb3dUcmVlczogbmV3IFdJLkVuZ2lu ZWVyaW5nU2V0dGluZygiZW5naW5lZXJpbmctYWxsb3ctZWRpdGluZy11c2VyLWFnZW50LXNoYWRv dy10cmVlcyIsIGZhbHNlKSwKKyAgICBlbmdpbmVlcmluZ1Nob3dNb2NrV2ViRXh0ZW5zaW9uVGFi OiBuZXcgV0kuRW5naW5lZXJpbmdTZXR0aW5nKCJlbmdpbmVlcmluZy1zaG93LW1vY2std2ViLWV4 dGVuc2lvbi10YWIiLCBmYWxzZSksCiAKICAgICAvLyBEZWJ1ZwogICAgIGRlYnVnU2hvd0NvbnNv bGVFdmFsdWF0aW9uczogbmV3IFdJLkRlYnVnU2V0dGluZygiZGVidWctc2hvdy1jb25zb2xlLWV2 YWx1YXRpb25zIiwgZmFsc2UpLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvRGVidWcvQm9vdHN0cmFwLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvRGVidWcvQm9vdHN0cmFwLmpzCmluZGV4IDNjMDVhYmI2ODY5Mzg3NjYyNzU5 YjVjZmMwZmE0MzcwY2VlZDc1ODMuLjhkNDQwMzZlYmEzY2RkNWIwYWY1NjE5MjU0MmJkMWQ1NzU1 Yzk2MTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Rl YnVnL0Jvb3RzdHJhcC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9EZWJ1Zy9Cb290c3RyYXAuanMKQEAgLTEzOSw2ICsxMzksMzYgQEAgV0kucnVuQm9vdHN0cmFw T3BlcmF0aW9ucyA9IGZ1bmN0aW9uKCkgewogICAgICAgICBXSS50YWJCYXIubmVlZHNMYXlvdXQo KTsKICAgICB9CiAKKyAgICBmdW5jdGlvbiB1cGRhdGVNb2NrV2ViRXh0ZW5zaW9uVGFiKCkgewor ICAgICAgICBsZXQgbW9ja0RhdGEgPSB7CisgICAgICAgICAgICBleHRlbnNpb25JRDogIjEyMzQ1 Njc4OTBBQkNERUYiLAorICAgICAgICAgICAgZGlzcGxheU5hbWU6IFdJLnVubG9jYWxpemVkU3Ry aW5nKCJNb2NrIEV4dGVuc2lvbiIpLAorICAgICAgICAgICAgdGFiTmFtZTogV0kudW5sb2NhbGl6 ZWRTdHJpbmcoIk1vY2siKSwKKyAgICAgICAgICAgIHRhYkljb25VUkw6ICJJbWFnZXMvSW5mby5z dmciLAorICAgICAgICAgICAgc291cmNlVVJMOiAiRGVidWcvTW9ja1dlYkV4dGVuc2lvblRhYi5o dG1sIiwKKyAgICAgICAgfTsKKworICAgICAgICAvLyBTaW11bGF0ZXMgdGhlIHN0ZXBzIHRha2Vu IGJ5IFdlYkluc3BlY3RvclVJRXh0ZW5zaW9uQ29udHJvbGxlciB0byBjcmVhdGUgYW4gZXh0ZW5z aW9uIHRhYiBpbiBXZWJJbnNwZWN0b3JVSS4KKyAgICAgICAgaWYgKCFXSS5zZXR0aW5ncy5lbmdp bmVlcmluZ1Nob3dNb2NrV2ViRXh0ZW5zaW9uVGFiLnZhbHVlKSB7CisgICAgICAgICAgICBJbnNw ZWN0b3JGcm9udGVuZEFQSS51bnJlZ2lzdGVyRXh0ZW5zaW9uKG1vY2tEYXRhLmV4dGVuc2lvbklE KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGxldCBlcnJvciA9 IEluc3BlY3RvckZyb250ZW5kQVBJLnJlZ2lzdGVyRXh0ZW5zaW9uKG1vY2tEYXRhLmV4dGVuc2lv bklELCBtb2NrRGF0YS5kaXNwbGF5TmFtZSk7CisgICAgICAgIGlmIChlcnJvcikgeworICAgICAg ICAgICAgV0kucmVwb3J0SW50ZXJuYWxFcnJvcigiUHJvYmxlbSBjcmVhdGluZyBtb2NrIHdlYiBl eHRlbnNpb246ICIgKyBlcnJvcik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKwor ICAgICAgICBsZXQgcmVzdWx0ID0gSW5zcGVjdG9yRnJvbnRlbmRBUEkuY3JlYXRlVGFiRm9yRXh0 ZW5zaW9uKG1vY2tEYXRhLmV4dGVuc2lvbklELCBtb2NrRGF0YS50YWJOYW1lLCBtb2NrRGF0YS50 YWJJY29uVVJMLCBtb2NrRGF0YS5zb3VyY2VVUkwpOworICAgICAgICBpZiAoIXJlc3VsdD8uZXh0 ZW5zaW9uVGFiSUQpIHsKKyAgICAgICAgICAgIFdJLnJlcG9ydEludGVybmFsRXJyb3IoIlByb2Js ZW0gY3JlYXRpbmcgbW9jayB3ZWIgZXh0ZW5zaW9uIHRhYjogIiArIHJlc3VsdCk7CisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICB9CisgICAgV0kuc2V0dGluZ3MuZW5naW5lZXJp bmdTaG93TW9ja1dlYkV4dGVuc2lvblRhYi5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZl bnQuQ2hhbmdlZCwgdXBkYXRlTW9ja1dlYkV4dGVuc2lvblRhYiwgV0kuc2V0dGluZ3MuZW5naW5l ZXJpbmdTaG93TW9ja1dlYkV4dGVuc2lvblRhYik7CisgICAgdXBkYXRlTW9ja1dlYkV4dGVuc2lv blRhYigpOworCiAgICAgV0kuc2hvd0RlYnVnVUlTZXR0aW5nLmFkZEV2ZW50TGlzdGVuZXIoV0ku U2V0dGluZy5FdmVudC5DaGFuZ2VkLCBmdW5jdGlvbihldmVudCkgewogICAgICAgICB1cGRhdGVE ZWJ1Z1VJKCk7CiAgICAgfSwgZ3JvdXBOYXZpZ2F0aW9uSXRlbSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Zy9Nb2NrV2ViRXh0ZW5zaW9uVGFi Lmh0bWwgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Zy9Nb2NrV2Vi RXh0ZW5zaW9uVGFiLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTFlNGNiMTViNzMzMjNhODNjYjNhNWY4ZGQz OTIyZjI1MTNhMjNlMQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0RlYnVnL01vY2tXZWJFeHRlbnNpb25UYWIuaHRtbApAQCAtMCwwICsxLDI0 IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK3dpbmRvdy5fc2VjcmV0VmFsdWUgPSB7YW5z d2VyOjQyfTsKKword2luZG93LmdldFVuaXF1ZVZhbHVlID0gZnVuY3Rpb24oKSB7CisgICAgaWYg KCF3aW5kb3cuX2NhY2hlZFVuaXF1ZVZhbHVlKQorICAgICAgICB3aW5kb3cuX2NhY2hlZFVuaXF1 ZVZhbHVlID0gTWF0aC5mbG9vcihNYXRoLnJhbmRvbSgpICogMTBlOSk7CisKKyAgICByZXR1cm4g d2luZG93Ll9jYWNoZWRVbmlxdWVWYWx1ZTsKK30KKworZnVuY3Rpb24gaW5pdGlhbGl6ZSgpIHsK KyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidW5pcXVlVmFsdWVGaWVsZCIpLmlubmVyVGV4 dCA9IHdpbmRvdy5nZXRVbmlxdWVWYWx1ZSgpOworfTsKKzwvc2NyaXB0PgorPGJvZHkgb25sb2Fk PSJpbml0aWFsaXplKCkiPgorPGgxPlRoaXMgaXMgYSB0ZXN0IGV4dGVuc2lvbi48L2gxPgorPHA+ SW4gYSBub3JtYWwgZXh0ZW5zaW9uLCB0aGlzIGFyZWEgd291bGQgc2hvdyB0aGUgZXh0ZW5zaW9u J3MgdXNlciBpbnRlcmZhY2UuPC9wPgorPHA+VGhlIHVuaXF1ZSB2YWx1ZSBmb3IgdGhpcyBpZnJh bWUncyBleGVjdXRpb24gY29udGV4dCBpczoKKyAgICA8c3BhbiBpZD0idW5pcXVlVmFsdWVGaWVs ZCI+VEJEPC9zcGFuPgorPC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yRnJvbnRlbmRB UEkuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNw ZWN0b3JGcm9udGVuZEFQSS5qcwppbmRleCA5MmE5NThlZDU5YmQ4OTQ1NDg2OWQxM2ZjNjBiMTlj ZTBkYThlOThlLi5jNmMwYWVkNzNhYTNiNGU2NmM5NGJhOWFmNjU4MThmNzZiY2Q2ZGFiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNw ZWN0b3JGcm9udGVuZEFQSS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Qcm90b2NvbC9JbnNwZWN0b3JGcm9udGVuZEFQSS5qcwpAQCAtMjExLDcgKzIxMSw3IEBA IEluc3BlY3RvckZyb250ZW5kQVBJID0gewogICAgIH0sCiAKICAgICAvLyBSZXR1cm5zIGEgV0ku V2ViSW5zcGVjdG9yRXh0ZW5zaW9uLkVycm9yQ29kZSBpZiBhbiBlcnJvciBvY2N1cnJlZCwgb3Ro ZXJ3aXNlIGFuIG9iamVjdAotICAgIC8vIHdpdGggYW4gJ2luc3BlY3RvckV4dGVuc2lvbklEJyBr ZXkgcmVwcmVzZW50aW5nIHRoZSB0YWIgaWRlbnRpZmllciBmb3IgdGhlIG5ld2x5IGNyZWF0ZWQg dGFiLgorICAgIC8vIHdpdGggYW4gJ2V4dGVuc2lvblRhYklEJyBrZXkgcmVwcmVzZW50aW5nIHRo ZSB0YWIgaWRlbnRpZmllciBmb3IgdGhlIG5ld2x5IGNyZWF0ZWQgdGFiLgogICAgIGNyZWF0ZVRh YkZvckV4dGVuc2lvbihleHRlbnNpb25JRCwgdGFiTmFtZSwgdGFiSWNvblVSTCwgc291cmNlVVJM KQogICAgIHsKICAgICAgICAgcmV0dXJuIFdJLnNoYXJlZEFwcC5leHRlbnNpb25Db250cm9sbGVy LmNyZWF0ZVRhYkZvckV4dGVuc2lvbihleHRlbnNpb25JRCwgdGFiTmFtZSwgdGFiSWNvblVSTCwg c291cmNlVVJMKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDUx OTA0MjlkYmIxYmU2NmY5ZTZjN2NlZjZjYmJjZDBiZWM1YzI1MTIuLjVlNDlmZjk2M2RmYzNjNTA3 NjEzZjU5MzhlMWM1M2ZjNjc1NzZmZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50 Vmlldy5qcwpAQCAtNDY1LDYgKzQ2NSw5IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBj bGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAgICAg ICAgIGhlYXBTbmFwc2hvdEdyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZW5naW5lZXJpbmdT aG93SW50ZXJuYWxPYmplY3RzSW5IZWFwU25hcHNob3QsIFdJLnVubG9jYWxpemVkU3RyaW5nKCJT aG93IEludGVybmFsIE9iamVjdHMiKSk7CiAgICAgICAgIGhlYXBTbmFwc2hvdEdyb3VwLmFkZFNl dHRpbmcoV0kuc2V0dGluZ3MuZW5naW5lZXJpbmdTaG93UHJpdmF0ZVN5bWJvbHNJbkhlYXBTbmFw c2hvdCwgV0kudW5sb2NhbGl6ZWRTdHJpbmcoIlNob3cgUHJpdmF0ZSBTeW1ib2xzIikpOwogCisg ICAgICAgIGxldCBleHRlbnNpb25zR3JvdXAgPSBlbmdpbmVlcmluZ1NldHRpbmdzVmlldy5hZGRH cm91cChXSS51bmxvY2FsaXplZFN0cmluZygiV2ViIEV4dGVuc2lvbnM6IikpOworICAgICAgICBl eHRlbnNpb25zR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5lbmdpbmVlcmluZ1Nob3dNb2Nr V2ViRXh0ZW5zaW9uVGFiLCBXSS51bmxvY2FsaXplZFN0cmluZygiU2hvdyBNb2NrIFdlYiBFeHRl bnNpb24gdGFiIikpOworCiAgICAgICAgIHRoaXMuYWRkU2V0dGluZ3NWaWV3KGVuZ2luZWVyaW5n U2V0dGluZ3NWaWV3KTsKICAgICB9CiAK