202769 2019-10-09 15:11:18 -0700 Web Inspector: Modifying CSS selector by pressing Enter or Tab causes 2 CSS.setRuleSelector backend calls 2019-10-09 21:11:36 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev commit-queue inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1578410 0 nvasilyev 2019-10-09 15:11:18 -0700 Editing a selector in the style editor causes at least two backend calls with the same data. There should be only one backend call. [Log] Trace: request (page-26) – {id: 124, method: "CSS.setRuleSelector", params: {ruleId: {styleSheetId: "1", ordinal: 1}, selector: "foo"}} changeRuleSelector (DOMNodeStyles.js:439) selectorText (CSSRule.js:76) spreadsheetSelectorFieldDidChange (SpreadsheetCSSStyleDeclarationSection.js:238) _handleKeyDown (SpreadsheetSelectorField.js:135) _handleKeyDown [Log] Trace: request (page-26) – {id: 126, method: "CSS.setRuleSelector", params: {ruleId: {styleSheetId: "1", ordinal: 1}, selector: "foo"}} changeRuleSelector (DOMNodeStyles.js:439) selectorText (CSSRule.js:76) spreadsheetSelectorFieldDidChange (SpreadsheetCSSStyleDeclarationSection.js:238) _handleBlur (SpreadsheetSelectorField.js:113) _handleBlur focus startEditing (SpreadsheetTextField.js:101) startEditingName (SpreadsheetStyleProperty.js:109) startEditingFirstProperty (SpreadsheetCSSStyleDeclarationEditor.js:258) spreadsheetSelectorFieldDidChange (SpreadsheetCSSStyleDeclarationSection.js:247) _handleKeyDown (SpreadsheetSelectorField.js:135) _handleKeyDown 1578411 1 webkit-bug-importer 2019-10-09 15:11:41 -0700 <rdar://problem/56132166> 1578443 2 380583 nvasilyev 2019-10-09 16:14:57 -0700 Created attachment 380583 Patch 1578453 3 380583 mattbaker 2019-10-09 16:47:42 -0700 Comment on attachment 380583 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=380583&action=review r=me > Source/WebInspectorUI/UserInterface/Views/SpreadsheetSelectorField.js:115 > + this._delegate.spreadsheetSelectorFieldDidCommit(changed); Should we just skip calling `this._delegate.spreadsheetSelectorFieldDidCommit` altogether if !changed, instead of passing it as an argument? 1578462 4 380588 nvasilyev 2019-10-09 17:10:36 -0700 Created attachment 380588 Patch 1578481 5 380588 commit-queue 2019-10-09 17:55:16 -0700 Comment on attachment 380588 Patch Clearing flags on attachment: 380588 Committed r250948: <https://trac.webkit.org/changeset/250948> 1578482 6 commit-queue 2019-10-09 17:55:18 -0700 All reviewed patches have been landed. Closing bug. 1578507 7 380583 nvasilyev 2019-10-09 21:11:36 -0700 Comment on attachment 380583 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=380583&action=review >> Source/WebInspectorUI/UserInterface/Views/SpreadsheetSelectorField.js:115 >> + this._delegate.spreadsheetSelectorFieldDidCommit(changed); > > Should we just skip calling `this._delegate.spreadsheetSelectorFieldDidCommit` altogether if !changed, instead of passing it as an argument? Turns out this wasn't such a good idea :D Bug 202781 - REGRESSION(r250948): Web Inspector: Styles: CSS selector becomes gray after stopping editing without modifying it 380583 2019-10-09 16:14:57 -0700 2019-10-09 17:10:36 -0700 Patch patch.txt text/plain 7108 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3MDI1YzIyMzM2Li40MWUyOWU0YjZhYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTktMTAtMDkgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogTW9kaWZ5aW5nIENTUyBzZWxlY3RvcnMgY2F1c2VzIDIgQ1NTLnNldFJ1bGVTZWxlY3RvciBi YWNrZW5kIGNhbGxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDI3NjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU2MTMyMTY2PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZpb3VzbHksIHNwcmVh ZHNoZWV0U2VsZWN0b3JGaWVsZERpZENoYW5nZSB3b3VsZCBnZXQgY2FsbGVkIHR3aWNlOgorICAg ICAgICAxLiBPbiBFbnRlciBvciBUYWIga2V5IHByZXNzLgorICAgICAgICAyLiBPbiBibHVyIGV2 ZW50LgorCisgICAgICAgIFdpdGggdGhpcyBwYXRjaCwgaXQgb25seSBnZXRzIGNhbGxlZCBvbiBi bHVyIGV2ZW50LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5qczoK KyAgICAgICAgKFdJLkNTU1J1bGUucHJvdG90eXBlLnNldCBzZWxlY3RvclRleHQpOgorICAgICAg ICBSZW1vdmUgZGVhZCBjb2RlLiBDYWxsaW5nIGBfc2VsZWN0b3JSZXNvbHZlZCh0cnVlKWAgd291 bGQgY2F1c2UgYW4gdW5jYXVnaHQgZXhjZXB0aW9uLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzOgorICAgICAg ICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5wcm90b3R5cGUuc3By ZWFkc2hlZXRTZWxlY3RvckZpZWxkRGlkQ2hhbmdlKTogUmVtb3ZlZC4KKyAgICAgICAgKFdJLlNw cmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24ucHJvdG90eXBlLnNwcmVhZHNoZWV0 U2VsZWN0b3JGaWVsZERpZENvbW1pdCk6IEFkZGVkLgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRD U1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5wcm90b3R5cGUuc3ByZWFkc2hlZXRTZWxlY3RvckZp ZWxkV2lsbE5hdmlnYXRlKTogQWRkZWQuCisgICAgICAgIFNwbGl0IHNwcmVhZHNoZWV0U2VsZWN0 b3JGaWVsZERpZENoYW5nZSBpbnRvIHNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZERpZENvbW1pdCBh bmQgc3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkV2lsbE5hdmlnYXRlLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFNlbGVjdG9yRmllbGQuanM6CisgICAgICAgIChX SS5TcHJlYWRzaGVldFNlbGVjdG9yRmllbGQpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRTZWxl Y3RvckZpZWxkLnByb3RvdHlwZS5zdGFydEVkaXRpbmcpOgorICAgICAgICAoV0kuU3ByZWFkc2hl ZXRTZWxlY3RvckZpZWxkLnByb3RvdHlwZS5zdG9wRWRpdGluZyk6CisgICAgICAgIChXSS5TcHJl YWRzaGVldFNlbGVjdG9yRmllbGQucHJvdG90eXBlLl9oYW5kbGVCbHVyKToKKyAgICAgICAgKFdJ LlNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZC5wcm90b3R5cGUuX2hhbmRsZUtleURvd24pOgorICAg ICAgICBBZGQgYF92YWx1ZUJlZm9yZUVkaXRpbmdgIHRvIGNoZWNrIGlmIHRoZSB2YWx1ZSB3YXMg bW9kaWZpZWQgYmVmb3JlIHRoZSBibHVyIGV2ZW50LgorICAgICAgICBTaW1pbGFyIGxvZ2ljIGV4 aXN0cyBpbiBTcHJlYWRzaGVldFRleHRGaWVsZC4KKwogMjAxOS0xMC0wMiAgTmlraXRhIFZhc2ls eWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBTdHls ZXM6IGZvciBydWxlcyB0aGF0IGRvbid0IG1hdGNoIHNlbGVjdGVkIG5vZGUsIHByb3BlcnR5IHZh bHVlcyBhbHdheXMgc2hvdyBhcyBpbnZhbGlkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NSdWxlLmpzCmluZGV4IDVjMjEwNzk5NGQ2Li5l YTM5MDcyZmQzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL0NTU1J1bGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL0NTU1J1bGUuanMKQEAgLTY4LDExICs2OCw2IEBAIFdJLkNTU1J1bGUgPSBj bGFzcyBDU1NSdWxlIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIGlmICghdGhpcy5lZGl0YWJs ZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAodGhpcy5fc2VsZWN0b3JUZXh0 ID09PSBzZWxlY3RvclRleHQpIHsKLSAgICAgICAgICAgIHRoaXMuX3NlbGVjdG9yUmVzb2x2ZWQo dHJ1ZSk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQogICAgICAgICB0aGlzLl9u b2RlU3R5bGVzLmNoYW5nZVJ1bGVTZWxlY3Rvcih0aGlzLCBzZWxlY3RvclRleHQpLnRoZW4odGhp cy5fc2VsZWN0b3JSZXNvbHZlZC5iaW5kKHRoaXMpLCB0aGlzLl9zZWxlY3RvclJlamVjdGVkLmJp bmQodGhpcykpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0 Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKaW5kZXggYjQxN2MzODMyMDkuLjQ5ODllYTVj NmM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNs YXJhdGlvblNlY3Rpb24uanMKQEAgLTIyNiwyMyArMjI2LDIyIEBAIFdJLlNwcmVhZHNoZWV0Q1NT U3R5bGVEZWNsYXJhdGlvblNlY3Rpb24gPSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVjbGFy YXRpb25TCiAKICAgICAvLyBTcHJlYWRzaGVldFNlbGVjdG9yRmllbGQgZGVsZWdhdGUKIAotICAg IHNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZERpZENoYW5nZShkaXJlY3Rpb24pCisgICAgc3ByZWFk c2hlZXRTZWxlY3RvckZpZWxkRGlkQ29tbWl0KGNoYW5nZWQpCiAgICAgewogICAgICAgICBsZXQg c2VsZWN0b3JUZXh0ID0gdGhpcy5fc2VsZWN0b3JFbGVtZW50LnRleHRDb250ZW50LnRyaW0oKTsK IAotICAgICAgICBpZiAoIXNlbGVjdG9yVGV4dCB8fCBzZWxlY3RvclRleHQgPT09IHRoaXMuX3N0 eWxlLm93bmVyUnVsZS5zZWxlY3RvclRleHQpCisgICAgICAgIGlmICghc2VsZWN0b3JUZXh0KQog ICAgICAgICAgICAgdGhpcy5fZGlzY2FyZFNlbGVjdG9yQ2hhbmdlKCk7Ci0gICAgICAgIGVsc2Ug eworICAgICAgICBlbHNlIGlmIChjaGFuZ2VkKSB7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9u LkV2ZW50LlNlbGVjdG9yV2lsbENoYW5nZSk7CiAgICAgICAgICAgICB0aGlzLl9zdHlsZS5vd25l clJ1bGUuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV0kuQ1NTUnVsZS5FdmVudC5TZWxlY3RvckNo YW5nZWQsIHRoaXMuX3JlbmRlclNlbGVjdG9yLCB0aGlzKTsKICAgICAgICAgICAgIHRoaXMuX3N0 eWxlLm93bmVyUnVsZS5zZWxlY3RvclRleHQgPSBzZWxlY3RvclRleHQ7CiAgICAgICAgIH0KKyAg ICB9CiAKLSAgICAgICAgaWYgKCFkaXJlY3Rpb24pIHsKLSAgICAgICAgICAgIC8vIERvbid0IGRv IGFueXRoaW5nIHdoZW4gaXQncyBhIGJsdXIgZXZlbnQuCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIH0KLQorICAgIHNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZFdpbGxOYXZpZ2F0ZShkaXJl Y3Rpb24pCisgICAgeworICAgICAgICBjb25zb2xlLmFzc2VydChkaXJlY3Rpb24pOwogICAgICAg ICBpZiAoZGlyZWN0aW9uID09PSAiZm9yd2FyZCIpCiAgICAgICAgICAgICB0aGlzLl9wcm9wZXJ0 aWVzRWRpdG9yLnN0YXJ0RWRpdGluZ0ZpcnN0UHJvcGVydHkoKTsKICAgICAgICAgZWxzZSBpZiAo ZGlyZWN0aW9uID09PSAiYmFja3dhcmQiKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFNlbGVjdG9yRmllbGQuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFNlbGVj dG9yRmllbGQuanMKaW5kZXggZjhkZGI2MTQwZTguLmYxYjlmMWE1MmJhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFNlbGVj dG9yRmllbGQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkLmpzCkBAIC0zOSw2ICszOSw3IEBAIFdJLlNwcmVh ZHNoZWV0U2VsZWN0b3JGaWVsZCA9IGNsYXNzIFNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZCBleHRl bmRzIFdJLk9iamVjdAogICAgICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtl eWRvd24iLCB0aGlzLl9oYW5kbGVLZXlEb3duLmJpbmQodGhpcykpOwogCiAgICAgICAgIHRoaXMu X2VkaXRpbmcgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fdmFsdWVCZWZvcmVFZGl0aW5nID0gIiI7 CiAgICAgICAgIHRoaXMuX2hhbmRsZWRNb3VzZURvd24gPSBmYWxzZTsKICAgICB9CiAKQEAgLTUy LDYgKzUzLDcgQEAgV0kuU3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkID0gY2xhc3MgU3ByZWFkc2hl ZXRTZWxlY3RvckZpZWxkIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICByZXR1cm47CiAK ICAgICAgICAgdGhpcy5fZWRpdGluZyA9IHRydWU7CisgICAgICAgIHRoaXMuX3ZhbHVlQmVmb3Jl RWRpdGluZyA9IHRoaXMuX2VsZW1lbnQudGV4dENvbnRlbnQ7CiAKICAgICAgICAgbGV0IGVsZW1l bnQgPSB0aGlzLl9lbGVtZW50OwogICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5hZGQoImVkaXRp bmciKTsKQEAgLTczLDYgKzc1LDcgQEAgV0kuU3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkID0gY2xh c3MgU3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAg ICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fZWRpdGluZyA9IGZhbHNlOworICAgICAgICB0aGlz Ll92YWx1ZUJlZm9yZUVkaXRpbmcgPSAiIjsKICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xp c3QucmVtb3ZlKCJlZGl0aW5nIik7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuY29udGVudEVkaXRh YmxlID0gZmFsc2U7CiAKQEAgLTEwNywxMCArMTEwLDEyIEBAIFdJLlNwcmVhZHNoZWV0U2VsZWN0 b3JGaWVsZCA9IGNsYXNzIFNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZCBleHRlbmRzIFdJLk9iamVj dAogICAgICAgICBpZiAoZG9jdW1lbnQuYWN0aXZlRWxlbWVudCA9PT0gdGhpcy5fZWxlbWVudCkK ICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLnN0b3BFZGl0aW5nKCk7CisgICAg ICAgIGlmICh0aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuc3ByZWFkc2hl ZXRTZWxlY3RvckZpZWxkRGlkQ29tbWl0ID09PSAiZnVuY3Rpb24iKSB7CisgICAgICAgICAgICBs ZXQgY2hhbmdlZCA9IHRoaXMuX2VsZW1lbnQudGV4dENvbnRlbnQgIT09IHRoaXMuX3ZhbHVlQmVm b3JlRWRpdGluZzsKKyAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnNwcmVhZHNoZWV0U2VsZWN0 b3JGaWVsZERpZENvbW1pdChjaGFuZ2VkKTsKKyAgICAgICAgfQogCi0gICAgICAgIGlmICh0aGlz Ll9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuc3ByZWFkc2hlZXRTZWxlY3RvckZp ZWxkRGlkQ2hhbmdlID09PSAiZnVuY3Rpb24iKQotICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUu c3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkRGlkQ2hhbmdlKG51bGwpOworICAgICAgICB0aGlzLnN0 b3BFZGl0aW5nKCk7CiAgICAgfQogCiAgICAgX2hhbmRsZUtleURvd24oZXZlbnQpCkBAIC0xMjgs MTMgKzEzMywxMSBAQCBXSS5TcHJlYWRzaGVldFNlbGVjdG9yRmllbGQgPSBjbGFzcyBTcHJlYWRz aGVldFNlbGVjdG9yRmllbGQgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKGV2ZW50Lmtl eSA9PT0gIkVudGVyIiB8fCBldmVudC5rZXkgPT09ICJUYWIiKSB7CiAgICAgICAgICAgICBldmVu dC5zdG9wKCk7CiAKLSAgICAgICAgICAgIHRoaXMuc3RvcEVkaXRpbmcoKTsKLQotICAgICAgICAg ICAgaWYgKHRoaXMuX2RlbGVnYXRlICYmIHR5cGVvZiB0aGlzLl9kZWxlZ2F0ZS5zcHJlYWRzaGVl dFNlbGVjdG9yRmllbGREaWRDaGFuZ2UgPT09ICJmdW5jdGlvbiIpIHsKKyAgICAgICAgICAgIGlm ICh0aGlzLl9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuc3ByZWFkc2hlZXRTZWxl Y3RvckZpZWxkV2lsbE5hdmlnYXRlID09PSAiZnVuY3Rpb24iKSB7CiAgICAgICAgICAgICAgICAg bGV0IGRpcmVjdGlvbiA9IChldmVudC5zaGlmdEtleSAmJiBldmVudC5rZXkgPT09ICJUYWIiKSA/ ICJiYWNrd2FyZCIgOiAiZm9yd2FyZCI7Ci0gICAgICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUu c3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkRGlkQ2hhbmdlKGRpcmVjdGlvbik7CisgICAgICAgICAg ICAgICAgdGhpcy5fZGVsZWdhdGUuc3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkV2lsbE5hdmlnYXRl KGRpcmVjdGlvbik7CiAgICAgICAgICAgICB9Ci0KKyAgICAgICAgICAgIHRoaXMuc3RvcEVkaXRp bmcoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCg== 380588 2019-10-09 17:10:36 -0700 2019-10-09 17:55:16 -0700 Patch patch.txt text/plain 7140 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3MDI1YzIyMzM2Li41Yjg5NWQwYTQzMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTktMTAtMDkgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogTW9kaWZ5aW5nIENTUyBzZWxlY3RvciBieSBwcmVzc2luZyBFbnRlciBvciBUYWIgY2F1c2Vz IDIgQ1NTLnNldFJ1bGVTZWxlY3RvciBiYWNrZW5kIGNhbGxzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDI3NjkKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzU2MTMyMTY2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE1hdHQgQmFrZXIuCisKKyAgICAg ICAgUHJldmlvdXNseSwgc3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkRGlkQ2hhbmdlIHdvdWxkIGdl dCBjYWxsZWQgdHdpY2U6CisgICAgICAgIDEuIE9uIEVudGVyIG9yIFRhYiBrZXkgcHJlc3MuCisg ICAgICAgIDIuIE9uIGJsdXIgZXZlbnQuCisKKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoLCBpdCBv bmx5IGdldHMgY2FsbGVkIG9uIGJsdXIgZXZlbnQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L01vZGVscy9DU1NSdWxlLmpzOgorICAgICAgICAoV0kuQ1NTUnVsZS5wcm90b3R5cGUuc2V0IHNl bGVjdG9yVGV4dCk6CisgICAgICAgIFJlbW92ZSBkZWFkIGNvZGUuIENhbGxpbmcgYF9zZWxlY3Rv clJlc29sdmVkKHRydWUpYCB3b3VsZCBjYXVzZSBhbiB1bmNhdWdodCBleGNlcHRpb24uCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlv blNlY3Rpb24uanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25T ZWN0aW9uLnByb3RvdHlwZS5zcHJlYWRzaGVldFNlbGVjdG9yRmllbGREaWRDaGFuZ2UpOiBSZW1v dmVkLgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5w cm90b3R5cGUuc3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkRGlkQ29tbWl0KTogQWRkZWQuCisgICAg ICAgIChXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLnByb3RvdHlwZS5z cHJlYWRzaGVldFNlbGVjdG9yRmllbGRXaWxsTmF2aWdhdGUpOiBBZGRlZC4KKyAgICAgICAgU3Bs aXQgc3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkRGlkQ2hhbmdlIGludG8gc3ByZWFkc2hlZXRTZWxl Y3RvckZpZWxkRGlkQ29tbWl0IGFuZCBzcHJlYWRzaGVldFNlbGVjdG9yRmllbGRXaWxsTmF2aWdh dGUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U2VsZWN0b3JG aWVsZC5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZCk6CisgICAgICAg IChXSS5TcHJlYWRzaGVldFNlbGVjdG9yRmllbGQucHJvdG90eXBlLnN0YXJ0RWRpdGluZyk6Cisg ICAgICAgIChXSS5TcHJlYWRzaGVldFNlbGVjdG9yRmllbGQucHJvdG90eXBlLnN0b3BFZGl0aW5n KToKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZC5wcm90b3R5cGUuX2hhbmRs ZUJsdXIpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkLnByb3RvdHlwZS5f aGFuZGxlS2V5RG93bik6CisgICAgICAgIEFkZCBgX3ZhbHVlQmVmb3JlRWRpdGluZ2AgdG8gY2hl Y2sgaWYgdGhlIHZhbHVlIHdhcyBtb2RpZmllZCBiZWZvcmUgdGhlIGJsdXIgZXZlbnQuCisgICAg ICAgIFNpbWlsYXIgbG9naWMgZXhpc3RzIGluIFNwcmVhZHNoZWV0VGV4dEZpZWxkLgorCiAyMDE5 LTEwLTAyICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IFN0eWxlczogZm9yIHJ1bGVzIHRoYXQgZG9uJ3QgbWF0Y2ggc2VsZWN0 ZWQgbm9kZSwgcHJvcGVydHkgdmFsdWVzIGFsd2F5cyBzaG93IGFzIGludmFsaWQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NSdWxlLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU1J1bGUuanMK aW5kZXggNWMyMTA3OTk0ZDYuLmVhMzkwNzJmZDNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTUnVsZS5qcwpAQCAtNjgsMTEgKzY4 LDYgQEAgV0kuQ1NTUnVsZSA9IGNsYXNzIENTU1J1bGUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAg ICAgaWYgKCF0aGlzLmVkaXRhYmxlKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlm ICh0aGlzLl9zZWxlY3RvclRleHQgPT09IHNlbGVjdG9yVGV4dCkgewotICAgICAgICAgICAgdGhp cy5fc2VsZWN0b3JSZXNvbHZlZCh0cnVlKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg fQotCiAgICAgICAgIHRoaXMuX25vZGVTdHlsZXMuY2hhbmdlUnVsZVNlbGVjdG9yKHRoaXMsIHNl bGVjdG9yVGV4dCkudGhlbih0aGlzLl9zZWxlY3RvclJlc29sdmVkLmJpbmQodGhpcyksIHRoaXMu X3NlbGVjdG9yUmVqZWN0ZWQuYmluZCh0aGlzKSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxl RGVjbGFyYXRpb25TZWN0aW9uLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcwppbmRleCBi NDE3YzM4MzIwOS4uZGQyNzJhNjlhNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rp b24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3By ZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcwpAQCAtMjI2LDIzICsyMjYsMjAg QEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbiA9IGNsYXNzIFNwcmVh ZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblMKIAogICAgIC8vIFNwcmVhZHNoZWV0U2VsZWN0b3JG aWVsZCBkZWxlZ2F0ZQogCi0gICAgc3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkRGlkQ2hhbmdlKGRp cmVjdGlvbikKKyAgICBzcHJlYWRzaGVldFNlbGVjdG9yRmllbGREaWRDb21taXQoKQogICAgIHsK ICAgICAgICAgbGV0IHNlbGVjdG9yVGV4dCA9IHRoaXMuX3NlbGVjdG9yRWxlbWVudC50ZXh0Q29u dGVudC50cmltKCk7Ci0KLSAgICAgICAgaWYgKCFzZWxlY3RvclRleHQgfHwgc2VsZWN0b3JUZXh0 ID09PSB0aGlzLl9zdHlsZS5vd25lclJ1bGUuc2VsZWN0b3JUZXh0KQotICAgICAgICAgICAgdGhp cy5fZGlzY2FyZFNlbGVjdG9yQ2hhbmdlKCk7Ci0gICAgICAgIGVsc2UgeworICAgICAgICBpZiAo c2VsZWN0b3JUZXh0KSB7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLkV2ZW50LlNlbGVjdG9y V2lsbENoYW5nZSk7CiAgICAgICAgICAgICB0aGlzLl9zdHlsZS5vd25lclJ1bGUuc2luZ2xlRmly ZUV2ZW50TGlzdGVuZXIoV0kuQ1NTUnVsZS5FdmVudC5TZWxlY3RvckNoYW5nZWQsIHRoaXMuX3Jl bmRlclNlbGVjdG9yLCB0aGlzKTsKICAgICAgICAgICAgIHRoaXMuX3N0eWxlLm93bmVyUnVsZS5z ZWxlY3RvclRleHQgPSBzZWxlY3RvclRleHQ7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoIWRp cmVjdGlvbikgewotICAgICAgICAgICAgLy8gRG9uJ3QgZG8gYW55dGhpbmcgd2hlbiBpdCdzIGEg Ymx1ciBldmVudC4KLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAgICAgICB9IGVs c2UKKyAgICAgICAgICAgIHRoaXMuX2Rpc2NhcmRTZWxlY3RvckNoYW5nZSgpOworICAgIH0KIAor ICAgIHNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZFdpbGxOYXZpZ2F0ZShkaXJlY3Rpb24pCisgICAg eworICAgICAgICBjb25zb2xlLmFzc2VydChkaXJlY3Rpb24pOwogICAgICAgICBpZiAoZGlyZWN0 aW9uID09PSAiZm9yd2FyZCIpCiAgICAgICAgICAgICB0aGlzLl9wcm9wZXJ0aWVzRWRpdG9yLnN0 YXJ0RWRpdGluZ0ZpcnN0UHJvcGVydHkoKTsKICAgICAgICAgZWxzZSBpZiAoZGlyZWN0aW9uID09 PSAiYmFja3dhcmQiKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFNlbGVjdG9yRmllbGQuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFNlbGVjdG9yRmllbGQuanMK aW5kZXggZjhkZGI2MTQwZTguLjY0ZjE2ZmNmYWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFNlbGVjdG9yRmllbGQuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hl ZXRTZWxlY3RvckZpZWxkLmpzCkBAIC0zOSw2ICszOSw3IEBAIFdJLlNwcmVhZHNoZWV0U2VsZWN0 b3JGaWVsZCA9IGNsYXNzIFNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZCBleHRlbmRzIFdJLk9iamVj dAogICAgICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlz Ll9oYW5kbGVLZXlEb3duLmJpbmQodGhpcykpOwogCiAgICAgICAgIHRoaXMuX2VkaXRpbmcgPSBm YWxzZTsKKyAgICAgICAgdGhpcy5fdmFsdWVCZWZvcmVFZGl0aW5nID0gIiI7CiAgICAgICAgIHRo aXMuX2hhbmRsZWRNb3VzZURvd24gPSBmYWxzZTsKICAgICB9CiAKQEAgLTUyLDYgKzUzLDcgQEAg V0kuU3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkID0gY2xhc3MgU3ByZWFkc2hlZXRTZWxlY3RvckZp ZWxkIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdGhp cy5fZWRpdGluZyA9IHRydWU7CisgICAgICAgIHRoaXMuX3ZhbHVlQmVmb3JlRWRpdGluZyA9IHRo aXMuX2VsZW1lbnQudGV4dENvbnRlbnQ7CiAKICAgICAgICAgbGV0IGVsZW1lbnQgPSB0aGlzLl9l bGVtZW50OwogICAgICAgICBlbGVtZW50LmNsYXNzTGlzdC5hZGQoImVkaXRpbmciKTsKQEAgLTcz LDYgKzc1LDcgQEAgV0kuU3ByZWFkc2hlZXRTZWxlY3RvckZpZWxkID0gY2xhc3MgU3ByZWFkc2hl ZXRTZWxlY3RvckZpZWxkIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICByZXR1cm47CiAK ICAgICAgICAgdGhpcy5fZWRpdGluZyA9IGZhbHNlOworICAgICAgICB0aGlzLl92YWx1ZUJlZm9y ZUVkaXRpbmcgPSAiIjsKICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKCJl ZGl0aW5nIik7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuY29udGVudEVkaXRhYmxlID0gZmFsc2U7 CiAKQEAgLTEwNywxMCArMTEwLDEyIEBAIFdJLlNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZCA9IGNs YXNzIFNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZCBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBp ZiAoZG9jdW1lbnQuYWN0aXZlRWxlbWVudCA9PT0gdGhpcy5fZWxlbWVudCkKICAgICAgICAgICAg IHJldHVybjsKIAotICAgICAgICB0aGlzLnN0b3BFZGl0aW5nKCk7CisgICAgICAgIGlmICh0aGlz Ll9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUuc3ByZWFkc2hlZXRTZWxlY3RvckZp ZWxkRGlkQ29tbWl0ID09PSAiZnVuY3Rpb24iKSB7CisgICAgICAgICAgICBpZiAodGhpcy5fZWxl bWVudC50ZXh0Q29udGVudCAhPT0gdGhpcy5fdmFsdWVCZWZvcmVFZGl0aW5nKQorICAgICAgICAg ICAgICAgIHRoaXMuX2RlbGVnYXRlLnNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZERpZENvbW1pdCgp OworICAgICAgICB9CiAKLSAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlICYmIHR5cGVvZiB0aGlz Ll9kZWxlZ2F0ZS5zcHJlYWRzaGVldFNlbGVjdG9yRmllbGREaWRDaGFuZ2UgPT09ICJmdW5jdGlv biIpCi0gICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5zcHJlYWRzaGVldFNlbGVjdG9yRmllbGRE aWRDaGFuZ2UobnVsbCk7CisgICAgICAgIHRoaXMuc3RvcEVkaXRpbmcoKTsKICAgICB9CiAKICAg ICBfaGFuZGxlS2V5RG93bihldmVudCkKQEAgLTEyOCwxMyArMTMzLDExIEBAIFdJLlNwcmVhZHNo ZWV0U2VsZWN0b3JGaWVsZCA9IGNsYXNzIFNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZCBleHRlbmRz IFdJLk9iamVjdAogICAgICAgICBpZiAoZXZlbnQua2V5ID09PSAiRW50ZXIiIHx8IGV2ZW50Lmtl eSA9PT0gIlRhYiIpIHsKICAgICAgICAgICAgIGV2ZW50LnN0b3AoKTsKIAotICAgICAgICAgICAg dGhpcy5zdG9wRWRpdGluZygpOwotCi0gICAgICAgICAgICBpZiAodGhpcy5fZGVsZWdhdGUgJiYg dHlwZW9mIHRoaXMuX2RlbGVnYXRlLnNwcmVhZHNoZWV0U2VsZWN0b3JGaWVsZERpZENoYW5nZSA9 PT0gImZ1bmN0aW9uIikgeworICAgICAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlICYmIHR5cGVv ZiB0aGlzLl9kZWxlZ2F0ZS5zcHJlYWRzaGVldFNlbGVjdG9yRmllbGRXaWxsTmF2aWdhdGUgPT09 ICJmdW5jdGlvbiIpIHsKICAgICAgICAgICAgICAgICBsZXQgZGlyZWN0aW9uID0gKGV2ZW50LnNo aWZ0S2V5ICYmIGV2ZW50LmtleSA9PT0gIlRhYiIpID8gImJhY2t3YXJkIiA6ICJmb3J3YXJkIjsK LSAgICAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5zcHJlYWRzaGVldFNlbGVjdG9yRmllbGRE aWRDaGFuZ2UoZGlyZWN0aW9uKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5zcHJl YWRzaGVldFNlbGVjdG9yRmllbGRXaWxsTmF2aWdhdGUoZGlyZWN0aW9uKTsKICAgICAgICAgICAg IH0KLQorICAgICAgICAgICAgdGhpcy5zdG9wRWRpdGluZygpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAK