224772 2021-04-19 11:13:34 -0700 Web Inspector: REGRESSION(r270134) Elements Tab: Details Sidebar toggle is unexpectedly disabled after switching from Timelines tab 2021-04-26 05:28:05 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 rcaliman rcaliman ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1751871 0 rcaliman 2021-04-19 11:13:34 -0700 <rdar://73470211> Occurs when starting Web Inspector on any tab other than Elements. Steps to reproduce: 1. Ensure Timelines Tab will open on Inspector launch (select Timelines, close inspector) 2. Open Inspector, timelines tab should be showing. 3. Switch to Elements Tab => Sidebar Pane toggle is disabled - Icon Tooltip: "Hide the details sidebar" => Elements Tab does not have an actual selection. - Breadcrumbs are not shown in the navigation bar. Workaround: select a new DOM node and the sidebars come back with the icon toggled on. 1751922 1 426465 rcaliman 2021-04-19 12:54:05 -0700 Created attachment 426465 Patch 1751955 2 426465 hi 2021-04-19 13:52:27 -0700 Comment on attachment 426465 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426465&action=review > Source/WebInspectorUI/ChangeLog:10 > + because`WI.DOMTreeOutline.selectedTreeElement`, not `WI.DOMTreeOutline.selectedDOMNode`, is ultimately used to missing space between "... because `WI.DOMTreeOutline..." > Source/WebInspectorUI/ChangeLog:11 > + identify the current represented object when rendering the Elements tab details sidebar panels. Style: we capitalize "Tab" when used with a tab name (e.g. "Elements Tab" vs "a tab") > Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js:521 > + this.dispatchEventToListeners(WI.ContentView.Event.SelectionPathComponentsDidChange); I'm slightly confused. `WI.DOMTreeContentView.prototype._selectedNodeDidChange` should already be called in response to `WI.DOMTreeContentView.prototype._domTreeSelectionDidChange`. `WI.DOMTreeContentView.prototype._selectedNodeDidChange` is the event handler for `WI.DOMTreeOutline.Event.SelectedNodeChanged`, which is dispatched inside `WI.DOMTreeOutline.prototype._selectedNodeChanged`, which is called by `WI.DOMTreeOutline.prototype.selectDOMNode`. So why is it that `WI.DOMTreeOutline.Event.SelectedNodeChanged` isn't getting dispatched? Is the `_selectedDOMNode` already somehow set? 1752266 3 426548 rcaliman 2021-04-20 08:23:20 -0700 Created attachment 426548 Patch Update Changelog 1753149 4 426808 rcaliman 2021-04-22 07:01:10 -0700 Created attachment 426808 Patch 1753221 5 426808 hi 2021-04-22 11:00:53 -0700 Comment on attachment 426808 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426808&action=review > Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js:117 > } Please still call `super.detached()` at the end just in case one of the inherited classes decides to add a `detached` in the future so we don't subtly miss out on that behavior. Also, before this change we would've used `super.detached` by default, so we should preserve that. As a general rule of thumb we almost always (and you need a good reason not to) want to call `super` for any methods inherited from `WI.View`. > Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js:143 > + _showDOMTreeContentViewIfNeeded() I think we can get rid of `_showDOMTreeContentView` while we're at it, as all the callsites are being called either - in response to a main frame/resource change, so we should have a new `WI.DOMTree` anyways - when there is currently no content view being shown, meaning we should show one with whatever the main frame main resource `WI.DOMTree` is right now > Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js:147 > + if (mainDOMTree && this.contentBrowser.currentContentView?.representedObject !== mainDOMTree); > + this.contentBrowser.showContentViewForRepresentedObject(mainDOMTree); NIT: I'd maybe turn this into an series of early-return so that it's clearer what the cases are for the "if needed" part ``` let mainDOMTree = WI.networkManager.mainFrame?.domTree; if (!mainDOMTree) return; if (this.contentBrowser.currentContentView?.representedObject === mainDOMTree) return; this.contentBrowser.showContentViewForRepresentedObject(mainDOMTree); ``` 1753552 6 426900 rcaliman 2021-04-23 05:33:40 -0700 Created attachment 426900 Patch 1753622 7 426900 hi 2021-04-23 10:19:25 -0700 Comment on attachment 426900 Patch r=me 1754161 8 ews-feeder 2021-04-26 05:28:04 -0700 Committed r276587 (237023@main): <https://commits.webkit.org/237023@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426900. 426465 2021-04-19 12:54:05 -0700 2021-04-20 08:23:16 -0700 Patch bug-224772-20210419215402.patch text/plain 3492 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlMzIzOTkyOThjNjIxMmEwMjJkNzNmZjdkZmM5 NWI2Y2FiMjJhZmUuLjBkYzRiOGYwZDc1Y2E4Mjg2YjZlMzJiMTcyMjE1NzcyZGUxNTUyMTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTA0LTE5ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSRUdSRVNTSU9OKHIyNzAxMzQpIEVsZW1lbnRzIFRhYjogRGV0YWlscyBTaWRlYmFyIHRvZ2ds ZSBpcyB1bmV4cGVjdGVkbHkgZGlzYWJsZWQgIGFmdGVyIHN3aXRjaGluZyBmcm9tIFRpbWVsaW5l cyB0YWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NDc3MgorICAgICAgICA8cmRhcjovLzczNDcwMjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIERpc3BhdGNoIHRoZSBgV0kuQ29udGVudFZpZXcuRXZl bnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2VgIGV2ZW50IHdoZW4gdGhlIGFjdHVh bCBET00gdHJlZSBzZWxlY3Rpb24gY2hhbmdlcworICAgICAgICBiZWNhdXNlYFdJLkRPTVRyZWVP dXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnRgLCBub3QgYFdJLkRPTVRyZWVPdXRsaW5lLnNlbGVj dGVkRE9NTm9kZWAsIGlzIHVsdGltYXRlbHkgdXNlZCB0bworICAgICAgICBpZGVudGlmeSB0aGUg Y3VycmVudCByZXByZXNlbnRlZCBvYmplY3QgIHdoZW4gcmVuZGVyaW5nIHRoZSBFbGVtZW50cyB0 YWIgZGV0YWlscyBzaWRlYmFyIHBhbmVscy4KKworICAgICAgICBJbiB0aGUgZmx1cnJ5IG9mIGFj dGl2aXR5IGFuZCBldmVudHMgZGlzcGF0Y2hlZCB3aGVuIFdlYiBJbnNwZWN0b3Igc3RhcnRzIG9u IGEgdGFiIG90aGVyIHRoYW4gRWxlbWVudHMgKHRoZSB0YWIgaXRzZWxmIG5vdCBhdHRhY2hlZCks CisgICAgICAgIGBXSS5ET01UcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50YCB3YXMgbm90 IHNldCBieSB0aGUgdGltZSBpdCB3YXMgY2hlY2tlZCByZXN1bHRpbmcgaW4gbWlzc2luZyBzaWRl YmFyIHBhbmVscy4KKworICAgICAgICBUaGUgdHdvIGNvZGUgcGF0aHMgY29ubmVjdCBsaWtlIHNv OgorCisgICAgICAgIGBXSS5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LnNob3dEZXRhaWxz U2lkZWJhclBhbmVscygpYAorICAgICAgICAgIC0+IGBXSS5Db250ZW50QnJvd3Nlci5jdXJyZW50 UmVwcmVzZW50ZWRPYmplY3RzYAorICAgICAgICAgICAgLT4gYFdJLkNvbnRlbnRCcm93c2VyLl9j b250ZW50Vmlld1NlbGVjdGlvblBhdGhOYXZpZ2F0aW9uSXRlbS5sYXN0Q29tcG9uZW50YAorCisg ICAgICAgIGBXSS5ET01UcmVlQ29udGVudFZpZXcuX2RvbVRyZWVTZWxlY3Rpb25EaWRDaGFuZ2Uo KWAKKyAgICAgICAgICAtPiBgV0kuRE9NVHJlZUNvbnRlbnRWaWV3LmRpc3BhdGNoRXZlbnRUb0xp c3RlbmVycyhXSS5Db250ZW50Vmlldy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENo YW5nZSlgCisgICAgICAgICAgICAtPiBgV0kuQ29udGVudEJyb3dzZXIuX2NvbnRlbnRWaWV3U2Vs ZWN0aW9uUGF0aENvbXBvbmVudERpZENoYW5nZSgpCisgICAgICAgICAgICAgIC0+IGBXSS5Db250 ZW50QnJvd3Nlci5fdXBkYXRlQ29udGVudFZpZXdTZWxlY3Rpb25QYXRoTmF2aWdhdGlvbkl0ZW0o KWAKKworICAgICAgICBNb3ZpbmcgdGhlIGV2ZW50IGRpc3BhdGNoIGZyb20gYFdJLkNvbnRlbnRC cm93c2VyLl9zZWxlY3RlZE5vZGVEaWRDaGFuZ2UoKWAgdG8gYFdJLkNvbnRlbnRCcm93c2VyLl9k b21UcmVlU2VsZWN0aW9uRGlkQ2hhbmdlKClgCisgICAgICAgIGRvZXMgbm90IHNlZW0gdG8gaGF2 ZSBzaWRlLWVmZmVjdHMuIFdoZW4gdGhlIEVsZW1lbnRzIHRhYiBpcyB2aXNpYmxlLCBib3RoIGxp ZmVjeWNsZSBoYW5kbGVycyBhcmUgY2FsbGVkIGluIHF1aWNrIHN1Y2Nlc3Npb24uCisKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qczoKKyAgICAgICAg KFdJLkRPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5cGUuX2RvbVRyZWVTZWxlY3Rpb25EaWRDaGFu Z2UpOgorICAgICAgICAoV0kuRE9NVHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fc2VsZWN0ZWRO b2RlRGlkQ2hhbmdlKToKKwogMjAyMS0wNC0xOSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBs ZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTig/KTogTmV0d29yazog UmVxdWVzdCAoT2JqZWN0IFRyZWUpIGlzIHNvbWV0aW1lcyBlbXB0eQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNv bnRlbnRWaWV3LmpzCmluZGV4IDgzOTU5N2M0ZTVhNWViNWI3ODE4MDUxODA4MjJiNGViMjMyNGVi Y2EuLjE3MGI4ZGM0NTIyMTMwZGVmNjk0ZDNjZjk3N2ViYWM5NDNjZWUyOWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50 Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9E T01UcmVlQ29udGVudFZpZXcuanMKQEAgLTUxNyw2ICs1MTcsOCBAQCBXSS5ET01UcmVlQ29udGVu dFZpZXcgPSBjbGFzcyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50Vmlldwog CiAgICAgICAgIHRoaXMuX2RvbVRyZWVPdXRsaW5lLnVwZGF0ZVNlbGVjdGlvbkFyZWEoKTsKICAg ICAgICAgdGhpcy5fZG9tVHJlZU91dGxpbmUuc3VwcHJlc3NSZXZlYWxBbmRTZWxlY3QgPSBmYWxz ZTsKKworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5Db250ZW50Vmll dy5FdmVudC5TZWxlY3Rpb25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSk7CiAgICAgfQogCiAgICAg X3NlbGVjdGVkTm9kZURpZENoYW5nZShldmVudCkKQEAgLTUyNyw4ICs1MjksNiBAQCBXSS5ET01U cmVlQ29udGVudFZpZXcgPSBjbGFzcyBET01UcmVlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250 ZW50VmlldwogCiAgICAgICAgIGlmIChzZWxlY3RlZERPTU5vZGUpCiAgICAgICAgICAgICBXSS5k b21NYW5hZ2VyLnNldEluc3BlY3RlZE5vZGUoc2VsZWN0ZWRET01Ob2RlKTsKLQotICAgICAgICB0 aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXSS5Db250ZW50Vmlldy5FdmVudC5TZWxlY3Rp b25QYXRoQ29tcG9uZW50c0RpZENoYW5nZSk7CiAgICAgfQogCiAgICAgX3BhdGhDb21wb25lbnRT ZWxlY3RlZChldmVudCkK 426548 2021-04-20 08:23:20 -0700 2021-04-22 07:01:06 -0700 Patch bug-224772-20210420172316.patch text/plain 3598 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlMzIzOTkyOThjNjIxMmEwMjJkNzNmZjdkZmM5 NWI2Y2FiMjJhZmUuLjlmZmMxNzU5ZDk0ZGNmMzQyMjkzZWI4OWJiNTI1MzVjMjAwYzY3OTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIxLTA0LTE5ICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSRUdSRVNTSU9OKHIyNzAxMzQpIEVsZW1lbnRzIFRhYjogRGV0YWlscyBTaWRlYmFyIHRvZ2ds ZSBpcyB1bmV4cGVjdGVkbHkgZGlzYWJsZWQgIGFmdGVyIHN3aXRjaGluZyBmcm9tIFRpbWVsaW5l cyB0YWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NDc3MgorICAgICAgICA8cmRhcjovLzczNDcwMjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIERpc3BhdGNoIHRoZSBgV0kuQ29udGVudFZpZXcuRXZl bnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2VgIGV2ZW50IHdoZW4gdGhlIGFjdHVh bCBET00gdHJlZSBzZWxlY3Rpb24gY2hhbmdlcworICAgICAgICBiZWNhdXNlIGBXSS5ET01UcmVl T3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50YCwgbm90IGBXSS5ET01UcmVlT3V0bGluZS5zZWxl Y3RlZERPTU5vZGVgLCBpcyB1bHRpbWF0ZWx5IHVzZWQgdG8KKyAgICAgICAgaWRlbnRpZnkgdGhl IGN1cnJlbnQgcmVwcmVzZW50ZWQgb2JqZWN0ICB3aGVuIHJlbmRlcmluZyB0aGUgRWxlbWVudHMg VGFiIGRldGFpbHMgc2lkZWJhciBwYW5lbHMuCisKKyAgICAgICAgSW4gdGhlIGZsdXJyeSBvZiBh Y3Rpdml0eSBhbmQgZXZlbnRzIGRpc3BhdGNoZWQgd2hlbiBXZWIgSW5zcGVjdG9yIHN0YXJ0cyBv biBhIHRhYiBvdGhlciB0aGFuIEVsZW1lbnRzICh0aGUgdGFiIGl0c2VsZiBub3QgYXR0YWNoZWQp LAorICAgICAgICBgV0kuRE9NVHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudGAgd2FzIG5v dCBzZXQgYnkgdGhlIHRpbWUgaXQgd2FzIGNoZWNrZWQgcmVzdWx0aW5nIGluIG1pc3Npbmcgc2lk ZWJhciBwYW5lbHMuCisKKyAgICAgICAgVGhlIHR3byBjb2RlIHBhdGhzIGNvbm5lY3QgbGlrZSBz bzoKKworICAgICAgICBgV0kuQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5zaG93RGV0YWls c1NpZGViYXJQYW5lbHMoKWAKKyAgICAgICAgICAtPiBgV0kuQ29udGVudEJyb3dzZXIuY3VycmVu dFJlcHJlc2VudGVkT2JqZWN0c2AKKyAgICAgICAgICAgIC0+IGBXSS5Db250ZW50QnJvd3Nlci5f Y29udGVudFZpZXdTZWxlY3Rpb25QYXRoTmF2aWdhdGlvbkl0ZW0ubGFzdENvbXBvbmVudGAKKwor ICAgICAgICBgV0kuRE9NVHJlZUNvbnRlbnRWaWV3Ll9kb21UcmVlU2VsZWN0aW9uRGlkQ2hhbmdl KClgCisgICAgICAgICAgLT4gYFdJLkRPTVRyZWVDb250ZW50Vmlldy5kaXNwYXRjaEV2ZW50VG9M aXN0ZW5lcnMoV0kuQ29udGVudFZpZXcuRXZlbnQuU2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRD aGFuZ2UpYAorICAgICAgICAgICAgLT4gYFdJLkNvbnRlbnRCcm93c2VyLl9jb250ZW50Vmlld1Nl bGVjdGlvblBhdGhDb21wb25lbnREaWRDaGFuZ2UoKWAKKyAgICAgICAgICAgICAgLT4gYFdJLkNv bnRlbnRCcm93c2VyLl91cGRhdGVDb250ZW50Vmlld1NlbGVjdGlvblBhdGhOYXZpZ2F0aW9uSXRl bSgpYAorICAgICAgICAgICAgICAgIC0+IGB0aGlzLl9jb250ZW50Vmlld1NlbGVjdGlvblBhdGhO YXZpZ2F0aW9uSXRlbS5jb21wb25lbnRzID0gc2VsZWN0aW9uUGF0aENvbXBvbmVudHNgCisKKyAg ICAgICAgTW92aW5nIHRoZSBldmVudCBkaXNwYXRjaCBmcm9tIGBXSS5Db250ZW50QnJvd3Nlci5f c2VsZWN0ZWROb2RlRGlkQ2hhbmdlKClgIHRvIGBXSS5Db250ZW50QnJvd3Nlci5fZG9tVHJlZVNl bGVjdGlvbkRpZENoYW5nZSgpYAorICAgICAgICBkb2VzIG5vdCBzZWVtIHRvIGhhdmUgc2lkZS1l ZmZlY3RzLiBXaGVuIHRoZSBFbGVtZW50cyBUYWIgaXMgdmlzaWJsZSwgYm90aCBsaWZlY3ljbGUg aGFuZGxlcnMgYXJlIGNhbGxlZCBpbiBxdWljayBzdWNjZXNzaW9uLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5ET01U cmVlQ29udGVudFZpZXcucHJvdG90eXBlLl9kb21UcmVlU2VsZWN0aW9uRGlkQ2hhbmdlKToKKyAg ICAgICAgKFdJLkRPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5cGUuX3NlbGVjdGVkTm9kZURpZENo YW5nZSk6CisKIDIwMjEtMDQtMTkgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04oPyk6IE5ldHdvcms6IFJlcXVlc3Qg KE9iamVjdCBUcmVlKSBpcyBzb21ldGltZXMgZW1wdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmll dy5qcwppbmRleCA4Mzk1OTdjNGU1YTVlYjViNzgxODA1MTgwODIyYjRlYjIzMjRlYmNhLi4xNzBi OGRjNDUyMjEzMGRlZjY5NGQzY2Y5NzdlYmFjOTQzY2VlMjlhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNv bnRlbnRWaWV3LmpzCkBAIC01MTcsNiArNTE3LDggQEAgV0kuRE9NVHJlZUNvbnRlbnRWaWV3ID0g Y2xhc3MgRE9NVHJlZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKIAogICAgICAg ICB0aGlzLl9kb21UcmVlT3V0bGluZS51cGRhdGVTZWxlY3Rpb25BcmVhKCk7CiAgICAgICAgIHRo aXMuX2RvbVRyZWVPdXRsaW5lLnN1cHByZXNzUmV2ZWFsQW5kU2VsZWN0ID0gZmFsc2U7CisKKyAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuQ29udGVudFZpZXcuRXZlbnQu U2VsZWN0aW9uUGF0aENvbXBvbmVudHNEaWRDaGFuZ2UpOwogICAgIH0KIAogICAgIF9zZWxlY3Rl ZE5vZGVEaWRDaGFuZ2UoZXZlbnQpCkBAIC01MjcsOCArNTI5LDYgQEAgV0kuRE9NVHJlZUNvbnRl bnRWaWV3ID0gY2xhc3MgRE9NVHJlZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcK IAogICAgICAgICBpZiAoc2VsZWN0ZWRET01Ob2RlKQogICAgICAgICAgICAgV0kuZG9tTWFuYWdl ci5zZXRJbnNwZWN0ZWROb2RlKHNlbGVjdGVkRE9NTm9kZSk7Ci0KLSAgICAgICAgdGhpcy5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuQ29udGVudFZpZXcuRXZlbnQuU2VsZWN0aW9uUGF0aENv bXBvbmVudHNEaWRDaGFuZ2UpOwogICAgIH0KIAogICAgIF9wYXRoQ29tcG9uZW50U2VsZWN0ZWQo ZXZlbnQpCg== 426808 2021-04-22 07:01:10 -0700 2021-04-23 05:33:37 -0700 Patch bug-224772-20210422160108.patch text/plain 4304 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGE0OWQyZTY2MjNkYWJiOWEzMjc5ZTE0YTYyODJj M2Y1OTNkZTgyMmIuLmM5MmFkNjcxMzc4NWIxODE5NzMyNDdhZmFmYTQyMDU4ZDE2ZTMyNWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTA0LTIyICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSRUdSRVNTSU9OKHIyNzAxMzQpIEVsZW1lbnRzIFRhYjogRGV0YWlscyBTaWRlYmFyIHRvZ2ds ZSBpcyB1bmV4cGVjdGVkbHkgZGlzYWJsZWQgIGFmdGVyIHN3aXRjaGluZyBmcm9tIFRpbWVsaW5l cyB0YWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NDc3MgorICAgICAgICA8cmRhcjovLzczNDcwMjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuc3VyZSB0aGUgbG9naWMgZm9yIGlkZW50aWZ5aW5n IGFuZCBzaG93aW5nIHRoZSByZXByZXNlbnRlZCBvYmplY3QgZm9yIHRoZSBzZWxlY3RlZCBgRE9N Tm9kZWAKKyAgICAgICAgaXMgbm90IHJ1biB1bmxlc3MgdGhlIEVsZW1lbnRzIFRhYiBpcyB2aXNp YmxlLiBUaGlzIGd1YXJkcyBhZ2FpbnMgdGhlIHBhcnRpYWwgc2V0dGluZyBvZiBzdGF0ZSAKKyAg ICAgICAgd2hlbiB0aGUgRWxlbWVudHMgVGFiIGlzIG5vdCB0aGUgZGVmYXVsdCB0YWIgd2hpbGUg b3BlbmluZyBXZWIgSW5zcGVjdG9yLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9F bGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuRWxlbWVudHNUYWJDb250ZW50 Vmlldyk6CisgICAgICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5hdHRh Y2hlZCk6CisgICAgICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5kZXRh Y2hlZCk6CisgICAgICAgIEF2b2lkIGRvaW5nIG5lZWRsZXNzIHdvcmsgdG8gc2hvdyB0aGUgc2Vs ZWN0ZWQgbm9kZSBvZiB0aGUgbWFpbiBmcmFtZSBpbiB0aGUgRWxlbWVudHMgVGFiIGlmIHRoZSB0 YWIgaXMgbm90IHZpc2libGUuCisKKyAgICAgICAgKFdJLkVsZW1lbnRzVGFiQ29udGVudFZpZXcu cHJvdG90eXBlLl9zaG93RE9NVHJlZUNvbnRlbnRWaWV3SWZOZWVkZWQpOgorICAgICAgICAoV0ku RWxlbWVudHNUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuX21haW5GcmFtZURpZENoYW5nZSk6Cisg ICAgICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fbWFpblJlc291cmNl RGlkQ2hhbmdlKToKKwogMjAyMS0wNC0yMCAgUmF6dmFuIENhbGltYW4gIDxyY2FsaW1hbkBhcHBs ZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVHJlZSBPdXRsaW5lczogYG9uZGV0YWNo YCBjYW4gYmUgY2FsbGVkIHdpdGhvdXQgYG9uYXR0YWNoYCBldmVyIGJlaW5nIGNhbGxlZApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVu dHNUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanMKaW5kZXggMmM4ZGFlODk4M2ZhY2I0Yjk4 ODg0MTc1ZDQ4ZTAxNmU3MmVkYTE3NS4uY2VlZWRlMzk5NjZjNGRmYmU1YmU0MzQ2ZGU4MDRhYmRm YTJmZjYxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzCkBAIC00NCw5 ICs0NCw2IEBAIFdJLkVsZW1lbnRzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBFbGVtZW50c1RhYkNv bnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzCiAgICAgICAgICAgICBkZXRhaWxzU2lk ZWJhclBhbmVsQ29uc3RydWN0b3JzLnB1c2goV0kuTGF5ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5l bCk7CiAKICAgICAgICAgc3VwZXIoRWxlbWVudHNUYWJDb250ZW50Vmlldy50YWJJbmZvKCksIHtk ZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzLCBkaXNhYmxlQmFja0ZvcndhcmQ6IHRydWV9 KTsKLQotICAgICAgICBXSS5uZXR3b3JrTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLk5ldHdv cmtNYW5hZ2VyLkV2ZW50Lk1haW5GcmFtZURpZENoYW5nZSwgdGhpcy5fbWFpbkZyYW1lRGlkQ2hh bmdlLCB0aGlzKTsKLSAgICAgICAgV0kuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXSS5GcmFtZS5F dmVudC5NYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMuX21haW5SZXNvdXJjZURpZENoYW5nZSwg dGhpcyk7CiAgICAgfQogCiAgICAgc3RhdGljIHRhYkluZm8oKQpAQCAtMTA3LDggKzEwNCwxNiBA QCBXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgRWxlbWVudHNUYWJDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbnRlbnRCcm93cwogICAgIHsKICAgICAgICAgc3VwZXIuYXR0YWNoZWQo KTsKIAotICAgICAgICBpZiAoIXRoaXMuY29udGVudEJyb3dzZXIuY3VycmVudENvbnRlbnRWaWV3 KQotICAgICAgICAgICAgdGhpcy5fc2hvd0RPTVRyZWVDb250ZW50VmlldygpOworICAgICAgICBX SS5uZXR3b3JrTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdJLk5ldHdvcmtNYW5hZ2VyLkV2ZW50 Lk1haW5GcmFtZURpZENoYW5nZSwgdGhpcy5fbWFpbkZyYW1lRGlkQ2hhbmdlLCB0aGlzKTsKKyAg ICAgICAgV0kuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXSS5GcmFtZS5FdmVudC5NYWluUmVzb3Vy Y2VEaWRDaGFuZ2UsIHRoaXMuX21haW5SZXNvdXJjZURpZENoYW5nZSwgdGhpcyk7CisKKyAgICAg ICAgdGhpcy5fc2hvd0RPTVRyZWVDb250ZW50Vmlld0lmTmVlZGVkKCk7CisgICAgfQorCisgICAg ZGV0YWNoZWQoKQorICAgIHsKKyAgICAgICAgV0kubmV0d29ya01hbmFnZXIucmVtb3ZlRXZlbnRM aXN0ZW5lcihXSS5OZXR3b3JrTWFuYWdlci5FdmVudC5NYWluRnJhbWVEaWRDaGFuZ2UsIHRoaXMu X21haW5GcmFtZURpZENoYW5nZSwgdGhpcyk7CisgICAgICAgIFdJLkZyYW1lLnJlbW92ZUV2ZW50 TGlzdGVuZXIoV0kuRnJhbWUuRXZlbnQuTWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzLl9tYWlu UmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMpOwogICAgIH0KIAogICAgIGNsb3NlZCgpCkBAIC0xMzUs OSArMTQwLDE2IEBAIFdJLkVsZW1lbnRzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBFbGVtZW50c1Rh YkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzCiAgICAgICAgICAgICB0aGlzLmNv bnRlbnRCcm93c2VyLnNob3dDb250ZW50Vmlld0ZvclJlcHJlc2VudGVkT2JqZWN0KG1haW5GcmFt ZS5kb21UcmVlKTsKICAgICB9CiAKKyAgICBfc2hvd0RPTVRyZWVDb250ZW50Vmlld0lmTmVlZGVk KCkKKyAgICB7CisgICAgICAgIGxldCBtYWluRE9NVHJlZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLm1h aW5GcmFtZT8uZG9tVHJlZTsKKyAgICAgICAgaWYgKG1haW5ET01UcmVlICYmIHRoaXMuY29udGVu dEJyb3dzZXIuY3VycmVudENvbnRlbnRWaWV3Py5yZXByZXNlbnRlZE9iamVjdCAhPT0gbWFpbkRP TVRyZWUpOworICAgICAgICAgICAgdGhpcy5jb250ZW50QnJvd3Nlci5zaG93Q29udGVudFZpZXdG b3JSZXByZXNlbnRlZE9iamVjdChtYWluRE9NVHJlZSk7CisgICAgfQorCiAgICAgX21haW5GcmFt ZURpZENoYW5nZShldmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3Nob3dET01UcmVlQ29udGVu dFZpZXcoKTsKKyAgICAgICAgdGhpcy5fc2hvd0RPTVRyZWVDb250ZW50Vmlld0lmTmVlZGVkKCk7 CiAgICAgfQogCiAgICAgX21haW5SZXNvdXJjZURpZENoYW5nZShldmVudCkKQEAgLTE0NSw3ICsx NTcsNyBAQCBXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgRWxlbWVudHNUYWJDb250 ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93cwogICAgICAgICBpZiAoIWV2ZW50LnRhcmdl dC5pc01haW5GcmFtZSgpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX3No b3dET01UcmVlQ29udGVudFZpZXcoKTsKKyAgICAgICAgdGhpcy5fc2hvd0RPTVRyZWVDb250ZW50 Vmlld0lmTmVlZGVkKCk7CiAgICAgfQogfTsKIAo= 426900 2021-04-23 05:33:40 -0700 2021-04-26 05:28:04 -0700 Patch bug-224772-20210423143337.patch text/plain 4870 rcaliman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDdlMjg1ZWFkY2M1NGE5ZWJhNGZmODMwZjI0Y2I2 MjYxY2FhMjdhNDguLmQyYTdmYzQzMGFhNjJiYmQ0MDYzOTgwNTNmNTYwMjFhYjE0ODM4MTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA0LTIzICBSYXp2 YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBSRUdSRVNTSU9OKHIyNzAxMzQpIEVsZW1lbnRzIFRhYjogRGV0YWlscyBTaWRlYmFyIHRvZ2ds ZSBpcyB1bmV4cGVjdGVkbHkgZGlzYWJsZWQgIGFmdGVyIHN3aXRjaGluZyBmcm9tIFRpbWVsaW5l cyB0YWIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NDc3MgorICAgICAgICA8cmRhcjovLzczNDcwMjExPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuc3VyZSB0aGUgbG9naWMgZm9yIGlkZW50aWZ5aW5n IGFuZCBzaG93aW5nIHRoZSByZXByZXNlbnRlZCBvYmplY3QgZm9yIHRoZSBzZWxlY3RlZCBgRE9N Tm9kZWAKKyAgICAgICAgaXMgbm90IHJ1biB1bmxlc3MgdGhlIEVsZW1lbnRzIFRhYiBpcyB2aXNp YmxlLiBUaGlzIGd1YXJkcyBhZ2FpbnMgdGhlIHBhcnRpYWwgc2V0dGluZyBvZiBzdGF0ZQorICAg ICAgICB3aGVuIHRoZSBFbGVtZW50cyBUYWIgaXMgbm90IHRoZSBkZWZhdWx0IHRhYiB3aGlsZSBv cGVuaW5nIFdlYiBJbnNwZWN0b3IuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0Vs ZW1lbnRzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRW aWV3KToKKyAgICAgICAgKFdJLkVsZW1lbnRzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLnNob3dS ZXByZXNlbnRlZE9iamVjdCk6CisgICAgICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3LnBy b3RvdHlwZS5hdHRhY2hlZCk6CisgICAgICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3LnBy b3RvdHlwZS5kZXRhY2hlZCk6CisgICAgICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3LnBy b3RvdHlwZS5fc2hvd0RPTVRyZWVDb250ZW50Vmlld0lmTmVlZGVkKToKKyAgICAgICAgKFdJLkVs ZW1lbnRzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9tYWluRnJhbWVEaWRDaGFuZ2UpOgorICAg ICAgICAoV0kuRWxlbWVudHNUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuX21haW5SZXNvdXJjZURp ZENoYW5nZSk6CisKIDIwMjEtMDQtMjIgIEJKIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAg ICAgICAgW0NvY29hXSByZS1lbmFibGUgdGVzdCBjYXNlIFdLSW5zcGVjdG9yRGVsZWdhdGUuSW5z cGVjdG9yQ29uZmlndXJhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanMK aW5kZXggMmM4ZGFlODk4M2ZhY2I0Yjk4ODg0MTc1ZDQ4ZTAxNmU3MmVkYTE3NS4uMzVjMDBiNmY3 NTJjZjVmNzk2OTczNzVkZDA5ZjczYTIwY2U0MTE1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1Rh YkNvbnRlbnRWaWV3LmpzCkBAIC00NCw5ICs0NCw2IEBAIFdJLkVsZW1lbnRzVGFiQ29udGVudFZp ZXcgPSBjbGFzcyBFbGVtZW50c1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dz CiAgICAgICAgICAgICBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzLnB1c2goV0kuTGF5 ZXJUcmVlRGV0YWlsc1NpZGViYXJQYW5lbCk7CiAKICAgICAgICAgc3VwZXIoRWxlbWVudHNUYWJD b250ZW50Vmlldy50YWJJbmZvKCksIHtkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzLCBk aXNhYmxlQmFja0ZvcndhcmQ6IHRydWV9KTsKLQotICAgICAgICBXSS5uZXR3b3JrTWFuYWdlci5h ZGRFdmVudExpc3RlbmVyKFdJLk5ldHdvcmtNYW5hZ2VyLkV2ZW50Lk1haW5GcmFtZURpZENoYW5n ZSwgdGhpcy5fbWFpbkZyYW1lRGlkQ2hhbmdlLCB0aGlzKTsKLSAgICAgICAgV0kuRnJhbWUuYWRk RXZlbnRMaXN0ZW5lcihXSS5GcmFtZS5FdmVudC5NYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMu X21haW5SZXNvdXJjZURpZENoYW5nZSwgdGhpcyk7CiAgICAgfQogCiAgICAgc3RhdGljIHRhYklu Zm8oKQpAQCAtODcsOCArODQsNyBAQCBXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3ID0gY2xhc3Mg RWxlbWVudHNUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93cwogCiAgICAgc2hv d1JlcHJlc2VudGVkT2JqZWN0KHJlcHJlc2VudGVkT2JqZWN0LCBjb29raWUpCiAgICAgewotICAg ICAgICBpZiAoIXRoaXMuY29udGVudEJyb3dzZXIuY3VycmVudENvbnRlbnRWaWV3KQotICAgICAg ICAgICAgdGhpcy5fc2hvd0RPTVRyZWVDb250ZW50VmlldygpOworICAgICAgICB0aGlzLl9zaG93 RE9NVHJlZUNvbnRlbnRWaWV3SWZOZWVkZWQoKTsKIAogICAgICAgICBpZiAoIWNvb2tpZSB8fCAh Y29va2llLm5vZGVUb1NlbGVjdCkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTEwNyw4ICsxMDMs MTggQEAgV0kuRWxlbWVudHNUYWJDb250ZW50VmlldyA9IGNsYXNzIEVsZW1lbnRzVGFiQ29udGVu dFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3MKICAgICB7CiAgICAgICAgIHN1cGVyLmF0dGFj aGVkKCk7CiAKLSAgICAgICAgaWYgKCF0aGlzLmNvbnRlbnRCcm93c2VyLmN1cnJlbnRDb250ZW50 VmlldykKLSAgICAgICAgICAgIHRoaXMuX3Nob3dET01UcmVlQ29udGVudFZpZXcoKTsKKyAgICAg ICAgV0kubmV0d29ya01hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5OZXR3b3JrTWFuYWdlci5F dmVudC5NYWluRnJhbWVEaWRDaGFuZ2UsIHRoaXMuX21haW5GcmFtZURpZENoYW5nZSwgdGhpcyk7 CisgICAgICAgIFdJLkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoV0kuRnJhbWUuRXZlbnQuTWFpblJl c291cmNlRGlkQ2hhbmdlLCB0aGlzLl9tYWluUmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMpOworCisg ICAgICAgIHRoaXMuX3Nob3dET01UcmVlQ29udGVudFZpZXdJZk5lZWRlZCgpOworICAgIH0KKwor ICAgIGRldGFjaGVkKCkKKyAgICB7CisgICAgICAgIFdJLm5ldHdvcmtNYW5hZ2VyLnJlbW92ZUV2 ZW50TGlzdGVuZXIoV0kuTmV0d29ya01hbmFnZXIuRXZlbnQuTWFpbkZyYW1lRGlkQ2hhbmdlLCB0 aGlzLl9tYWluRnJhbWVEaWRDaGFuZ2UsIHRoaXMpOworICAgICAgICBXSS5GcmFtZS5yZW1vdmVF dmVudExpc3RlbmVyKFdJLkZyYW1lLkV2ZW50Lk1haW5SZXNvdXJjZURpZENoYW5nZSwgdGhpcy5f bWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzKTsKKworICAgICAgICBzdXBlci5kZXRhY2hlZCgp OwogICAgIH0KIAogICAgIGNsb3NlZCgpCkBAIC0xMjYsMTggKzEzMiwyMSBAQCBXSS5FbGVtZW50 c1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgRWxlbWVudHNUYWJDb250ZW50VmlldyBleHRlbmRzIFdJ LkNvbnRlbnRCcm93cwogCiAgICAgLy8gUHJpdmF0ZQogCi0gICAgX3Nob3dET01UcmVlQ29udGVu dFZpZXcoKQorICAgIF9zaG93RE9NVHJlZUNvbnRlbnRWaWV3SWZOZWVkZWQoKQogICAgIHsKLSAg ICAgICAgdGhpcy5jb250ZW50QnJvd3Nlci5jb250ZW50Vmlld0NvbnRhaW5lci5jbG9zZUFsbENv bnRlbnRWaWV3cygpOworICAgICAgICBsZXQgbWFpbkRPTVRyZWUgPSBXSS5uZXR3b3JrTWFuYWdl ci5tYWluRnJhbWU/LmRvbVRyZWU7CisgICAgICAgIGlmICghbWFpbkRPTVRyZWUpCisgICAgICAg ICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKHRoaXMuY29udGVudEJyb3dzZXIuY3VycmVudENv bnRlbnRWaWV3Py5yZXByZXNlbnRlZE9iamVjdCA9PT0gbWFpbkRPTVRyZWUpCisgICAgICAgICAg ICByZXR1cm47CiAKLSAgICAgICAgdmFyIG1haW5GcmFtZSA9IFdJLm5ldHdvcmtNYW5hZ2VyLm1h aW5GcmFtZTsKLSAgICAgICAgaWYgKG1haW5GcmFtZSkKLSAgICAgICAgICAgIHRoaXMuY29udGVu dEJyb3dzZXIuc2hvd0NvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QobWFpbkZyYW1lLmRv bVRyZWUpOworICAgICAgICB0aGlzLmNvbnRlbnRCcm93c2VyLnNob3dDb250ZW50Vmlld0ZvclJl cHJlc2VudGVkT2JqZWN0KG1haW5ET01UcmVlKTsKICAgICB9CiAKICAgICBfbWFpbkZyYW1lRGlk Q2hhbmdlKGV2ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5fc2hvd0RPTVRyZWVDb250ZW50Vmll dygpOworICAgICAgICB0aGlzLl9zaG93RE9NVHJlZUNvbnRlbnRWaWV3SWZOZWVkZWQoKTsKICAg ICB9CiAKICAgICBfbWFpblJlc291cmNlRGlkQ2hhbmdlKGV2ZW50KQpAQCAtMTQ1LDcgKzE1NCw3 IEBAIFdJLkVsZW1lbnRzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBFbGVtZW50c1RhYkNvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzCiAgICAgICAgIGlmICghZXZlbnQudGFyZ2V0Lmlz TWFpbkZyYW1lKCkpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5fc2hvd0RP TVRyZWVDb250ZW50VmlldygpOworICAgICAgICB0aGlzLl9zaG93RE9NVHJlZUNvbnRlbnRWaWV3 SWZOZWVkZWQoKTsKICAgICB9CiB9OwogCg==