220773 2021-01-20 10:36:56 -0800 [Cocoa] Web Inspector: Console search box is broken, advancing to next result instead pastes from system find pasteboard 2021-03-09 09:35:39 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg rcaliman bburg ews-watchlist hi inspector-bugzilla-changes rcaliman webkit-bug-importer oldest_to_newest 1720929 0 bburg 2021-01-20 10:36:56 -0800 From a user report: """ I'm having trouble navigating to different instances of a word using ⌘F and ⌘G/⇧⌘G while inside of the console. Simple example/steps to reproduce without needing to set up any environment: Go to a random website. Here's a page that you can use: Safari Web Inspector Console Open the Safari Dev Tools using ⌘I. Navigate to the "Console" tab. Log an object by using console.dir(Object). Inside the console, use the shortcut ⌘F (find) or put your cursor inside the search box. Search for something. For example, I searched for "function". Try navigating to the next instance of the word using ⌘G or by clicking on the right arrow next to the search bar. After using ⌘G, you should notice that it locks up and does not navigate to the next instance of the word. In specific, it seems to replace part of the word that I'm searching for with a chunk of a word that I used from my last session. For example, when I search for the "function," it replaces the word with "loc" because in my previous session, I searched for "location." """ 1720930 1 webkit-bug-importer 2021-01-20 10:37:12 -0800 <rdar://problem/73410423> 1722155 2 418313 rcaliman 2021-01-25 11:17:20 -0800 Created attachment 418313 Patch 1722157 3 418315 rcaliman 2021-01-25 11:25:20 -0800 Created attachment 418315 Patch 1722164 4 418313 hi 2021-01-25 11:32:45 -0800 Comment on attachment 418313 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418313&action=review > Source/WebInspectorUI/UserInterface/Views/LogContentView.js:64 > this._findBanner = new WI.FindBanner(this, "console-find-banner", fixed); Instead of modifying `showing` to have all this other logic and modification sites, can we instead save `fixed` and use it inside `set targetElement` like so ``` - this._targetElement.classList.remove(WI.FindBanner.ShowingFindBannerStyleClassName); + this._targetElement.classList.toggle(WI.FindBanner.ShowingFindBannerStyleClassName, this._fixed); ``` 1722194 5 418313 rcaliman 2021-01-25 12:22:43 -0800 Comment on attachment 418313 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418313&action=review >> Source/WebInspectorUI/UserInterface/Views/LogContentView.js:64 >> this._findBanner = new WI.FindBanner(this, "console-find-banner", fixed); > > Instead of modifying `showing` to have all this other logic and modification sites, can we instead save `fixed` and use it inside `set targetElement` like so > ``` > - this._targetElement.classList.remove(WI.FindBanner.ShowingFindBannerStyleClassName); > + this._targetElement.classList.toggle(WI.FindBanner.ShowingFindBannerStyleClassName, this._fixed); > ``` It can work, but it still relies on checking style classes to determine the component's state. The `fixed` is not straightforward in what it implies. Rename to `alwaysShowing`? Also, we'd need to update either the element checked in the `showing` getter from this.element to this._targetElement (and change the class name) ``` get showing() { - return this.element.classList.contains(WI.FindBanner.ShowingStyleClassName); + return this._targetElement.classList.contains(WI.FindBanner.ShowingFindBannerStyleClassName); } ``` Or toggle the appropriate class on the other element in the `targetElement` setter. ``` if (this._targetElement) this._targetElement.classList.add(WI.FindBanner.SupportsFindBannerStyleClassName); + this.element.classList.toggle(WI.FindBanner.ShowingStyleClassName, this._fixed); ``` Any preference? 1722195 6 418313 rcaliman 2021-01-25 12:22:44 -0800 Comment on attachment 418313 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418313&action=review >> Source/WebInspectorUI/UserInterface/Views/LogContentView.js:64 >> this._findBanner = new WI.FindBanner(this, "console-find-banner", fixed); > > Instead of modifying `showing` to have all this other logic and modification sites, can we instead save `fixed` and use it inside `set targetElement` like so > ``` > - this._targetElement.classList.remove(WI.FindBanner.ShowingFindBannerStyleClassName); > + this._targetElement.classList.toggle(WI.FindBanner.ShowingFindBannerStyleClassName, this._fixed); > ``` It can work, but it still relies on checking style classes to determine the component's state. The `fixed` is not straightforward in what it implies. Rename to `alwaysShowing`? Also, we'd need to update either the element checked in the `showing` getter from this.element to this._targetElement (and change the class name) ``` get showing() { - return this.element.classList.contains(WI.FindBanner.ShowingStyleClassName); + return this._targetElement.classList.contains(WI.FindBanner.ShowingFindBannerStyleClassName); } ``` Or toggle the appropriate class on the other element in the `targetElement` setter. ``` if (this._targetElement) this._targetElement.classList.add(WI.FindBanner.SupportsFindBannerStyleClassName); + this.element.classList.toggle(WI.FindBanner.ShowingStyleClassName, this._fixed); ``` Any preference? 1722217 7 418313 hi 2021-01-25 12:57:14 -0800 Comment on attachment 418313 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418313&action=review >>>> Source/WebInspectorUI/UserInterface/Views/LogContentView.js:64 >>>> this._findBanner = new WI.FindBanner(this, "console-find-banner", fixed); >>> >>> Instead of modifying `showing` to have all this other logic and modification sites, can we instead save `fixed` and use it inside `set targetElement` like so >>> ``` >>> - this._targetElement.classList.remove(WI.FindBanner.ShowingFindBannerStyleClassName); >>> + this._targetElement.classList.toggle(WI.FindBanner.ShowingFindBannerStyleClassName, this._fixed); >>> ``` >> >> It can work, but it still relies on checking style classes to determine the component's state. >> >> The `fixed` is not straightforward in what it implies. Rename to `alwaysShowing`? >> >> Also, we'd need to update either the element checked in the `showing` getter from this.element to this._targetElement (and change the class name) >> >> >> ``` >> get showing() >> { >> - return this.element.classList.contains(WI.FindBanner.ShowingStyleClassName); >> + return this._targetElement.classList.contains(WI.FindBanner.ShowingFindBannerStyleClassName); >> } >> ``` >> >> Or toggle the appropriate class on the other element in the `targetElement` setter. >> >> >> ``` >> if (this._targetElement) >> this._targetElement.classList.add(WI.FindBanner.SupportsFindBannerStyleClassName); >> >> + this.element.classList.toggle(WI.FindBanner.ShowingStyleClassName, this._fixed); >> ``` >> >> Any preference? > > It can work, but it still relies on checking style classes to determine the component's state. > > The `fixed` is not straightforward in what it implies. Rename to `alwaysShowing`? > > Also, we'd need to update either the element checked in the `showing` getter from this.element to this._targetElement (and change the class name) > > > ``` > get showing() > { > - return this.element.classList.contains(WI.FindBanner.ShowingStyleClassName); > + return this._targetElement.classList.contains(WI.FindBanner.ShowingFindBannerStyleClassName); > } > ``` > > Or toggle the appropriate class on the other element in the `targetElement` setter. > > > ``` > if (this._targetElement) > this._targetElement.classList.add(WI.FindBanner.SupportsFindBannerStyleClassName); > > + this.element.classList.toggle(WI.FindBanner.ShowingStyleClassName, this._fixed); > ``` > > Any preference? Oh oops sorry copypasted the wrong code 😅. Yeah it should use `this.element` and `WI.FindBanner.ShowingStyleClassName` (but still in `set targetElement()`). Also, you'd probably want to prevent `WI.FindBanner.ShowingStyleClassName` from being removed in `hide()` if `this._alwaysShowing`. Renaming to `alwaysShowing` sounds fine. I agree that keeping state in the DOM is not ideal, but I personally prefer keeping patches small and focused so as to make scanning `git log` more useful and make rollouts less problematic. As such, I'd rather fix the issue as described in this bug and then have a separate bug to "move `WI.FindBanner` state out of the DOM". 1722466 8 418400 rcaliman 2021-01-26 05:10:16 -0800 Created attachment 418400 Patch 1722563 9 418400 hi 2021-01-26 10:01:06 -0800 Comment on attachment 418400 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418400&action=review r=me :) > Source/WebInspectorUI/UserInterface/Views/FindBanner.js:153 > + this.element.classList.toggle(WI.FindBanner.ShowingStyleClassName, this._alwaysShowing); NIT: it's possible/likely that we'd remove and then re-add `WI.FindBanner.ShowingStyleClassName` inside a single call to `set targetElement`. I think it may be simpler to guard the `this.element.classList.remove(WI.FindBanner.ShowingStyleClassName);` above inside an `if (!this._alwaysShowing)` (like you have in `hide()`) and then add `this.element.classList.add(WI.FindBanner.ShowingStyleClassName);` inside the constructor in the `if (this._alwaysShowing)`. I'd originally suggested `set targetElement` because I'd incorrectly thought that we were adding/removing this class from `this._targetElement`, so my apologies if I lead you astray 😅 1737601 10 422711 rcaliman 2021-03-09 08:58:52 -0800 Created attachment 422711 Patch Carry over R+; address review comments 1737619 11 ews-feeder 2021-03-09 09:35:37 -0800 Committed r274151: <https://commits.webkit.org/r274151> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422711. 418313 2021-01-25 11:17:20 -0800 2021-01-25 11:25:15 -0800 Patch bug-220773-20210125201719.patch text/plain 6781 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNlMzMxNmY3MDg1MWYwNWI2NWFiYTE1ZWNjYTYz ZjBlMWNlNjMzZjguLjIzYjMxNmJhYzliYzdlYzE5ZDcwYmZjNmVmNWYyYjM3YTY1OGZiZjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAxLTI1ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIFdlYiBJ bnNwZWN0b3I6IENvbnNvbGUgc2VhcmNoIGJveCBpcyBicm9rZW4sIGFkdmFuY2luZyB0byBuZXh0 IHJlc3VsdCBpbnN0ZWFkIHBhc3RlcyBmcm9tIHN5c3RlbSBmaW5kIHBhc3RlYm9hcmQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDc3MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qczoKKyAgICAgICAgKFdJLkNvbnRlbnRCcm93c2VyLnBy b3RvdHlwZS5hc3luYyBoYW5kbGVGaW5kTmV4dFNob3J0Y3V0KToKKyAgICAgICAgKFdJLkNvbnRl bnRCcm93c2VyLnByb3RvdHlwZS5hc3luYyBoYW5kbGVGaW5kUHJldmlvdXNTaG9ydGN1dCk6Cisg ICAgICAgIChXSS5Db250ZW50QnJvd3Nlci5wcm90b3R5cGUuX3VwZGF0ZUZpbmRCYW5uZXIpOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qczoKKyAgICAgICAgKFdJ LkZpbmRCYW5uZXIpOgorICAgICAgICAoV0kuRmluZEJhbm5lci5wcm90b3R5cGUuc2V0IGlzU2hv d2luZyk6CisgICAgICAgIChXSS5GaW5kQmFubmVyLnByb3RvdHlwZS5nZXQgaXNTaG93aW5nKToK KyAgICAgICAgKFdJLkZpbmRCYW5uZXIucHJvdG90eXBlLnNob3cpOgorICAgICAgICAoV0kuRmlu ZEJhbm5lci5wcm90b3R5cGUuaGlkZSk6CisgICAgICAgIChXSS5GaW5kQmFubmVyLnByb3RvdHlw ZS5nZXQgc2hvd2luZyk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9M b2dDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkxvZ0NvbnRlbnRWaWV3KToKKyAgICAgICAg KFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5oaWdobGlnaHRQcmV2aW91c1NlYXJjaE1hdGNo KToKKyAgICAgICAgKFdJLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5oaWdobGlnaHROZXh0U2Vh cmNoTWF0Y2gpOgorCiAyMDIxLTAxLTIxICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KIAogICAgICAgICBbQXBwbGUgUGF5XSB1c2UgdGhlIGZpcnN0IGl0ZW0gaW4gYHNoaXBwaW5n T3B0aW9uc2AgZXZlbiB3aGVuIGl0J3Mgbm90IGBzZWxlY3RlZGAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIu anMKaW5kZXggZTU2OGY5NjYxM2Q1YzM5ODUwYTZjMTRhODg0NTYxOWMwNWViOWI1Ni4uZDhhMzc1 NTc5YTRhYjkwYmUxYmU2OWM0MjNmMTYxMTcwZDQ0YzE5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIu anMKQEAgLTI1Nyw3ICsyNTcsNyBAQCBXSS5Db250ZW50QnJvd3NlciA9IGNsYXNzIENvbnRlbnRC cm93c2VyIGV4dGVuZHMgV0kuVmlldwogCiAgICAgYXN5bmMgaGFuZGxlRmluZE5leHRTaG9ydGN1 dCgpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX2ZpbmRCYW5uZXIuc2hvd2luZyAmJiB0aGlz Ll9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5ICE9PSBXSS5maW5kU3RyaW5nKSB7CisgICAgICAgIGlm ICghdGhpcy5fZmluZEJhbm5lci5pc1Nob3dpbmcgJiYgdGhpcy5fZmluZEJhbm5lci5zZWFyY2hR dWVyeSAhPT0gV0kuZmluZFN0cmluZykgewogICAgICAgICAgICAgbGV0IHNlYXJjaFF1ZXJ5ID0g V0kuZmluZFN0cmluZzsKICAgICAgICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkg PSBzZWFyY2hRdWVyeTsKIApAQCAtMjc1LDcgKzI3NSw3IEBAIFdJLkNvbnRlbnRCcm93c2VyID0g Y2xhc3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICBhc3luYyBoYW5kbGVG aW5kUHJldmlvdXNTaG9ydGN1dCgpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuX2ZpbmRCYW5u ZXIuc2hvd2luZyAmJiB0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5ICE9PSBXSS5maW5kU3Ry aW5nKSB7CisgICAgICAgIGlmICghdGhpcy5fZmluZEJhbm5lci5pc1Nob3dpbmcgJiYgdGhpcy5f ZmluZEJhbm5lci5zZWFyY2hRdWVyeSAhPT0gV0kuZmluZFN0cmluZykgewogICAgICAgICAgICAg bGV0IHNlYXJjaFF1ZXJ5ID0gV0kuZmluZFN0cmluZzsKICAgICAgICAgICAgIHRoaXMuX2ZpbmRC YW5uZXIuc2VhcmNoUXVlcnkgPSBzZWFyY2hRdWVyeTsKIApAQCAtNDg4LDcgKzQ4OCw3IEBAIFdJ LkNvbnRlbnRCcm93c2VyID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXSS5WaWV3CiAg ICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIubnVtYmVyT2ZSZXN1bHRzID0gY3VycmVudENvbnRlbnRW aWV3Lmhhc1BlcmZvcm1lZFNlYXJjaCA/IGN1cnJlbnRDb250ZW50Vmlldy5udW1iZXJPZlNlYXJj aFJlc3VsdHMgOiBudWxsOwogCiAgICAgICAgIGlmIChjdXJyZW50Q29udGVudFZpZXcuc3VwcG9y dHNTZWFyY2ggJiYgdGhpcy5fZmluZEJhbm5lci5zZWFyY2hRdWVyeSkgewotICAgICAgICAgICAg Y3VycmVudENvbnRlbnRWaWV3LmF1dG9tYXRpY2FsbHlSZXZlYWxGaXJzdFNlYXJjaFJlc3VsdCA9 IHRoaXMuX2ZpbmRCYW5uZXIuc2hvd2luZzsKKyAgICAgICAgICAgIGN1cnJlbnRDb250ZW50Vmll dy5hdXRvbWF0aWNhbGx5UmV2ZWFsRmlyc3RTZWFyY2hSZXN1bHQgPSB0aGlzLl9maW5kQmFubmVy LmlzU2hvd2luZzsKICAgICAgICAgICAgIGN1cnJlbnRDb250ZW50Vmlldy5wZXJmb3JtU2VhcmNo KHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkpOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5l ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5u ZXIuanMKaW5kZXggZDhlYzYyNTdjOWE4NGU4NGM2M2MwOGYxYWY1ZWRiZGUwYzI3M2UxMC4uM2M5 MGRlNWI2NWU5NjYxOTg2ZGNlZjI0YWRiZTE0Y2FjNzE2NTA5NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzCkBA IC0zMCw2ICszMCw3IEBAIFdJLkZpbmRCYW5uZXIgPSBjbGFzcyBGaW5kQmFubmVyIGV4dGVuZHMg V0kuTmF2aWdhdGlvbkl0ZW0KICAgICAgICAgc3VwZXIoKTsKIAogICAgICAgICB0aGlzLl9kZWxl Z2F0ZSA9IGRlbGVnYXRlIHx8IG51bGw7CisgICAgICAgIHRoaXMuX2lzU2hvd2luZyA9IGZhbHNl OwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJmaW5kLWJhbm5lciIpOwog CkBAIC0xNTAsOSArMTUxLDE0IEBAIFdJLkZpbmRCYW5uZXIgPSBjbGFzcyBGaW5kQmFubmVyIGV4 dGVuZHMgV0kuTmF2aWdhdGlvbkl0ZW0KICAgICAgICAgICAgIHRoaXMuX3RhcmdldEVsZW1lbnQu Y2xhc3NMaXN0LmFkZChXSS5GaW5kQmFubmVyLlN1cHBvcnRzRmluZEJhbm5lclN0eWxlQ2xhc3NO YW1lKTsKICAgICB9CiAKLSAgICBnZXQgc2hvd2luZygpCisgICAgc2V0IGlzU2hvd2luZyh2YWx1 ZSA9IGZhbHNlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuZWxlbWVudC5jbGFzc0xpc3Qu Y29udGFpbnMoV0kuRmluZEJhbm5lci5TaG93aW5nU3R5bGVDbGFzc05hbWUpOworICAgICAgICB0 aGlzLl9pc1Nob3dpbmcgPSB2YWx1ZTsKKyAgICB9CisKKyAgICBnZXQgaXNTaG93aW5nKCkKKyAg ICB7CisgICAgICAgIHJldHVybiB0aGlzLl9pc1Nob3dpbmc7CiAgICAgfQogCiAgICAgZm9jdXMo KQpAQCAtMjAyLDYgKzIwOCw4IEBAIFdJLkZpbmRCYW5uZXIgPSBjbGFzcyBGaW5kQmFubmVyIGV4 dGVuZHMgV0kuTmF2aWdhdGlvbkl0ZW0KICAgICAgICAgLy8gdGhlIGRvY3VtZW50LiBBZGRpbmcg dGhlIGNsYXNzIHJpZ2h0IGF3YXkgd2lsbCBwcmV2ZW50IHRoZSBhbmltYXRpb24gZnJvbSB3b3Jr aW5nIHRoZSBmaXJzdCB0aW1lLgogICAgICAgICBzZXRUaW1lb3V0KGRlbGF5ZWRXb3JrLmJpbmQo dGhpcyksIDApOwogCisgICAgICAgIHRoaXMuX2lzU2hvd2luZyA9IHRydWU7CisKICAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuRmluZEJhbm5lci5FdmVudC5EaWRTaG93 KTsKICAgICB9CiAKQEAgLTIxNSw2ICsyMjMsNyBAQCBXSS5GaW5kQmFubmVyID0gY2xhc3MgRmlu ZEJhbm5lciBleHRlbmRzIFdJLk5hdmlnYXRpb25JdGVtCiAKICAgICAgICAgdGhpcy5fdGFyZ2V0 RWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdJLkZpbmRCYW5uZXIuU2hvd2luZ0ZpbmRCYW5uZXJT dHlsZUNsYXNzTmFtZSk7CiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdJ LkZpbmRCYW5uZXIuU2hvd2luZ1N0eWxlQ2xhc3NOYW1lKTsKKyAgICAgICAgdGhpcy5faXNTaG93 aW5nID0gZmFsc2U7CiAKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0ku RmluZEJhbm5lci5FdmVudC5EaWRIaWRlKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCmlu ZGV4IDg2ZmE1NmQyMzdlMjBhZGRmZjYwZThiMTliZGI1NTk0Y2M4N2I2MWEuLmEwM2M5YjBlYzVh YmI2NjUwN2M0NWU4ZjU4YjY5YjcyY2YyY2E3ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCkBA IC02NCw2ICs2NCw3IEBAIFdJLkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZpZXcg ZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB0aGlzLl9maW5kQmFubmVyID0gbmV3IFdJ LkZpbmRCYW5uZXIodGhpcywgImNvbnNvbGUtZmluZC1iYW5uZXIiLCBmaXhlZCk7CiAgICAgICAg IHRoaXMuX2ZpbmRCYW5uZXIudmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0u VmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKICAgICAgICAgdGhpcy5fZmluZEJhbm5lci50YXJnZXRF bGVtZW50ID0gdGhpcy5lbGVtZW50OworICAgICAgICB0aGlzLl9maW5kQmFubmVyLmlzU2hvd2lu ZyA9IHRydWU7CiAKICAgICAgICAgdGhpcy5fY3VycmVudFNlYXJjaFF1ZXJ5ID0gIiI7CiAgICAg ICAgIHRoaXMuX3NlYXJjaE1hdGNoZXMgPSBbXTsKQEAgLTMzMCw3ICszMzEsNyBAQCBXSS5Mb2dD b250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcK IAogICAgIGhpZ2hsaWdodFByZXZpb3VzU2VhcmNoTWF0Y2goKQogICAgIHsKLSAgICAgICAgaWYg KCF0aGlzLmhhc1BlcmZvcm1lZFNlYXJjaCB8fCAoIXRoaXMuX2ZpbmRCYW5uZXIuc2hvd2luZyAm JiB0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5ICE9PSBXSS5maW5kU3RyaW5nKSkgeworICAg ICAgICBpZiAoIXRoaXMuaGFzUGVyZm9ybWVkU2VhcmNoIHx8ICghdGhpcy5fZmluZEJhbm5lci5p c1Nob3dpbmcgJiYgdGhpcy5fZmluZEJhbm5lci5zZWFyY2hRdWVyeSAhPT0gV0kuZmluZFN0cmlu ZykpIHsKICAgICAgICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkgPSBXSS5maW5k U3RyaW5nOwogCiAgICAgICAgICAgICB0aGlzLnBlcmZvcm1TZWFyY2godGhpcy5fZmluZEJhbm5l ci5zZWFyY2hRdWVyeSk7CkBAIC0zNTAsNyArMzUxLDcgQEAgV0kuTG9nQ29udGVudFZpZXcgPSBj bGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAKICAgICBoaWdobGln aHROZXh0U2VhcmNoTWF0Y2goKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLmhhc1BlcmZvcm1l ZFNlYXJjaCB8fCAoIXRoaXMuX2ZpbmRCYW5uZXIuc2hvd2luZyAmJiB0aGlzLl9maW5kQmFubmVy LnNlYXJjaFF1ZXJ5ICE9PSBXSS5maW5kU3RyaW5nKSkgeworICAgICAgICBpZiAoIXRoaXMuaGFz UGVyZm9ybWVkU2VhcmNoIHx8ICghdGhpcy5fZmluZEJhbm5lci5pc1Nob3dpbmcgJiYgdGhpcy5f ZmluZEJhbm5lci5zZWFyY2hRdWVyeSAhPT0gV0kuZmluZFN0cmluZykpIHsKICAgICAgICAgICAg IHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkgPSBXSS5maW5kU3RyaW5nOwogCiAgICAgICAg ICAgICB0aGlzLnBlcmZvcm1TZWFyY2godGhpcy5fZmluZEJhbm5lci5zZWFyY2hRdWVyeSk7Cg== 418315 2021-01-25 11:25:20 -0800 2021-01-26 05:10:11 -0800 Patch bug-220773-20210125202518.patch text/plain 7344 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNlMzMxNmY3MDg1MWYwNWI2NWFiYTE1ZWNjYTYz ZjBlMWNlNjMzZjguLmNjOTg0NDFjMmU4MmJlOTY4NTAzNzJlYTQ2N2FjY2M4ODQ5OGI3YWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTAxLTI1ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIFdlYiBJ bnNwZWN0b3I6IENvbnNvbGUgc2VhcmNoIGJveCBpcyBicm9rZW4sIGFkdmFuY2luZyB0byBuZXh0 IHJlc3VsdCBpbnN0ZWFkIHBhc3RlcyBmcm9tIHN5c3RlbSBmaW5kIHBhc3RlYm9hcmQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDc3MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkdmFuY2luZyB0aHJv dWdoIHNlYXJjaCByZXN1bHRzIGluIHRoZSBDb25zb2xlIHdhcyBicm9rZW4gYmVjYXVzZQorICAg ICAgICB0aGUgbG9naWMgcmVsaWVkIG9uIGNoZWNraW5nIGZvciB0aGUgZXhpc3RlbmNlIG9mIGEg Q1NTIGNsYXNzIG5hbWUKKyAgICAgICAgb24gdGhlIHNlYXJjaCBmaWVsZCB0byBrbm93IHdoZXRo ZXIgaXQgd2FzIHNob3duLiBUaGUgY2xhc3MgbmFtZSBkaWQgbm90IGV4aXN0LgorCisgICAgICAg IFRoZSBjbGFzcyBuYW1lIGlzIHNldCBhZnRlciBjYWxsaW5nIEZpbmRCYW5uZXIuc2hvdygpCisg ICAgICAgIFRoZSBzZWFyY2ggZmllbGQgaW4gdGhlIENvbnNvbGUgaXMgdmlzaWJsZSBieSBkZWZh dWx0LiBUaGUgbWV0aG9kIGlzIG5ldmVyIGNhbGxlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvQ29udGVudEJyb3dzZXIuanM6CisgICAgICAgIChXSS5Db250ZW50QnJvd3Nlci5w cm90b3R5cGUuYXN5bmMgaGFuZGxlRmluZE5leHRTaG9ydGN1dCk6CisgICAgICAgIChXSS5Db250 ZW50QnJvd3Nlci5wcm90b3R5cGUuYXN5bmMgaGFuZGxlRmluZFByZXZpb3VzU2hvcnRjdXQpOgor ICAgICAgICAoV0kuQ29udGVudEJyb3dzZXIucHJvdG90eXBlLl91cGRhdGVGaW5kQmFubmVyKToK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanM6CisgICAgICAgIChX SS5GaW5kQmFubmVyKToKKyAgICAgICAgKFdJLkZpbmRCYW5uZXIucHJvdG90eXBlLnNldCBpc1No b3dpbmcpOgorICAgICAgICAoV0kuRmluZEJhbm5lci5wcm90b3R5cGUuZ2V0IGlzU2hvd2luZyk6 CisgICAgICAgIChXSS5GaW5kQmFubmVyLnByb3RvdHlwZS5zaG93KToKKyAgICAgICAgKFdJLkZp bmRCYW5uZXIucHJvdG90eXBlLmhpZGUpOgorICAgICAgICAoV0kuRmluZEJhbm5lci5wcm90b3R5 cGUuZ2V0IHNob3dpbmcpOiBEZWxldGVkLgorICAgICAgICBSZXBsYWNlIEZpbmRCYW5uZXIuc2hv d2luZyBwcm9wZXJ0eSB3aXRoIEZpbmRCYW5uZXIuaXNTaG93aW5nIHRvIG1ha2UgaXQKKyAgICAg ICAgZXhwbGljaXQgdGhhdCBpdCByZXR1cm5zIGEgYm9vbGVhbiBhbmQgdXBkYXRlIGNhbGwgc2l0 ZXMgYWNjb3JkaW5nbHkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRl bnRWaWV3LmpzOgorICAgICAgICAoV0kuTG9nQ29udGVudFZpZXcpOgorICAgICAgICAoV0kuTG9n Q29udGVudFZpZXcucHJvdG90eXBlLmhpZ2hsaWdodFByZXZpb3VzU2VhcmNoTWF0Y2gpOgorICAg ICAgICAoV0kuTG9nQ29udGVudFZpZXcucHJvdG90eXBlLmhpZ2hsaWdodE5leHRTZWFyY2hNYXRj aCk6CisKIDIwMjEtMDEtMjEgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAg ICAgICAgIFtBcHBsZSBQYXldIHVzZSB0aGUgZmlyc3QgaXRlbSBpbiBgc2hpcHBpbmdPcHRpb25z YCBldmVuIHdoZW4gaXQncyBub3QgYHNlbGVjdGVkYApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwppbmRl eCBlNTY4Zjk2NjEzZDVjMzk4NTBhNmMxNGE4ODQ1NjE5YzA1ZWI5YjU2Li5kOGEzNzU1NzlhNGFi OTBiZTFiZTY5YzQyM2YxNjExNzBkNDRjMTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpAQCAt MjU3LDcgKzI1Nyw3IEBAIFdJLkNvbnRlbnRCcm93c2VyID0gY2xhc3MgQ29udGVudEJyb3dzZXIg ZXh0ZW5kcyBXSS5WaWV3CiAKICAgICBhc3luYyBoYW5kbGVGaW5kTmV4dFNob3J0Y3V0KCkKICAg ICB7Ci0gICAgICAgIGlmICghdGhpcy5fZmluZEJhbm5lci5zaG93aW5nICYmIHRoaXMuX2ZpbmRC YW5uZXIuc2VhcmNoUXVlcnkgIT09IFdJLmZpbmRTdHJpbmcpIHsKKyAgICAgICAgaWYgKCF0aGlz Ll9maW5kQmFubmVyLmlzU2hvd2luZyAmJiB0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5ICE9 PSBXSS5maW5kU3RyaW5nKSB7CiAgICAgICAgICAgICBsZXQgc2VhcmNoUXVlcnkgPSBXSS5maW5k U3RyaW5nOwogICAgICAgICAgICAgdGhpcy5fZmluZEJhbm5lci5zZWFyY2hRdWVyeSA9IHNlYXJj aFF1ZXJ5OwogCkBAIC0yNzUsNyArMjc1LDcgQEAgV0kuQ29udGVudEJyb3dzZXIgPSBjbGFzcyBD b250ZW50QnJvd3NlciBleHRlbmRzIFdJLlZpZXcKIAogICAgIGFzeW5jIGhhbmRsZUZpbmRQcmV2 aW91c1Nob3J0Y3V0KCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fZmluZEJhbm5lci5zaG93 aW5nICYmIHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkgIT09IFdJLmZpbmRTdHJpbmcpIHsK KyAgICAgICAgaWYgKCF0aGlzLl9maW5kQmFubmVyLmlzU2hvd2luZyAmJiB0aGlzLl9maW5kQmFu bmVyLnNlYXJjaFF1ZXJ5ICE9PSBXSS5maW5kU3RyaW5nKSB7CiAgICAgICAgICAgICBsZXQgc2Vh cmNoUXVlcnkgPSBXSS5maW5kU3RyaW5nOwogICAgICAgICAgICAgdGhpcy5fZmluZEJhbm5lci5z ZWFyY2hRdWVyeSA9IHNlYXJjaFF1ZXJ5OwogCkBAIC00ODgsNyArNDg4LDcgQEAgV0kuQ29udGVu dEJyb3dzZXIgPSBjbGFzcyBDb250ZW50QnJvd3NlciBleHRlbmRzIFdJLlZpZXcKICAgICAgICAg dGhpcy5fZmluZEJhbm5lci5udW1iZXJPZlJlc3VsdHMgPSBjdXJyZW50Q29udGVudFZpZXcuaGFz UGVyZm9ybWVkU2VhcmNoID8gY3VycmVudENvbnRlbnRWaWV3Lm51bWJlck9mU2VhcmNoUmVzdWx0 cyA6IG51bGw7CiAKICAgICAgICAgaWYgKGN1cnJlbnRDb250ZW50Vmlldy5zdXBwb3J0c1NlYXJj aCAmJiB0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5KSB7Ci0gICAgICAgICAgICBjdXJyZW50 Q29udGVudFZpZXcuYXV0b21hdGljYWxseVJldmVhbEZpcnN0U2VhcmNoUmVzdWx0ID0gdGhpcy5f ZmluZEJhbm5lci5zaG93aW5nOworICAgICAgICAgICAgY3VycmVudENvbnRlbnRWaWV3LmF1dG9t YXRpY2FsbHlSZXZlYWxGaXJzdFNlYXJjaFJlc3VsdCA9IHRoaXMuX2ZpbmRCYW5uZXIuaXNTaG93 aW5nOwogICAgICAgICAgICAgY3VycmVudENvbnRlbnRWaWV3LnBlcmZvcm1TZWFyY2godGhpcy5f ZmluZEJhbm5lci5zZWFyY2hRdWVyeSk7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcwpp bmRleCBkOGVjNjI1N2M5YTg0ZTg0YzYzYzA4ZjFhZjVlZGJkZTBjMjczZTEwLi4zYzkwZGU1YjY1 ZTk2NjE5ODZkY2VmMjRhZGJlMTRjYWM3MTY1MDk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanMKQEAgLTMwLDYg KzMwLDcgQEAgV0kuRmluZEJhbm5lciA9IGNsYXNzIEZpbmRCYW5uZXIgZXh0ZW5kcyBXSS5OYXZp Z2F0aW9uSXRlbQogICAgICAgICBzdXBlcigpOwogCiAgICAgICAgIHRoaXMuX2RlbGVnYXRlID0g ZGVsZWdhdGUgfHwgbnVsbDsKKyAgICAgICAgdGhpcy5faXNTaG93aW5nID0gZmFsc2U7CiAKICAg ICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImZpbmQtYmFubmVyIik7CiAKQEAgLTE1 MCw5ICsxNTEsMTQgQEAgV0kuRmluZEJhbm5lciA9IGNsYXNzIEZpbmRCYW5uZXIgZXh0ZW5kcyBX SS5OYXZpZ2F0aW9uSXRlbQogICAgICAgICAgICAgdGhpcy5fdGFyZ2V0RWxlbWVudC5jbGFzc0xp c3QuYWRkKFdJLkZpbmRCYW5uZXIuU3VwcG9ydHNGaW5kQmFubmVyU3R5bGVDbGFzc05hbWUpOwog ICAgIH0KIAotICAgIGdldCBzaG93aW5nKCkKKyAgICBzZXQgaXNTaG93aW5nKHZhbHVlID0gZmFs c2UpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5jb250YWlu cyhXSS5GaW5kQmFubmVyLlNob3dpbmdTdHlsZUNsYXNzTmFtZSk7CisgICAgICAgIHRoaXMuX2lz U2hvd2luZyA9IHZhbHVlOworICAgIH0KKworICAgIGdldCBpc1Nob3dpbmcoKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHRoaXMuX2lzU2hvd2luZzsKICAgICB9CiAKICAgICBmb2N1cygpCkBAIC0y MDIsNiArMjA4LDggQEAgV0kuRmluZEJhbm5lciA9IGNsYXNzIEZpbmRCYW5uZXIgZXh0ZW5kcyBX SS5OYXZpZ2F0aW9uSXRlbQogICAgICAgICAvLyB0aGUgZG9jdW1lbnQuIEFkZGluZyB0aGUgY2xh c3MgcmlnaHQgYXdheSB3aWxsIHByZXZlbnQgdGhlIGFuaW1hdGlvbiBmcm9tIHdvcmtpbmcgdGhl IGZpcnN0IHRpbWUuCiAgICAgICAgIHNldFRpbWVvdXQoZGVsYXllZFdvcmsuYmluZCh0aGlzKSwg MCk7CiAKKyAgICAgICAgdGhpcy5faXNTaG93aW5nID0gdHJ1ZTsKKwogICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5GaW5kQmFubmVyLkV2ZW50LkRpZFNob3cpOwogICAg IH0KIApAQCAtMjE1LDYgKzIyMyw3IEBAIFdJLkZpbmRCYW5uZXIgPSBjbGFzcyBGaW5kQmFubmVy IGV4dGVuZHMgV0kuTmF2aWdhdGlvbkl0ZW0KIAogICAgICAgICB0aGlzLl90YXJnZXRFbGVtZW50 LmNsYXNzTGlzdC5yZW1vdmUoV0kuRmluZEJhbm5lci5TaG93aW5nRmluZEJhbm5lclN0eWxlQ2xh c3NOYW1lKTsKICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoV0kuRmluZEJh bm5lci5TaG93aW5nU3R5bGVDbGFzc05hbWUpOworICAgICAgICB0aGlzLl9pc1Nob3dpbmcgPSBm YWxzZTsKIAogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5GaW5kQmFu bmVyLkV2ZW50LkRpZEhpZGUpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKaW5kZXggODZm YTU2ZDIzN2UyMGFkZGZmNjBlOGIxOWJkYjU1OTRjYzg3YjYxYS4uYTAzYzliMGVjNWFiYjY2NTA3 YzQ1ZThmNThiNjliNzJjZjJjYTdlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKQEAgLTY0LDYg KzY0LDcgQEAgV0kuTG9nQ29udGVudFZpZXcgPSBjbGFzcyBMb2dDb250ZW50VmlldyBleHRlbmRz IFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIgPSBuZXcgV0kuRmluZEJh bm5lcih0aGlzLCAiY29uc29sZS1maW5kLWJhbm5lciIsIGZpeGVkKTsKICAgICAgICAgdGhpcy5f ZmluZEJhbm5lci52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmls aXR5UHJpb3JpdHkuTG93OwogICAgICAgICB0aGlzLl9maW5kQmFubmVyLnRhcmdldEVsZW1lbnQg PSB0aGlzLmVsZW1lbnQ7CisgICAgICAgIHRoaXMuX2ZpbmRCYW5uZXIuaXNTaG93aW5nID0gdHJ1 ZTsKIAogICAgICAgICB0aGlzLl9jdXJyZW50U2VhcmNoUXVlcnkgPSAiIjsKICAgICAgICAgdGhp cy5fc2VhcmNoTWF0Y2hlcyA9IFtdOwpAQCAtMzMwLDcgKzMzMSw3IEBAIFdJLkxvZ0NvbnRlbnRW aWV3ID0gY2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogCiAgICAg aGlnaGxpZ2h0UHJldmlvdXNTZWFyY2hNYXRjaCgpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMu aGFzUGVyZm9ybWVkU2VhcmNoIHx8ICghdGhpcy5fZmluZEJhbm5lci5zaG93aW5nICYmIHRoaXMu X2ZpbmRCYW5uZXIuc2VhcmNoUXVlcnkgIT09IFdJLmZpbmRTdHJpbmcpKSB7CisgICAgICAgIGlm ICghdGhpcy5oYXNQZXJmb3JtZWRTZWFyY2ggfHwgKCF0aGlzLl9maW5kQmFubmVyLmlzU2hvd2lu ZyAmJiB0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5ICE9PSBXSS5maW5kU3RyaW5nKSkgewog ICAgICAgICAgICAgdGhpcy5fZmluZEJhbm5lci5zZWFyY2hRdWVyeSA9IFdJLmZpbmRTdHJpbmc7 CiAKICAgICAgICAgICAgIHRoaXMucGVyZm9ybVNlYXJjaCh0aGlzLl9maW5kQmFubmVyLnNlYXJj aFF1ZXJ5KTsKQEAgLTM1MCw3ICszNTEsNyBAQCBXSS5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExv Z0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKIAogICAgIGhpZ2hsaWdodE5leHRT ZWFyY2hNYXRjaCgpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuaGFzUGVyZm9ybWVkU2VhcmNo IHx8ICghdGhpcy5fZmluZEJhbm5lci5zaG93aW5nICYmIHRoaXMuX2ZpbmRCYW5uZXIuc2VhcmNo UXVlcnkgIT09IFdJLmZpbmRTdHJpbmcpKSB7CisgICAgICAgIGlmICghdGhpcy5oYXNQZXJmb3Jt ZWRTZWFyY2ggfHwgKCF0aGlzLl9maW5kQmFubmVyLmlzU2hvd2luZyAmJiB0aGlzLl9maW5kQmFu bmVyLnNlYXJjaFF1ZXJ5ICE9PSBXSS5maW5kU3RyaW5nKSkgewogICAgICAgICAgICAgdGhpcy5f ZmluZEJhbm5lci5zZWFyY2hRdWVyeSA9IFdJLmZpbmRTdHJpbmc7CiAKICAgICAgICAgICAgIHRo aXMucGVyZm9ybVNlYXJjaCh0aGlzLl9maW5kQmFubmVyLnNlYXJjaFF1ZXJ5KTsK 418400 2021-01-26 05:10:16 -0800 2021-03-09 08:58:43 -0800 Patch bug-220773-20210126141015.patch text/plain 3117 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU2NDQ5OTA0M2E2OTk2OTdmMjY1NjRiYTk1OWRk NmJjOTg1YmU4N2MuLjYwM2M2NmZjMDUxNDhmMGM4YTE3ZmNkM2E0ZmU3YTk3YjE4ZWUzYTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTI2ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIFdlYiBJ bnNwZWN0b3I6IENvbnNvbGUgc2VhcmNoIGJveCBpcyBicm9rZW4sIGFkdmFuY2luZyB0byBuZXh0 IHJlc3VsdCBpbnN0ZWFkIHBhc3RlcyBmcm9tIHN5c3RlbSBmaW5kIHBhc3RlYm9hcmQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDc3MworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNzM0MTA0MjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRW5zdXJlIEZpbmRCYW5uZXIgaXMgYWx3YXlzIG1hcmtlZCBh cyBzaG93biBpbiB0aGUgQ29uc29sZQorICAgICAgICB0byBwcmV2ZW50IG1hbGZ1bmN0aW9uIHdo ZW4gYWR2YW5jaW5nIHRocm91Z2ggc2VhcmNoIHJlc3VsdHMuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanM6CisgICAgICAgIChXSS5GaW5kQmFubmVyKToKKyAg ICAgICAgKFdJLkZpbmRCYW5uZXIucHJvdG90eXBlLnNldCB0YXJnZXRFbGVtZW50KToKKyAgICAg ICAgKFdJLkZpbmRCYW5uZXIucHJvdG90eXBlLmhpZGUpOgorCiAyMDIxLTAxLTI1ICBOaWtpdGEg VmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IEFkZCBleHBlcmltZW50YWwgc2V0dGluZyB0byBzaG93IExheW91dCBwYW5lbCBpbiBFbGVtZW50 cyB0YWIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbmRCYW5uZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9GaW5kQmFubmVyLmpzCmluZGV4IGQ4ZWM2MjU3YzlhODRlODRjNjNjMDhmMWFmNWVkYmRl MGMyNzNlMTAuLmZhN2U0M2I0OWJlNzc2MGJkZTVkMzdkYTBmMzY5ZmM2MjYyMzJkZjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5u ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmlu ZEJhbm5lci5qcwpAQCAtMjUsMTEgKzI1LDEyIEBACiAKIFdJLkZpbmRCYW5uZXIgPSBjbGFzcyBG aW5kQmFubmVyIGV4dGVuZHMgV0kuTmF2aWdhdGlvbkl0ZW0KIHsKLSAgICBjb25zdHJ1Y3Rvcihk ZWxlZ2F0ZSwgY2xhc3NOYW1lLCBmaXhlZCA9IGZhbHNlKQorICAgIGNvbnN0cnVjdG9yKGRlbGVn YXRlLCBjbGFzc05hbWUsIGFsd2F5c1Nob3dpbmcgPSBmYWxzZSkKICAgICB7CiAgICAgICAgIHN1 cGVyKCk7CiAKICAgICAgICAgdGhpcy5fZGVsZWdhdGUgPSBkZWxlZ2F0ZSB8fCBudWxsOworICAg ICAgICB0aGlzLl9hbHdheXNTaG93aW5nID0gYWx3YXlzU2hvd2luZzsKIAogICAgICAgICB0aGlz LmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiZmluZC1iYW5uZXIiKTsKIApAQCAtNzMsNyArNzQsNyBA QCBXSS5GaW5kQmFubmVyID0gY2xhc3MgRmluZEJhbm5lciBleHRlbmRzIFdJLk5hdmlnYXRpb25J dGVtCiAgICAgICAgIG5leHRSZXN1bHRCdXR0b25HbHlwaEVsZW1lbnQuY2xhc3NMaXN0LmFkZChX SS5GaW5kQmFubmVyLlNlZ21lbnRHbHlwaFN0eWxlQ2xhc3NOYW1lKTsKICAgICAgICAgdGhpcy5f bmV4dFJlc3VsdEJ1dHRvbi5hcHBlbmRDaGlsZChuZXh0UmVzdWx0QnV0dG9uR2x5cGhFbGVtZW50 KTsKIAotICAgICAgICBpZiAoZml4ZWQpCisgICAgICAgIGlmICh0aGlzLl9hbHdheXNTaG93aW5n KQogICAgICAgICAgICAgdGhpcy5fY2xlYXJBbmRCbHVyS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBX SS5LZXlib2FyZFNob3J0Y3V0KG51bGwsIFdJLktleWJvYXJkU2hvcnRjdXQuS2V5LkVzY2FwZSwg dGhpcy5jbGVhckFuZEJsdXIuYmluZCh0aGlzKSwgdGhpcy5lbGVtZW50KTsKICAgICAgICAgZWxz ZSB7CiAgICAgICAgICAgICBsZXQgZG9uZUJ1dHRvbkVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJidXR0b24iKTsKQEAgLTE0OCw2ICsxNDksOCBAQCBXSS5GaW5kQmFubmVyID0gY2xh c3MgRmluZEJhbm5lciBleHRlbmRzIFdJLk5hdmlnYXRpb25JdGVtCiAKICAgICAgICAgaWYgKHRo aXMuX3RhcmdldEVsZW1lbnQpCiAgICAgICAgICAgICB0aGlzLl90YXJnZXRFbGVtZW50LmNsYXNz TGlzdC5hZGQoV0kuRmluZEJhbm5lci5TdXBwb3J0c0ZpbmRCYW5uZXJTdHlsZUNsYXNzTmFtZSk7 CisKKyAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoV0kuRmluZEJhbm5lci5T aG93aW5nU3R5bGVDbGFzc05hbWUsIHRoaXMuX2Fsd2F5c1Nob3dpbmcpOwogICAgIH0KIAogICAg IGdldCBzaG93aW5nKCkKQEAgLTIxNCw3ICsyMTcsOSBAQCBXSS5GaW5kQmFubmVyID0gY2xhc3Mg RmluZEJhbm5lciBleHRlbmRzIFdJLk5hdmlnYXRpb25JdGVtCiAgICAgICAgIHRoaXMuX2lucHV0 RmllbGQuYmx1cigpOwogCiAgICAgICAgIHRoaXMuX3RhcmdldEVsZW1lbnQuY2xhc3NMaXN0LnJl bW92ZShXSS5GaW5kQmFubmVyLlNob3dpbmdGaW5kQmFubmVyU3R5bGVDbGFzc05hbWUpOwotICAg ICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZShXSS5GaW5kQmFubmVyLlNob3dpbmdT dHlsZUNsYXNzTmFtZSk7CisKKyAgICAgICAgaWYgKCF0aGlzLl9hbHdheXNTaG93aW5nKQorICAg ICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdJLkZpbmRCYW5uZXIuU2hvd2lu Z1N0eWxlQ2xhc3NOYW1lKTsKIAogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXSS5GaW5kQmFubmVyLkV2ZW50LkRpZEhpZGUpOwogICAgIH0K 422711 2021-03-09 08:58:52 -0800 2021-03-09 09:35:38 -0800 Patch bug-220773-20210309175850.patch text/plain 3710 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGY3MDNhNjkzNjM3YzkyY2JmOWMyMzZkMWNiZmM2 ODc4Mzk0ZjE4ZDkuLmNhZGQ2ZmEzMjRjMTRmYmM2MTA3N2QyZThjOGJjYThmYWMwYTM1Y2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTA5ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIFdlYiBJ bnNwZWN0b3I6IENvbnNvbGUgc2VhcmNoIGJveCBpcyBicm9rZW4sIGFkdmFuY2luZyB0byBuZXh0 IHJlc3VsdCBpbnN0ZWFkIHBhc3RlcyBmcm9tIHN5c3RlbSBmaW5kIHBhc3RlYm9hcmQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDc3MworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNzM0MTA0MjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4g Um91c3NvLgorCisgICAgICAgIEVuc3VyZSBGaW5kQmFubmVyIGlzIGFsd2F5cyBtYXJrZWQgYXMg c2hvd24gaW4gdGhlIENvbnNvbGUKKyAgICAgICAgdG8gcHJldmVudCBtYWxmdW5jdGlvbiB3aGVu IGFkdmFuY2luZyB0aHJvdWdoIHNlYXJjaCByZXN1bHRzLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzOgorICAgICAgICAoV0kuRmluZEJhbm5lcik6CisgICAg ICAgIChXSS5GaW5kQmFubmVyLnByb3RvdHlwZS5zZXQgdGFyZ2V0RWxlbWVudCk6CisgICAgICAg IChXSS5GaW5kQmFubmVyLnByb3RvdHlwZS5oaWRlKToKKwogMjAyMS0wMy0wOCAgUGF0cmljayBB bmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVT U0lPTiAocjI2NzAzOCk6IEluc3BlY3RvciBmYWlscyB0byBzaG93IGFueSBkZXRhaWxzIGFib3V0 IGFuaW1hdGlvbnMvdHJhbnNpdGlvbnMgaW4gdGhlIHRpbWVsaW5lCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcwppbmRl eCBkOGVjNjI1N2M5YTg0ZTg0YzYzYzA4ZjFhZjVlZGJkZTBjMjczZTEwLi5iYzJlYzQwNDIxZGQ3 NTJlMzRkNDE3ZmJhZTkxOGY0ZjM3ZmJiMWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanMKQEAgLTI1LDExICsy NSwxMiBAQAogCiBXSS5GaW5kQmFubmVyID0gY2xhc3MgRmluZEJhbm5lciBleHRlbmRzIFdJLk5h dmlnYXRpb25JdGVtCiB7Ci0gICAgY29uc3RydWN0b3IoZGVsZWdhdGUsIGNsYXNzTmFtZSwgZml4 ZWQgPSBmYWxzZSkKKyAgICBjb25zdHJ1Y3RvcihkZWxlZ2F0ZSwgY2xhc3NOYW1lLCBhbHdheXNT aG93aW5nID0gZmFsc2UpCiAgICAgewogICAgICAgICBzdXBlcigpOwogCiAgICAgICAgIHRoaXMu X2RlbGVnYXRlID0gZGVsZWdhdGUgfHwgbnVsbDsKKyAgICAgICAgdGhpcy5fYWx3YXlzU2hvd2lu ZyA9IGFsd2F5c1Nob3dpbmc7CiAKICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQo ImZpbmQtYmFubmVyIik7CiAKQEAgLTczLDkgKzc0LDEwIEBAIFdJLkZpbmRCYW5uZXIgPSBjbGFz cyBGaW5kQmFubmVyIGV4dGVuZHMgV0kuTmF2aWdhdGlvbkl0ZW0KICAgICAgICAgbmV4dFJlc3Vs dEJ1dHRvbkdseXBoRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdJLkZpbmRCYW5uZXIuU2VnbWVudEds eXBoU3R5bGVDbGFzc05hbWUpOwogICAgICAgICB0aGlzLl9uZXh0UmVzdWx0QnV0dG9uLmFwcGVu ZENoaWxkKG5leHRSZXN1bHRCdXR0b25HbHlwaEVsZW1lbnQpOwogCi0gICAgICAgIGlmIChmaXhl ZCkKKyAgICAgICAgaWYgKHRoaXMuX2Fsd2F5c1Nob3dpbmcpIHsKKyAgICAgICAgICAgIHRoaXMu ZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdJLkZpbmRCYW5uZXIuU2hvd2luZ1N0eWxlQ2xhc3NOYW1l KTsKICAgICAgICAgICAgIHRoaXMuX2NsZWFyQW5kQmx1cktleWJvYXJkU2hvcnRjdXQgPSBuZXcg V0kuS2V5Ym9hcmRTaG9ydGN1dChudWxsLCBXSS5LZXlib2FyZFNob3J0Y3V0LktleS5Fc2NhcGUs IHRoaXMuY2xlYXJBbmRCbHVyLmJpbmQodGhpcyksIHRoaXMuZWxlbWVudCk7Ci0gICAgICAgIGVs c2UgeworICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgbGV0IGRvbmVCdXR0b25FbGVtZW50 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYnV0dG9uIik7CiAgICAgICAgICAgICBkb25lQnV0 dG9uRWxlbWVudC50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJEb25lIik7CiAgICAgICAgICAg ICBkb25lQnV0dG9uRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2RvbmVC dXR0b25DbGlja2VkLmJpbmQodGhpcykpOwpAQCAtMTM4LDcgKzE0MCw5IEBAIFdJLkZpbmRCYW5u ZXIgPSBjbGFzcyBGaW5kQmFubmVyIGV4dGVuZHMgV0kuTmF2aWdhdGlvbkl0ZW0KICAgICAgICAg ICAgIHRoaXMuX3RhcmdldEVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZShXSS5GaW5kQmFubmVyLlNo b3dpbmdGaW5kQmFubmVyU3R5bGVDbGFzc05hbWUpOwogCiAgICAgICAgICAgICB0aGlzLmVsZW1l bnQuY2xhc3NMaXN0LmFkZChXSS5GaW5kQmFubmVyLk5vVHJhbnNpdGlvblN0eWxlQ2xhc3NOYW1l KTsKLSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdJLkZpbmRCYW5u ZXIuU2hvd2luZ1N0eWxlQ2xhc3NOYW1lKTsKKworICAgICAgICAgICAgaWYgKCF0aGlzLl9hbHdh eXNTaG93aW5nKQorICAgICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QucmVtb3Zl KFdJLkZpbmRCYW5uZXIuU2hvd2luZ1N0eWxlQ2xhc3NOYW1lKTsKIAogICAgICAgICAgICAgLy8g RGVsYXkgc28gd2UgY2FuIHJlbW92ZSB0aGUgbm8gdHJhbnNpdGlvbiBzdHlsZSBjbGFzcyBhZnRl ciB0aGUgb3RoZXIgc3R5bGUgY2hhbmdlcyBhcmUgY29tbWl0dGVkLgogICAgICAgICAgICAgc2V0 VGltZW91dChkZWxheWVkV29yay5iaW5kKHRoaXMpLCAwKTsKQEAgLTIxNCw3ICsyMTgsOSBAQCBX SS5GaW5kQmFubmVyID0gY2xhc3MgRmluZEJhbm5lciBleHRlbmRzIFdJLk5hdmlnYXRpb25JdGVt CiAgICAgICAgIHRoaXMuX2lucHV0RmllbGQuYmx1cigpOwogCiAgICAgICAgIHRoaXMuX3Rhcmdl dEVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZShXSS5GaW5kQmFubmVyLlNob3dpbmdGaW5kQmFubmVy U3R5bGVDbGFzc05hbWUpOwotICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZShX SS5GaW5kQmFubmVyLlNob3dpbmdTdHlsZUNsYXNzTmFtZSk7CisKKyAgICAgICAgaWYgKCF0aGlz Ll9hbHdheXNTaG93aW5nKQorICAgICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5yZW1v dmUoV0kuRmluZEJhbm5lci5TaG93aW5nU3R5bGVDbGFzc05hbWUpOwogCiAgICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLkZpbmRCYW5uZXIuRXZlbnQuRGlkSGlkZSk7CiAg ICAgfQo=