178329 2017-10-15 20:53:54 -0700 Web Inspector: [PARITY] Styles Redesign: Ability to add new style rules 2017-12-06 00:24:45 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev hi commit-queue hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1360657 0 nvasilyev 2017-10-15 20:53:54 -0700 The old styles sidebar has a plus icon on the left to the filter field, which allows to add new style rules. The new styles sidebar doesn't have it yet. 1360658 1 webkit-bug-importer 2017-10-15 20:54:07 -0700 <rdar://problem/35001005> 1377348 2 hi 2017-12-02 12:29:22 -0800 Any update on this? I've been forced to use the old UI because I can't add new rules :( 1377435 3 328281 hi 2017-12-02 21:01:35 -0800 Created attachment 328281 Patch 1377473 4 328281 nvasilyev 2017-12-03 10:05:14 -0800 Comment on attachment 328281 Patch Thank you for workin on this, Devin! It works as expected. Just a couple of nits and questions. View in context: https://bugs.webkit.org/attachment.cgi?id=328281&action=review > Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js:115 > + if (this._focusSelectorElement) > + this.startEditingRuleSelector(); Maybe _shouldFocusSelectorElement or _pendingSelectorElementFocus. > Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js:117 > + section.startEditingRuleSelector(); What if several style declarations fall under this condition? > Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js:183 > + for (let styleSheet of styleSheets) { > + contextMenu.appendItem(styleSheet.displayName, () => { > + this._addNewRule(styleSheet.id); > + }); > + } I've noticed a peculiar behavior. 1. Open http://nv.github.io/webkit-inspector-bugs/styles-redesign/tests/color.html 2. Right click on the plus button. It shows "Available Style Sheets: color.css" 3. Click the plus button. 4. Right click on the plus button. It shows "Available Style Sheets: color.css, color.html" Why is that? This happens in the old styles sidebar as well. > Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js:213 > + _addNewRule(stylesheetId) { "{" should go on the next line. 1377494 5 328281 hi 2017-12-03 13:46:10 -0800 Comment on attachment 328281 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=328281&action=review >> Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js:117 >> + section.startEditingRuleSelector(); > > What if several style declarations fall under this condition? This is fine, because rules that are defined later in a stylesheet have a higher priority, so they'd appear closer to the top. >> Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js:183 >> + } > > I've noticed a peculiar behavior. > > 1. Open http://nv.github.io/webkit-inspector-bugs/styles-redesign/tests/color.html > 2. Right click on the plus button. It shows "Available Style Sheets: color.css" > 3. Click the plus button. > 4. Right click on the plus button. It shows "Available Style Sheets: color.css, color.html" > > Why is that? This happens in the old styles sidebar as well. It appears that Inspector Style Sheets are created with the URL of the page. "color.html" is the preferred Inspector Style Sheet. I'll add some logic to separate it. 1377495 6 328301 hi 2017-12-03 13:46:51 -0800 Created attachment 328301 Patch 1378551 7 328301 commit-queue 2017-12-05 23:55:29 -0800 Comment on attachment 328301 Patch Rejecting attachment 328301 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 328301, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: .webkit.org/git/WebKit 5cf19e4..fd36e14 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 225568 = 5cf19e403b6b766c52fb8630564e59a3f608c9a4 r225569 = fd36e1404f49d6831c75faae3f9355dc7f913ac9 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://webkit-queues.webkit.org/results/5511591 1378559 8 328554 hi 2017-12-06 00:09:41 -0800 Created attachment 328554 Patch 1378564 9 328554 commit-queue 2017-12-06 00:24:44 -0800 Comment on attachment 328554 Patch Clearing flags on attachment: 328554 Committed r225571: <https://trac.webkit.org/changeset/225571> 1378565 10 commit-queue 2017-12-06 00:24:45 -0800 All reviewed patches have been landed. Closing bug. 328281 2017-12-02 21:01:35 -0800 2017-12-03 13:46:50 -0800 Patch bug-178329-20171202210134.patch text/plain 6499 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDdjMWZkOGVmZDY3OTgxNmFiODU0NGE5MTNlNTYw YTViYTVlMTY0ZmYuLjJjY2QwODExY2YxOTc3Zjc1ZTU2ODM1ZWZjODVmYWQwOWRlOGE1ZjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTEyLTAyICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtQQVJJVFldIFN0eWxlcyBSZWRlc2lnbjogQWJpbGl0eSB0byBhZGQgbmV3IHN0eWxlIHJ1 bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgz MjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1MDAxMDA1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJl YWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVl dFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRSdWxlc1N0 eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5yZWZyZXNoKToKKyAgICAgICAgKFdJLlNwcmVhZHNo ZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUubmV3UnVsZUJ1dHRvbkNsaWNrZWQp OgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlw ZS5uZXdSdWxlQnV0dG9uQ29udGV4dE1lbnUpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRSdWxl c1N0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5fYWRkTmV3UnVsZSk6CisgICAgICAgIEltcGxl bWVudCB0aGUgdHdvIGZ1bmN0aW9ucyB0aGF0IENTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbCBl eHBlY3RzIHRvIGV4aXN0IGluIG9yZGVyIGZvcgorICAgICAgICB0aGUgc2VsZWN0ZWQgcGFuZWwg dG8gc3VwcG9ydCBhZGRpbmcgYSBuZXcgcnVsZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qczoKKyAgICAgICAg KFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24pOgorICAgICAgICAoV0ku U3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5wcm90b3R5cGUubGF5b3V0KToK KyAgICAgICAgKFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24ucHJvdG90 eXBlLnN0YXJ0RWRpdGluZ1J1bGVTZWxlY3Rvcik6CisgICAgICAgIElmIHRoZSBfc2VsZWN0b3JF bGVtZW50IGhhcyBub3QgYmVlbiBjcmVhdGVkIHlldCwgc2V0IGEgZmxhZyBhbmQgZm9jdXMgaXQg b25jZSBsYXlvdXQoKSBoYXMKKyAgICAgICAgYmVlbiBjYWxsZWQgKHRoZXJlYnkgZW5zdXJpbmcg dGhhdCBpbml0aWFsTGF5b3V0KCkgaGFzIGJlZW4gY2FsbGVkKS4KKwogMjAxNy0xMS0yOSAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBTdHlsZXMgUmVkZXNpZ246IGNhbid0IGFkZCBuZXcgcHJvcGVydHkgYWZ0ZXIgcHJvcGVy dHkgd2l0aG91dCB0cmFpbGluZyBzZW1pY29sb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlv blNlY3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T cHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCmluZGV4IGNjMmU2MDdlMzI4 YmM5YTdmMTMzY2Q1NTJhOGYzMjJmMzJiOGE1NjQuLjM4M2FhMTcyMTNlNTJkNDY2M2Q4Nzc2YzMy ZDA0ZWU2YWRmNjkxYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRD U1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcwpAQCAtMzcsNiArMzcsNyBAQCBXSS5TcHJlYWRz aGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHls ZURlY2xhcmF0aW9uUwogICAgICAgICB0aGlzLl9zdHlsZSA9IHN0eWxlOwogICAgICAgICB0aGlz Ll9wcm9wZXJ0aWVzRWRpdG9yID0gbnVsbDsKICAgICAgICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50 cyA9IFtdOworICAgICAgICB0aGlzLl9mb2N1c1NlbGVjdG9yRWxlbWVudCA9IGZhbHNlOwogICAg ICAgICB0aGlzLl93YXNGb2N1c2VkID0gZmFsc2U7CiAgICAgfQogCkBAIC0xMDksMTEgKzExMCwy MCBAQCBXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gY2xhc3MgU3By ZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uUwogCiAgICAgICAgIHRoaXMuX3JlbmRlck9yaWdp bigpOwogICAgICAgICB0aGlzLl9yZW5kZXJTZWxlY3RvcigpOworCisgICAgICAgIGlmICh0aGlz Ll9mb2N1c1NlbGVjdG9yRWxlbWVudCkKKyAgICAgICAgICAgIHRoaXMuc3RhcnRFZGl0aW5nUnVs ZVNlbGVjdG9yKCk7CiAgICAgfQogCiAgICAgc3RhcnRFZGl0aW5nUnVsZVNlbGVjdG9yKCkKICAg ICB7CisgICAgICAgIGlmICghdGhpcy5fc2VsZWN0b3JFbGVtZW50KSB7CisgICAgICAgICAgICB0 aGlzLl9mb2N1c1NlbGVjdG9yRWxlbWVudCA9IHRydWU7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKwogICAgICAgICB0aGlzLl9zZWxlY3RvckVsZW1lbnQuZm9jdXMoKTsKKyAgICAg ICAgdGhpcy5fZm9jdXNTZWxlY3RvckVsZW1lbnQgPSBmYWxzZTsKICAgICB9CiAKICAgICBoaWdo bGlnaHRQcm9wZXJ0eShwcm9wZXJ0eSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0 UnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcwppbmRleCBmOTNmYjZkZjhhMzAzNWEyNmQ2NGE3Zjg1 YzMzOGZmNmJiZDE5MDUzLi43NGE3YjIyMzc5Mjg5ZGVmMjZjYWUwMDAxMjg4NWEwOWE5YWE4N2Uz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T cHJlYWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1Bh bmVsLmpzCkBAIC0zNSw4ICszNSw3IEBAIFdJLlNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQ YW5lbCA9IGNsYXNzIFNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCBlCiAgICAgICAg IHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJzcHJlYWRzaGVldC1zdHlsZS1wYW5lbCIpOwog CiAgICAgICAgIHRoaXMuX3NlY3Rpb25zID0gW107Ci0gICAgICAgIHRoaXMuX2luc3BlY3RvclNl Y3Rpb24gPSBudWxsOwotICAgICAgICB0aGlzLl9pc0luc3BlY3RvclNlY3Rpb25QZW5kaW5nRm9j dXMgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fbmV3UnVsZVNlbGVjdG9yID0gbnVsbDsKICAgICAg ICAgdGhpcy5fcnVsZU1lZGlhQW5kSW5oZXJ0aWNhbmNlTGlzdCA9IFtdOwogICAgICAgICB0aGlz Ll9wcm9wZXJ0eVRvU2VsZWN0QW5kSGlnaGxpZ2h0ID0gbnVsbDsKIApAQCAtMTE0LDggKzExMyw4 IEBAIFdJLlNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFNwcmVhZHNo ZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCBlCiAgICAgICAgICAgICAgICAgc3R5bGVbV0kuU3By ZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLlJ1bGVTZWN0aW9uXSA9IHNlY3Rpb247CiAg ICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmICh0aGlzLl9pc0luc3BlY3RvclNlY3Rpb25Q ZW5kaW5nRm9jdXMgJiYgc3R5bGUuaXNJbnNwZWN0b3JSdWxlKCkpCi0gICAgICAgICAgICAgICAg dGhpcy5faW5zcGVjdG9yU2VjdGlvbiA9IHNlY3Rpb247CisgICAgICAgICAgICBpZiAodGhpcy5f bmV3UnVsZVNlbGVjdG9yID09PSBzdHlsZS5zZWxlY3RvclRleHQgJiYgIXN0eWxlLmhhc1Byb3Bl cnRpZXMoKSkKKyAgICAgICAgICAgICAgICBzZWN0aW9uLnN0YXJ0RWRpdGluZ1J1bGVTZWxlY3Rv cigpOwogCiAgICAgICAgICAgICB0aGlzLmFkZFN1YnZpZXcoc2VjdGlvbik7CiAgICAgICAgICAg ICBzZWN0aW9uLm5lZWRzTGF5b3V0KCk7CkBAIC0xMjQsNiArMTIzLDggQEAgV0kuU3ByZWFkc2hl ZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0 YWlsc1BhbmVsIGUKICAgICAgICAgICAgIHByZXZpb3VzU3R5bGUgPSBzdHlsZTsKICAgICAgICAg fQogCisgICAgICAgIHRoaXMuX25ld1J1bGVTZWxlY3RvciA9IG51bGw7CisKICAgICAgICAgdGhp cy5lbGVtZW50LmFwcGVuZCh0aGlzLl9lbXB0eUZpbHRlclJlc3VsdHNFbGVtZW50KTsKIAogICAg ICAgICBzdXBlci5yZWZyZXNoKHNpZ25pZmljYW50Q2hhbmdlKTsKQEAgLTE1Miw2ICsxNTMsMzYg QEAgV0kuU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgU3ByZWFkc2hl ZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsIGUKICAgICAgICAgfQogICAgIH0KIAorICAgIG5ld1J1 bGVCdXR0b25DbGlja2VkKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLm5vZGVTdHlsZXMubm9k ZS5pc0luVXNlckFnZW50U2hhZG93VHJlZSgpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAg ICAgIHRoaXMuX2FkZE5ld1J1bGUoKTsKKyAgICB9CisKKyAgICBuZXdSdWxlQnV0dG9uQ29udGV4 dE1lbnUoZXZlbnQpCisgICAgeworICAgICAgICBpZiAodGhpcy5ub2RlU3R5bGVzLm5vZGUuaXNJ blVzZXJBZ2VudFNoYWRvd1RyZWUoKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBs ZXQgc3R5bGVTaGVldHMgPSBXSS5jc3NTdHlsZU1hbmFnZXIuc3R5bGVTaGVldHMuZmlsdGVyKHN0 eWxlU2hlZXQgPT4gc3R5bGVTaGVldC5oYXNJbmZvKCkgJiYgIXN0eWxlU2hlZXQuaXNJbmxpbmVT dHlsZVRhZygpICYmICFzdHlsZVNoZWV0LmlzSW5saW5lU3R5bGVBdHRyaWJ1dGVTdHlsZVNoZWV0 KCkpOworICAgICAgICBpZiAoIXN0eWxlU2hlZXRzLmxlbmd0aCkKKyAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICBsZXQgY29udGV4dE1lbnUgPSBXSS5Db250ZXh0TWVudS5jcmVhdGVGcm9t RXZlbnQoZXZlbnQpOworCisgICAgICAgIGNvbnN0IGhhbmRsZXIgPSBudWxsOworICAgICAgICBj b25zdCBkaXNhYmxlZCA9IHRydWU7CisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV0ku VUlTdHJpbmcoIkF2YWlsYWJsZSBTdHlsZSBTaGVldHMiKSwgaGFuZGxlciwgZGlzYWJsZWQpOwor CisgICAgICAgIGZvciAobGV0IHN0eWxlU2hlZXQgb2Ygc3R5bGVTaGVldHMpIHsKKyAgICAgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oc3R5bGVTaGVldC5kaXNwbGF5TmFtZSwgKCkgPT4g eworICAgICAgICAgICAgICAgIHRoaXMuX2FkZE5ld1J1bGUoc3R5bGVTaGVldC5pZCk7CisgICAg ICAgICAgICB9KTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIGNzc1N0eWxlRGVjbGFyYXRpb25T ZWN0aW9uU3RhcnRFZGl0aW5nTmV4dFJ1bGUoY3VycmVudFNlY3Rpb24pCiAgICAgewogICAgICAg ICBsZXQgY3VycmVudEluZGV4ID0gdGhpcy5fc2VjdGlvbnMuaW5kZXhPZihjdXJyZW50U2VjdGlv bik7CkBAIC0xNzYsNiArMjA3LDE2IEBAIFdJLlNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQ YW5lbCA9IGNsYXNzIFNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCBlCiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICB9CisKKyAgICAvLyBQcml2YXRlCisKKyAgICBfYWRkTmV3 UnVsZShzdHlsZXNoZWV0SWQpIHsKKyAgICAgICAgY29uc3QganVzdFNlbGVjdG9yID0gdHJ1ZTsK KyAgICAgICAgdGhpcy5fbmV3UnVsZVNlbGVjdG9yID0gdGhpcy5ub2RlU3R5bGVzLm5vZGUuYXBw cm9wcmlhdGVTZWxlY3RvckZvcihqdXN0U2VsZWN0b3IpOworCisgICAgICAgIGNvbnN0IHRleHQg PSAiIjsKKyAgICAgICAgdGhpcy5ub2RlU3R5bGVzLmFkZFJ1bGUodGhpcy5fbmV3UnVsZVNlbGVj dG9yLCB0ZXh0LCBzdHlsZXNoZWV0SWQpOworICAgIH0KIH07CiAKIFdJLlNwcmVhZHNoZWV0UnVs ZXNTdHlsZURldGFpbHNQYW5lbC5SdWxlU2VjdGlvbiA9IFN5bWJvbCgicnVsZS1zZWN0aW9uIik7 Cg== 328301 2017-12-03 13:46:51 -0800 2017-12-06 00:09:39 -0800 Patch bug-178329-20171203134650.patch text/plain 6977 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDdjMWZkOGVmZDY3OTgxNmFiODU0NGE5MTNlNTYw YTViYTVlMTY0ZmYuLjJkMGFhODM3ZmY3YjNlNmIxMzdhMTU5ODQyMjI3MzA3NGViZmI4NTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTEyLTAzICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtQQVJJVFldIFN0eWxlcyBSZWRlc2lnbjogQWJpbGl0eSB0byBhZGQgbmV3IHN0eWxlIHJ1 bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgz MjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1MDAxMDA1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJl YWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVl dFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRSdWxlc1N0 eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5yZWZyZXNoKToKKyAgICAgICAgKFdJLlNwcmVhZHNo ZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUubmV3UnVsZUJ1dHRvbkNsaWNrZWQp OgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlw ZS5uZXdSdWxlQnV0dG9uQ29udGV4dE1lbnUpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRSdWxl c1N0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5fYWRkTmV3UnVsZSk6CisgICAgICAgIEltcGxl bWVudCB0aGUgdHdvIGZ1bmN0aW9ucyB0aGF0IENTU1N0eWxlRGV0YWlsc1NpZGViYXJQYW5lbCBl eHBlY3RzIHRvIGV4aXN0IGluIG9yZGVyIGZvcgorICAgICAgICB0aGUgc2VsZWN0ZWQgcGFuZWwg dG8gc3VwcG9ydCBhZGRpbmcgYSBuZXcgcnVsZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qczoKKyAgICAgICAg KFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24pOgorICAgICAgICAoV0ku U3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5wcm90b3R5cGUubGF5b3V0KToK KyAgICAgICAgKFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24ucHJvdG90 eXBlLnN0YXJ0RWRpdGluZ1J1bGVTZWxlY3Rvcik6CisgICAgICAgIElmIHRoZSBfc2VsZWN0b3JF bGVtZW50IGhhcyBub3QgYmVlbiBjcmVhdGVkIHlldCwgc2V0IGEgZmxhZyBhbmQgZm9jdXMgaXQg b25jZSBsYXlvdXQoKSBoYXMKKyAgICAgICAgYmVlbiBjYWxsZWQgKHRoZXJlYnkgZW5zdXJpbmcg dGhhdCBpbml0aWFsTGF5b3V0KCkgaGFzIGJlZW4gY2FsbGVkKS4KKwogMjAxNy0xMS0yOSAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBTdHlsZXMgUmVkZXNpZ246IGNhbid0IGFkZCBuZXcgcHJvcGVydHkgYWZ0ZXIgcHJvcGVy dHkgd2l0aG91dCB0cmFpbGluZyBzZW1pY29sb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlv blNlY3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T cHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCmluZGV4IGNjMmU2MDdlMzI4 YmM5YTdmMTMzY2Q1NTJhOGYzMjJmMzJiOGE1NjQuLjc1MDBlNzg5NGNiOTU0Y2Q4ZjA0ZTM4MTdk NmRhYWJjZDU2NjcxZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRD U1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcwpAQCAtMzcsNiArMzcsNyBAQCBXSS5TcHJlYWRz aGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHls ZURlY2xhcmF0aW9uUwogICAgICAgICB0aGlzLl9zdHlsZSA9IHN0eWxlOwogICAgICAgICB0aGlz Ll9wcm9wZXJ0aWVzRWRpdG9yID0gbnVsbDsKICAgICAgICAgdGhpcy5fc2VsZWN0b3JFbGVtZW50 cyA9IFtdOworICAgICAgICB0aGlzLl9zaG91bGRGb2N1c1NlbGVjdG9yRWxlbWVudCA9IGZhbHNl OwogICAgICAgICB0aGlzLl93YXNGb2N1c2VkID0gZmFsc2U7CiAgICAgfQogCkBAIC0xMDksMTEg KzExMCwyMCBAQCBXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gY2xh c3MgU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uUwogCiAgICAgICAgIHRoaXMuX3JlbmRl ck9yaWdpbigpOwogICAgICAgICB0aGlzLl9yZW5kZXJTZWxlY3RvcigpOworCisgICAgICAgIGlm ICh0aGlzLl9zaG91bGRGb2N1c1NlbGVjdG9yRWxlbWVudCkKKyAgICAgICAgICAgIHRoaXMuc3Rh cnRFZGl0aW5nUnVsZVNlbGVjdG9yKCk7CiAgICAgfQogCiAgICAgc3RhcnRFZGl0aW5nUnVsZVNl bGVjdG9yKCkKICAgICB7CisgICAgICAgIGlmICghdGhpcy5fc2VsZWN0b3JFbGVtZW50KSB7Cisg ICAgICAgICAgICB0aGlzLl9zaG91bGRGb2N1c1NlbGVjdG9yRWxlbWVudCA9IHRydWU7CisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KKwogICAgICAgICB0aGlzLl9zZWxlY3RvckVsZW1l bnQuZm9jdXMoKTsKKyAgICAgICAgdGhpcy5fc2hvdWxkRm9jdXNTZWxlY3RvckVsZW1lbnQgPSBm YWxzZTsKICAgICB9CiAKICAgICBoaWdobGlnaHRQcm9wZXJ0eShwcm9wZXJ0eSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0 UnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcwppbmRleCBm OTNmYjZkZjhhMzAzNWEyNmQ2NGE3Zjg1YzMzOGZmNmJiZDE5MDUzLi5jOGRlZTAyZWU0MjRiNjIy NjI5NGQ3MmZjNjVmOGFlYWNmY2ZmODA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFk c2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzCkBAIC0zNSw4ICszNSw3IEBAIFdJLlNwcmVh ZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFNwcmVhZHNoZWV0UnVsZXNTdHls ZURldGFpbHNQYW5lbCBlCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJzcHJl YWRzaGVldC1zdHlsZS1wYW5lbCIpOwogCiAgICAgICAgIHRoaXMuX3NlY3Rpb25zID0gW107Ci0g ICAgICAgIHRoaXMuX2luc3BlY3RvclNlY3Rpb24gPSBudWxsOwotICAgICAgICB0aGlzLl9pc0lu c3BlY3RvclNlY3Rpb25QZW5kaW5nRm9jdXMgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fbmV3UnVs ZVNlbGVjdG9yID0gbnVsbDsKICAgICAgICAgdGhpcy5fcnVsZU1lZGlhQW5kSW5oZXJ0aWNhbmNl TGlzdCA9IFtdOwogICAgICAgICB0aGlzLl9wcm9wZXJ0eVRvU2VsZWN0QW5kSGlnaGxpZ2h0ID0g bnVsbDsKIApAQCAtMTE0LDggKzExMyw4IEBAIFdJLlNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFp bHNQYW5lbCA9IGNsYXNzIFNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCBlCiAgICAg ICAgICAgICAgICAgc3R5bGVbV0kuU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLlJ1 bGVTZWN0aW9uXSA9IHNlY3Rpb247CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmICh0 aGlzLl9pc0luc3BlY3RvclNlY3Rpb25QZW5kaW5nRm9jdXMgJiYgc3R5bGUuaXNJbnNwZWN0b3JS dWxlKCkpCi0gICAgICAgICAgICAgICAgdGhpcy5faW5zcGVjdG9yU2VjdGlvbiA9IHNlY3Rpb247 CisgICAgICAgICAgICBpZiAodGhpcy5fbmV3UnVsZVNlbGVjdG9yID09PSBzdHlsZS5zZWxlY3Rv clRleHQgJiYgIXN0eWxlLmhhc1Byb3BlcnRpZXMoKSkKKyAgICAgICAgICAgICAgICBzZWN0aW9u LnN0YXJ0RWRpdGluZ1J1bGVTZWxlY3RvcigpOwogCiAgICAgICAgICAgICB0aGlzLmFkZFN1YnZp ZXcoc2VjdGlvbik7CiAgICAgICAgICAgICBzZWN0aW9uLm5lZWRzTGF5b3V0KCk7CkBAIC0xMjQs NiArMTIzLDggQEAgV0kuU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3Mg U3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsIGUKICAgICAgICAgICAgIHByZXZpb3Vz U3R5bGUgPSBzdHlsZTsKICAgICAgICAgfQogCisgICAgICAgIHRoaXMuX25ld1J1bGVTZWxlY3Rv ciA9IG51bGw7CisKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZCh0aGlzLl9lbXB0eUZpbHRl clJlc3VsdHNFbGVtZW50KTsKIAogICAgICAgICBzdXBlci5yZWZyZXNoKHNpZ25pZmljYW50Q2hh bmdlKTsKQEAgLTE1Miw2ICsxNTMsNDMgQEAgV0kuU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWls c1BhbmVsID0gY2xhc3MgU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsIGUKICAgICAg ICAgfQogICAgIH0KIAorICAgIG5ld1J1bGVCdXR0b25DbGlja2VkKCkKKyAgICB7CisgICAgICAg IGlmICh0aGlzLm5vZGVTdHlsZXMubm9kZS5pc0luVXNlckFnZW50U2hhZG93VHJlZSgpKQorICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX2FkZE5ld1J1bGUoKTsKKyAgICB9CisK KyAgICBuZXdSdWxlQnV0dG9uQ29udGV4dE1lbnUoZXZlbnQpCisgICAgeworICAgICAgICBpZiAo dGhpcy5ub2RlU3R5bGVzLm5vZGUuaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICBsZXQgc3R5bGVTaGVldHMgPSBXSS5jc3NTdHlsZU1hbmFn ZXIuc3R5bGVTaGVldHMuZmlsdGVyKHN0eWxlU2hlZXQgPT4gc3R5bGVTaGVldC5oYXNJbmZvKCkg JiYgIXN0eWxlU2hlZXQuaXNJbmxpbmVTdHlsZVRhZygpICYmICFzdHlsZVNoZWV0LmlzSW5saW5l U3R5bGVBdHRyaWJ1dGVTdHlsZVNoZWV0KCkpOworICAgICAgICBpZiAoIXN0eWxlU2hlZXRzLmxl bmd0aCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBsZXQgY29udGV4dE1lbnUgPSBX SS5Db250ZXh0TWVudS5jcmVhdGVGcm9tRXZlbnQoZXZlbnQpOworCisgICAgICAgIGNvbnN0IGhh bmRsZXIgPSBudWxsOworICAgICAgICBjb25zdCBkaXNhYmxlZCA9IHRydWU7CisgICAgICAgIGNv bnRleHRNZW51LmFwcGVuZEl0ZW0oV0kuVUlTdHJpbmcoIkF2YWlsYWJsZSBTdHlsZSBTaGVldHMi KSwgaGFuZGxlciwgZGlzYWJsZWQpOworCisgICAgICAgIGxldCBbaW5zcGVjdG9yU3R5bGVTaGVl dHMsIHJlZ3VsYXJTdHlsZVNoZWV0c10gPSBzdHlsZVNoZWV0cy5wYXJ0aXRpb24oc3R5bGVTaGVl dCA9PiBzdHlsZVNoZWV0LmlzSW5zcGVjdG9yU3R5bGVTaGVldCgpKTsKKyAgICAgICAgY29uc29s ZS5hc3NlcnQoaW5zcGVjdG9yU3R5bGVTaGVldHMubGVuZ3RoIDw9IDEsICJUaGVyZSBzaG91bGQg bmV2ZXIgYmUgbW9yZSB0aGFuIG9uZSBpbnNwZWN0b3Igc3R5bGUgc2hlZXQiKTsKKworICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJJbnNwZWN0b3IgU3R5bGUgU2hl ZXQiKSwgKCkgPT4geworICAgICAgICAgICAgdGhpcy5fYWRkTmV3UnVsZShpbnNwZWN0b3JTdHls ZVNoZWV0cy5sZW5ndGggPyBpbnNwZWN0b3JTdHlsZVNoZWV0c1swXS5pZCA6IG51bGwpOworICAg ICAgICB9KTsKKworICAgICAgICBmb3IgKGxldCBzdHlsZVNoZWV0IG9mIHJlZ3VsYXJTdHlsZVNo ZWV0cykgeworICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShzdHlsZVNoZWV0LmRp c3BsYXlOYW1lLCAoKSA9PiB7CisgICAgICAgICAgICAgICAgdGhpcy5fYWRkTmV3UnVsZShzdHls ZVNoZWV0LmlkKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CisgICAgfQorCiAgICAgY3Nz U3R5bGVEZWNsYXJhdGlvblNlY3Rpb25TdGFydEVkaXRpbmdOZXh0UnVsZShjdXJyZW50U2VjdGlv bikKICAgICB7CiAgICAgICAgIGxldCBjdXJyZW50SW5kZXggPSB0aGlzLl9zZWN0aW9ucy5pbmRl eE9mKGN1cnJlbnRTZWN0aW9uKTsKQEAgLTE3Niw2ICsyMTQsMTcgQEAgV0kuU3ByZWFkc2hlZXRS dWxlc1N0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWls c1BhbmVsIGUKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KKworICAgIC8vIFByaXZh dGUKKworICAgIF9hZGROZXdSdWxlKHN0eWxlc2hlZXRJZCkKKyAgICB7CisgICAgICAgIGNvbnN0 IGp1c3RTZWxlY3RvciA9IHRydWU7CisgICAgICAgIHRoaXMuX25ld1J1bGVTZWxlY3RvciA9IHRo aXMubm9kZVN0eWxlcy5ub2RlLmFwcHJvcHJpYXRlU2VsZWN0b3JGb3IoanVzdFNlbGVjdG9yKTsK KworICAgICAgICBjb25zdCB0ZXh0ID0gIiI7CisgICAgICAgIHRoaXMubm9kZVN0eWxlcy5hZGRS dWxlKHRoaXMuX25ld1J1bGVTZWxlY3RvciwgdGV4dCwgc3R5bGVzaGVldElkKTsKKyAgICB9CiB9 OwogCiBXSS5TcHJlYWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwuUnVsZVNlY3Rpb24gPSBT eW1ib2woInJ1bGUtc2VjdGlvbiIpOwo= 328554 2017-12-06 00:09:41 -0800 2017-12-06 00:24:44 -0800 Patch bug-178329-20171206000940.patch text/plain 7237 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGE2MDFmYzQ2Zjg0NWFmMWM0MGU0OGM5MGJkNDYx ZDIzZDRkZmI4ZDQuLjFmYWYwNWE5MTU1ZmMxMzhlZDY3MDNjZDFhYzM2ODdkZTY0NDIzMDggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE3LTEyLTA1ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtQQVJJVFldIFN0eWxlcyBSZWRlc2lnbjogQWJpbGl0eSB0byBhZGQgbmV3IHN0eWxlIHJ1 bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzgz MjkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1MDAxMDA1PgorCisgICAgICAgIFJldmlld2Vk IGJ5IFRpbW90aHkgSGF0Y2hlci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3By ZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmpzOgorICAgICAgICAoV0kuU3ByZWFkc2hl ZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsKToKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0UnVsZXNT dHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUucmVmcmVzaCk6CisgICAgICAgIChXSS5TcHJlYWRz aGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLm5ld1J1bGVCdXR0b25DbGlja2Vk KToKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5 cGUubmV3UnVsZUJ1dHRvbkNvbnRleHRNZW51KToKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0UnVs ZXNTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuX2FkZE5ld1J1bGUpOgorICAgICAgICBJbXBs ZW1lbnQgdGhlIHR3byBmdW5jdGlvbnMgdGhhdCBDU1NTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwg ZXhwZWN0cyB0byBleGlzdCBpbiBvcmRlciBmb3IKKyAgICAgICAgdGhlIHNlbGVjdGVkIHBhbmVs IHRvIHN1cHBvcnQgYWRkaW5nIGEgbmV3IHJ1bGUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanM6CisgICAgICAg IChXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uKToKKyAgICAgICAgKFdJ LlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24ucHJvdG90eXBlLmxheW91dCk6 CisgICAgICAgIChXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLnByb3Rv dHlwZS5zdGFydEVkaXRpbmdSdWxlU2VsZWN0b3IpOgorICAgICAgICBJZiB0aGUgX3NlbGVjdG9y RWxlbWVudCBoYXMgbm90IGJlZW4gY3JlYXRlZCB5ZXQsIHNldCBhIGZsYWcgYW5kIGZvY3VzIGl0 IG9uY2UgbGF5b3V0KCkgaGFzCisgICAgICAgIGJlZW4gY2FsbGVkICh0aGVyZWJ5IGVuc3VyaW5n IHRoYXQgaW5pdGlhbExheW91dCgpIGhhcyBiZWVuIGNhbGxlZCkuCisKKzIwMTctMTItMDUgIERl dmluIFJvdXNzbyAgPHdlYmtpdEBkZXZpbnJvdXNzby5jb20+CisKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogU3R5bGVzIFJlZGVzaWduOiBmb3IgbmV3bHkgYWRkZWQgcHJvcGVydGllcywgcHJlc3Np bmcgZGVsZXRlIGluIGVtcHR5IHZhbHVlIGZpZWxkIHNob3VsZCBmb2N1cyBvbiBuYW1lIGZpZWxk CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk4MzEK ICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM1NjI2OTc2PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xh cmF0aW9uU2VjdGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKaW5kZXggY2Q4Y2Vj ZDE5NzJmZWFkMDAyYzRhZWI5NDRkZmFhZGNlZDRkYTcyOC4uZmU2NDFlYWJiYTc0ZjMwY2IwZjI5 NmM3MDY0NGJlNzlkY2RiNWM3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRz aGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCkBAIC0zOSw2ICszOSw3IEBAIFdJLlNw cmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24gPSBjbGFzcyBTcHJlYWRzaGVldENT U1N0eWxlRGVjbGFyYXRpb25TCiAgICAgICAgIHRoaXMuX3NlbGVjdG9yRWxlbWVudHMgPSBbXTsK ICAgICAgICAgdGhpcy5fbWVkaWFFbGVtZW50cyA9IFtdOwogICAgICAgICB0aGlzLl9maWx0ZXJU ZXh0ID0gbnVsbDsKKyAgICAgICAgdGhpcy5fc2hvdWxkRm9jdXNTZWxlY3RvckVsZW1lbnQgPSBm YWxzZTsKICAgICAgICAgdGhpcy5fd2FzRm9jdXNlZCA9IGZhbHNlOwogICAgIH0KIApAQCAtMTEy LDExICsxMTMsMjAgQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbiA9 IGNsYXNzIFNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblMKIAogICAgICAgICB0aGlzLl9y ZW5kZXJPcmlnaW4oKTsKICAgICAgICAgdGhpcy5fcmVuZGVyU2VsZWN0b3IoKTsKKworICAgICAg ICBpZiAodGhpcy5fc2hvdWxkRm9jdXNTZWxlY3RvckVsZW1lbnQpCisgICAgICAgICAgICB0aGlz LnN0YXJ0RWRpdGluZ1J1bGVTZWxlY3RvcigpOwogICAgIH0KIAogICAgIHN0YXJ0RWRpdGluZ1J1 bGVTZWxlY3RvcigpCiAgICAgeworICAgICAgICBpZiAoIXRoaXMuX3NlbGVjdG9yRWxlbWVudCkg eworICAgICAgICAgICAgdGhpcy5fc2hvdWxkRm9jdXNTZWxlY3RvckVsZW1lbnQgPSB0cnVlOwor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKICAgICAgICAgdGhpcy5fc2VsZWN0b3JF bGVtZW50LmZvY3VzKCk7CisgICAgICAgIHRoaXMuX3Nob3VsZEZvY3VzU2VsZWN0b3JFbGVtZW50 ID0gZmFsc2U7CiAgICAgfQogCiAgICAgaGlnaGxpZ2h0UHJvcGVydHkocHJvcGVydHkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRz aGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwuanMKaW5k ZXggYTI0OGVjYmNmYzA5NWJiZTJiNTE3MWM5MTlkNTgwMDUwYjQyOGZmYy4uOTdkYTUyN2IwMGM1 YjYyYzdkNmQ3Yzc2NDE1ZTRhZDk0NWY0MWY0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1Bh bmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nw cmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5qcwpAQCAtMzYsOCArMzYsNyBAQCBXSS5T cHJlYWRzaGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwgPSBjbGFzcyBTcHJlYWRzaGVldFJ1bGVz U3R5bGVEZXRhaWxzUGFuZWwgZQogCiAgICAgICAgIHRoaXMuX2luaGVyaXRlZEhlYWRlck1hcCA9 IG5ldyBNYXA7CiAgICAgICAgIHRoaXMuX3NlY3Rpb25zID0gW107Ci0gICAgICAgIHRoaXMuX2lu c3BlY3RvclNlY3Rpb24gPSBudWxsOwotICAgICAgICB0aGlzLl9pc0luc3BlY3RvclNlY3Rpb25Q ZW5kaW5nRm9jdXMgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fbmV3UnVsZVNlbGVjdG9yID0gbnVs bDsKICAgICAgICAgdGhpcy5fcnVsZU1lZGlhQW5kSW5oZXJ0aWNhbmNlTGlzdCA9IFtdOwogICAg ICAgICB0aGlzLl9wcm9wZXJ0eVRvU2VsZWN0QW5kSGlnaGxpZ2h0ID0gbnVsbDsKICAgICAgICAg dGhpcy5fZmlsdGVyVGV4dCA9IG51bGw7CkBAIC0xMTYsOCArMTE1LDggQEAgV0kuU3ByZWFkc2hl ZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0 YWlsc1BhbmVsIGUKIAogICAgICAgICAgICAgc2VjdGlvbi5hZGRFdmVudExpc3RlbmVyKFdJLlNw cmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uRXZlbnQuRmlsdGVyQXBwbGllZCwg dGhpcy5faGFuZGxlU2VjdGlvbkZpbHRlckFwcGxpZWQsIHRoaXMpOwogCi0gICAgICAgICAgICBp ZiAodGhpcy5faXNJbnNwZWN0b3JTZWN0aW9uUGVuZGluZ0ZvY3VzICYmIHN0eWxlLmlzSW5zcGVj dG9yUnVsZSgpKQotICAgICAgICAgICAgICAgIHRoaXMuX2luc3BlY3RvclNlY3Rpb24gPSBzZWN0 aW9uOworICAgICAgICAgICAgaWYgKHRoaXMuX25ld1J1bGVTZWxlY3RvciA9PT0gc3R5bGUuc2Vs ZWN0b3JUZXh0ICYmICFzdHlsZS5oYXNQcm9wZXJ0aWVzKCkpCisgICAgICAgICAgICAgICAgc2Vj dGlvbi5zdGFydEVkaXRpbmdSdWxlU2VsZWN0b3IoKTsKIAogICAgICAgICAgICAgdGhpcy5hZGRT dWJ2aWV3KHNlY3Rpb24pOwogICAgICAgICAgICAgc2VjdGlvbi5uZWVkc0xheW91dCgpOwpAQCAt MTI2LDYgKzEyNSw4IEBAIFdJLlNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCA9IGNs YXNzIFNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCBlCiAgICAgICAgICAgICBwcmV2 aW91c1N0eWxlID0gc3R5bGU7CiAgICAgICAgIH0KIAorICAgICAgICB0aGlzLl9uZXdSdWxlU2Vs ZWN0b3IgPSBudWxsOworCiAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmQodGhpcy5fZW1wdHlG aWx0ZXJSZXN1bHRzRWxlbWVudCk7CiAKICAgICAgICAgaWYgKHRoaXMuX2ZpbHRlclRleHQpCkBA IC0xNTcsNiArMTU4LDQzIEBAIFdJLlNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCA9 IGNsYXNzIFNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCBlCiAgICAgICAgIH0KICAg ICB9CiAKKyAgICBuZXdSdWxlQnV0dG9uQ2xpY2tlZCgpCisgICAgeworICAgICAgICBpZiAodGhp cy5ub2RlU3R5bGVzLm5vZGUuaXNJblVzZXJBZ2VudFNoYWRvd1RyZWUoKSkKKyAgICAgICAgICAg IHJldHVybjsKKworICAgICAgICB0aGlzLl9hZGROZXdSdWxlKCk7CisgICAgfQorCisgICAgbmV3 UnVsZUJ1dHRvbkNvbnRleHRNZW51KGV2ZW50KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMubm9k ZVN0eWxlcy5ub2RlLmlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVlKCkpCisgICAgICAgICAgICByZXR1 cm47CisKKyAgICAgICAgbGV0IHN0eWxlU2hlZXRzID0gV0kuY3NzU3R5bGVNYW5hZ2VyLnN0eWxl U2hlZXRzLmZpbHRlcihzdHlsZVNoZWV0ID0+IHN0eWxlU2hlZXQuaGFzSW5mbygpICYmICFzdHls ZVNoZWV0LmlzSW5saW5lU3R5bGVUYWcoKSAmJiAhc3R5bGVTaGVldC5pc0lubGluZVN0eWxlQXR0 cmlidXRlU3R5bGVTaGVldCgpKTsKKyAgICAgICAgaWYgKCFzdHlsZVNoZWV0cy5sZW5ndGgpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgbGV0IGNvbnRleHRNZW51ID0gV0kuQ29udGV4 dE1lbnUuY3JlYXRlRnJvbUV2ZW50KGV2ZW50KTsKKworICAgICAgICBjb25zdCBoYW5kbGVyID0g bnVsbDsKKyAgICAgICAgY29uc3QgZGlzYWJsZWQgPSB0cnVlOworICAgICAgICBjb250ZXh0TWVu dS5hcHBlbmRJdGVtKFdJLlVJU3RyaW5nKCJBdmFpbGFibGUgU3R5bGUgU2hlZXRzIiksIGhhbmRs ZXIsIGRpc2FibGVkKTsKKworICAgICAgICBsZXQgW2luc3BlY3RvclN0eWxlU2hlZXRzLCByZWd1 bGFyU3R5bGVTaGVldHNdID0gc3R5bGVTaGVldHMucGFydGl0aW9uKHN0eWxlU2hlZXQgPT4gc3R5 bGVTaGVldC5pc0luc3BlY3RvclN0eWxlU2hlZXQoKSk7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KGluc3BlY3RvclN0eWxlU2hlZXRzLmxlbmd0aCA8PSAxLCAiVGhlcmUgc2hvdWxkIG5ldmVyIGJl IG1vcmUgdGhhbiBvbmUgaW5zcGVjdG9yIHN0eWxlIHNoZWV0Iik7CisKKyAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kSXRlbShXSS5VSVN0cmluZygiSW5zcGVjdG9yIFN0eWxlIFNoZWV0IiksICgp ID0+IHsKKyAgICAgICAgICAgIHRoaXMuX2FkZE5ld1J1bGUoaW5zcGVjdG9yU3R5bGVTaGVldHMu bGVuZ3RoID8gaW5zcGVjdG9yU3R5bGVTaGVldHNbMF0uaWQgOiBudWxsKTsKKyAgICAgICAgfSk7 CisKKyAgICAgICAgZm9yIChsZXQgc3R5bGVTaGVldCBvZiByZWd1bGFyU3R5bGVTaGVldHMpIHsK KyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oc3R5bGVTaGVldC5kaXNwbGF5TmFt ZSwgKCkgPT4geworICAgICAgICAgICAgICAgIHRoaXMuX2FkZE5ld1J1bGUoc3R5bGVTaGVldC5p ZCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIGNzc1N0eWxlRGVj bGFyYXRpb25TZWN0aW9uU3RhcnRFZGl0aW5nTmV4dFJ1bGUoY3VycmVudFNlY3Rpb24pCiAgICAg ewogICAgICAgICBsZXQgY3VycmVudEluZGV4ID0gdGhpcy5fc2VjdGlvbnMuaW5kZXhPZihjdXJy ZW50U2VjdGlvbik7CkBAIC0yMjAsNiArMjU4LDE3IEBAIFdJLlNwcmVhZHNoZWV0UnVsZXNTdHls ZURldGFpbHNQYW5lbCA9IGNsYXNzIFNwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbCBl CiAgICAgICAgICAgICAgICAgaW5oZXJpdGVkSGVhZGVyLmNsYXNzTGlzdC5hZGQoV0kuQ1NTU3R5 bGVEZXRhaWxzU2lkZWJhclBhbmVsLk5vRmlsdGVyTWF0Y2hJblNlY3Rpb25DbGFzc05hbWUpOwog ICAgICAgICB9CiAgICAgfQorCisgICAgLy8gUHJpdmF0ZQorCisgICAgX2FkZE5ld1J1bGUoc3R5 bGVzaGVldElkKQorICAgIHsKKyAgICAgICAgY29uc3QganVzdFNlbGVjdG9yID0gdHJ1ZTsKKyAg ICAgICAgdGhpcy5fbmV3UnVsZVNlbGVjdG9yID0gdGhpcy5ub2RlU3R5bGVzLm5vZGUuYXBwcm9w cmlhdGVTZWxlY3RvckZvcihqdXN0U2VsZWN0b3IpOworCisgICAgICAgIGNvbnN0IHRleHQgPSAi IjsKKyAgICAgICAgdGhpcy5ub2RlU3R5bGVzLmFkZFJ1bGUodGhpcy5fbmV3UnVsZVNlbGVjdG9y LCB0ZXh0LCBzdHlsZXNoZWV0SWQpOworICAgIH0KIH07CiAKIFdJLlNwcmVhZHNoZWV0UnVsZXNT dHlsZURldGFpbHNQYW5lbC5SdWxlU2VjdGlvbiA9IFN5bWJvbCgicnVsZS1zZWN0aW9uIik7Cg==