182027 2018-01-23 17:11:00 -0800 REGRESSION (r226994): Web Inspector: Styles: Suggestions popover floats in top-left corner of Web Inspector after tabbing 2018-01-24 16:15:45 -0800 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 1392366 0 nvasilyev 2018-01-23 17:11:00 -0800 * STEPS TO REPRODUCE 1. Select the Elements tab 2. Show the details sidebar (⌥⌘0) 3. Select Styles 4. Scroll down to “html, body {“ 5. Click to the right of the left brace 6. Press Tab * EXPECTED RESULTS - Keyboard focus should change to next attribute * ACTUAL RESULTS - Suggestions popover opens in the top-left corner of Web Inspector <rdar://problem/36794496> 1392371 1 nvasilyev 2018-01-23 17:20:51 -0800 Broke in https://trac.webkit.org/changeset/226994/webkit :( What's happening? SpreadsheetTextField.js: _getCaretRect(prefix, completionPrefix) ... let clientRect = this._element.getBoundingClientRect(); this._element is detached from DOM. clientRect is {x: 0, y: 0, width: 0, height: 0} 1392647 2 nvasilyev 2018-01-24 11:24:45 -0800 Things I learned: this._element.addEventListener("focus", () => console.info("focused") } this._element.focus(); console.info("select text"); I expected this to be in the following order: -> select text -> focused But in fact it's this: -> focused -> select text WI.SpreadsheetTextField.prototype.startEditing: this._element.focus(); this._selectText(); this._updateCompletions(); Changing focus triggers blur and focus events. this._element may get detached from DOM by the time this._updateCompletions is called. 1392653 3 332182 nvasilyev 2018-01-24 11:47:26 -0800 Created attachment 332182 Patch 1392703 4 mattbaker 2018-01-24 13:06:10 -0800 (In reply to Nikita Vasilyev from comment #3) > Created attachment 332182 [details] > Patch This fixes the popover positioning issue, but I'm not sure why we're trying to show the completion list in the first place. Showing autocomplete every time you tab into a property name seems overkill. I noticed Chrome does not have this behavior. I expected the behavior to be: 1. Click to the right of "html, body {" => Caret moves to new blank property 2. Press tab => Blank property is removed, selection moves to next property name 1392708 5 nvasilyev 2018-01-24 13:21:52 -0800 (In reply to Matt Baker from comment #4) > (In reply to Nikita Vasilyev from comment #3) > > Created attachment 332182 [details] > > Patch > > This fixes the popover positioning issue, but I'm not sure why we're trying > to show the completion list in the first place. Showing autocomplete every > time you tab into a property name seems overkill. I noticed Chrome does not > have this behavior. > > I expected the behavior to be: > 1. Click to the right of "html, body {" > => Caret moves to new blank property > 2. Press tab > => Blank property is removed, selection moves to next property name It shows autocomplete when focusing on "margin" because it's a prefix for "margin-bottom", "margin-left", and etc. When focusing on, say, "vertical-align" it doesn't show the suggestion popover because "vertical-align" isn't a prefix for any properties. I don't have a strong opinion on whether we should only display the suggestion popover after typing. During one of the design meetings people like the current version more. 1392725 6 mattbaker 2018-01-24 13:50:58 -0800 (In reply to Nikita Vasilyev from comment #5) > I don't have a strong opinion on whether we should only display the > suggestion popover after typing. During one of the design meetings people > like the current version more. Then the people have spoken! 1392787 7 332182 mattbaker 2018-01-24 14:57:26 -0800 Comment on attachment 332182 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332182&action=review > Source/WebInspectorUI/UserInterface/Views/SpreadsheetTextField.js:381 > + if (!caretRect) { Instead of having _getCaretRect return `null` in this special case, could we just early return if this._element isn't in the DOM? The fix would better match your Changelog comment: "Don't show autocomplete popover for an element that is detached from DOM." 1392788 8 332182 mattbaker 2018-01-24 14:58:52 -0800 Comment on attachment 332182 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332182&action=review > Source/WebInspectorUI/ChangeLog:10 > + popover, resulting the popover to be displayed at the top left corner. Nit: clean up the wording here: "resulting in the popover being displayed at..." 1392803 9 332205 nvasilyev 2018-01-24 15:23:44 -0800 Created attachment 332205 Patch 1392804 10 332206 nvasilyev 2018-01-24 15:25:14 -0800 Created attachment 332206 Patch 1392808 11 332206 mattbaker 2018-01-24 15:33:35 -0800 Comment on attachment 332206 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332206&action=review r=me, with one more style comment > Source/WebInspectorUI/UserInterface/Views/SpreadsheetTextField.js:368 > + console.assert(this._element.isConnected, "_updateCompletions got called after SpreadsheetTextField was removed from the DOM"); Nit: assertion message should include a period. It can also be shortened to "SpreadsheetTextField already removed from the DOM.". The context will be evident from the console log, and in general we should avoid including function/variable names in log messages. If this code is relocated or the function name changes, someone would have to remember to update the message. 1392813 12 332209 nvasilyev 2018-01-24 15:41:13 -0800 Created attachment 332209 Patch 1392826 13 332209 commit-queue 2018-01-24 16:15:44 -0800 Comment on attachment 332209 Patch Clearing flags on attachment: 332209 Committed r227585: <https://trac.webkit.org/changeset/227585> 1392827 14 commit-queue 2018-01-24 16:15:45 -0800 All reviewed patches have been landed. Closing bug. 332182 2018-01-24 11:47:26 -0800 2018-01-24 15:23:44 -0800 Patch patch.txt text/plain 5569 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ0NDI5OTYuLjE4NTEyNzcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTAxLTI0ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyMjY5OTQp OiBXZWIgSW5zcGVjdG9yOiBTdHlsZXM6IFN1Z2dlc3Rpb25zIHBvcG92ZXIgZmxvYXRzIGluIHRv cC1sZWZ0IGNvcm5lciBvZiBXZWIgSW5zcGVjdG9yIGFmdGVyIHRhYmJpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjAyNworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHIyMjY5OTQgYWRkZWQgYSBsYXlv dXQgb2YgYWxsIHByb3BlcnRpZXMgb24gcHJvcGVydHkgcmVtb3ZhbC4gTGF5b3V0IGNhdXNlZAor ICAgICAgICBhIHByb3BlcnR5IGVsZW1lbnQgdG8gYmUgcmVtb3ZlZCBmcm9tIERPTSByaWdodCBi ZWZvcmUgZGlzbGF5aW5nIHRoZSBzdWdnZXN0aW9uCisgICAgICAgIHBvcG92ZXIsIHJlc3VsdGlu ZyB0aGUgcG9wb3ZlciB0byBiZSBkaXNwbGF5ZWQgYXQgdGhlIHRvcCBsZWZ0IGNvcm5lci4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0 aW9uRWRpdG9yLmpzOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yLnByb3RvdHlwZS5sYXlvdXQpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHls ZURlY2xhcmF0aW9uRWRpdG9yLnByb3RvdHlwZS5zcHJlYWRzaGVldFN0eWxlUHJvcGVydHlSZW1v dmVkKToKKyAgICAgICAgT25seSB1cGRhdGUgcHJvcGVydHkgdmlldyBpbmRpY2VzIHdoZW4gYSBw cm9wZXJ0eSBpcyByZW1vdmVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJl YWRzaGVldFN0eWxlUHJvcGVydHkuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFN0eWxlUHJv cGVydHkpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LnByb3RvdHlwZS5z ZXQgaW5kZXgpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRl eHRGaWVsZC5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkLnByb3RvdHlwZS5f dXBkYXRlQ29tcGxldGlvbnMpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQucHJv dG90eXBlLl9nZXRDYXJldFJlY3QpOgorICAgICAgICBEb24ndCBzaG93IGF1dG9jb21wbGV0ZSBw b3BvdmVyIGZvciBhbiBlbGVtZW50IHRoYXQgaXMgZGV0YWNoZWQgZnJvbSBET00uCisKIDIwMTgt MDEtMjIgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogU3R5bGVzIFJlZGVzaWduOiBkYXRhIGNvcnJ1cHRpb24gd2hlbiB1cGRh dGluZyB2YWx1ZXMgcXVpY2tseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRD U1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzCmluZGV4IDQ4YmNiZmEuLjRjN2U1NzEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNo ZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0 b3IuanMKQEAgLTc0LDcgKzc0LDggQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWQKICAgICAgICAg bGV0IHByb3BlcnR5Vmlld1BlbmRpbmdTdGFydEVkaXRpbmcgPSBudWxsOwogICAgICAgICBmb3Ig KGxldCBpbmRleCA9IDA7IGluZGV4IDwgcHJvcGVydGllcy5sZW5ndGg7IGluZGV4KyspIHsKICAg ICAgICAgICAgIGxldCBwcm9wZXJ0eSA9IHByb3BlcnRpZXNbaW5kZXhdOwotICAgICAgICAgICAg bGV0IHByb3BlcnR5VmlldyA9IG5ldyBXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkodGhpcywg cHJvcGVydHksIGluZGV4KTsKKyAgICAgICAgICAgIGxldCBwcm9wZXJ0eVZpZXcgPSBuZXcgV0ku U3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5KHRoaXMsIHByb3BlcnR5KTsKKyAgICAgICAgICAgIHBy b3BlcnR5Vmlldy5pbmRleCA9IGluZGV4OwogICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZChwcm9wZXJ0eVZpZXcuZWxlbWVudCk7CiAgICAgICAgICAgICB0aGlzLl9wcm9wZXJ0eVZpZXdz LnB1c2gocHJvcGVydHlWaWV3KTsKIApAQCAtMjU2LDcgKzI1Nyw5IEBAIFdJLlNwcmVhZHNoZWV0 Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvciA9IGNsYXNzIFNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNs YXJhdGlvbkVkCiAgICAgc3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5UmVtb3ZlZChwcm9wZXJ0eVZp ZXcpCiAgICAgewogICAgICAgICB0aGlzLl9wcm9wZXJ0eVZpZXdzLnJlbW92ZShwcm9wZXJ0eVZp ZXcpOwotICAgICAgICB0aGlzLnVwZGF0ZUxheW91dCgpOworCisgICAgICAgIGZvciAobGV0IGlu ZGV4ID0gMDsgaW5kZXggPCB0aGlzLl9wcm9wZXJ0eVZpZXdzLmxlbmd0aDsgaW5kZXgrKykKKyAg ICAgICAgICAgIHRoaXMuX3Byb3BlcnR5Vmlld3NbaW5kZXhdLmluZGV4ID0gaW5kZXg7CiAgICAg fQogCiAgICAgc3R5bGVQcm9wZXJ0eUlubGluZVN3YXRjaEFjdGl2YXRlZCgpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0 eWxlUHJvcGVydHkuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKaW5kZXggMDlmOGM4My4uYTNjNWE4MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFk c2hlZXRTdHlsZVByb3BlcnR5LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcwpAQCAtMjUsNyArMjUsNyBA QAogCiBXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkgPSBjbGFzcyBTcHJlYWRzaGVldFN0eWxl UHJvcGVydHkgZXh0ZW5kcyBXSS5PYmplY3QKIHsKLSAgICBjb25zdHJ1Y3RvcihkZWxlZ2F0ZSwg cHJvcGVydHksIGluZGV4KQorICAgIGNvbnN0cnVjdG9yKGRlbGVnYXRlLCBwcm9wZXJ0eSkKICAg ICB7CiAgICAgICAgIHN1cGVyKCk7CiAKQEAgLTM0LDcgKzM0LDYgQEAgV0kuU3ByZWFkc2hlZXRT dHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5IGV4dGVuZHMgV0ku T2JqZWN0CiAgICAgICAgIHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGUgfHwgbnVsbDsKICAgICAg ICAgdGhpcy5fcHJvcGVydHkgPSBwcm9wZXJ0eTsKICAgICAgICAgdGhpcy5fZWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICB0aGlzLl9lbGVtZW50LmRhdGFz ZXQucHJvcGVydHlJbmRleCA9IGluZGV4OwogCiAgICAgICAgIHRoaXMuX2NvbnRlbnRFbGVtZW50 ID0gbnVsbDsKICAgICAgICAgdGhpcy5fbmFtZUVsZW1lbnQgPSBudWxsOwpAQCAtNTksNiArNTgs MTEgQEAgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFkc2hlZXRTdHls ZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgZ2V0IHZhbHVlVGV4dEZpZWxkKCkgeyBy ZXR1cm4gdGhpcy5fdmFsdWVUZXh0RmllbGQ7IH0KICAgICBnZXQgZW5hYmxlZCgpIHsgcmV0dXJu IHRoaXMuX3Byb3BlcnR5LmVuYWJsZWQ7IH0KIAorICAgIHNldCBpbmRleChpbmRleCkKKyAgICB7 CisgICAgICAgIHRoaXMuX2VsZW1lbnQuZGF0YXNldC5wcm9wZXJ0eUluZGV4ID0gaW5kZXg7Cisg ICAgfQorCiAgICAgZGV0YWNoZWQoKQogICAgIHsKICAgICAgICAgdGhpcy5fcHJvcGVydHkuX19w cm9wZXJ0eVZpZXcgPSBudWxsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcwppbmRl eCA3NGVkNzc1Li5kYjJhY2E3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcwpA QCAtMzc4LDYgKzM3OCwxMiBAQCBXSS5TcHJlYWRzaGVldFRleHRGaWVsZCA9IGNsYXNzIFNwcmVh ZHNoZWV0VGV4dEZpZWxkCiAgICAgICAgICAgICB0aGlzLl9zdWdnZXN0aW9uc1ZpZXcuaGlkZSgp OwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgbGV0IGNhcmV0UmVjdCA9IHRoaXMuX2dl dENhcmV0UmVjdChwcmVmaXgsIGNvbXBsZXRpb25QcmVmaXgpOworICAgICAgICAgICAgaWYgKCFj YXJldFJlY3QpIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKCJDYW4ndCBzaG93IHN1 Z2dlc3Rpb24gdmlldyBmb3IgYSBkZXRhY2hlZCBmcm9tIERPTSBlbGVtZW50OiIsIHRoaXMuX2Vs ZW1lbnQpOworICAgICAgICAgICAgICAgIHRoaXMuX3N1Z2dlc3Rpb25zVmlldy5oaWRlKCk7Cisg ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICB0aGlz Ll9zdWdnZXN0aW9uc1ZpZXcuc2hvdyhjYXJldFJlY3QpOwogICAgICAgICB9CiAKQEAgLTQwMiw2 ICs0MDgsOSBAQCBXSS5TcHJlYWRzaGVldFRleHRGaWVsZCA9IGNsYXNzIFNwcmVhZHNoZWV0VGV4 dEZpZWxkCiAgICAgICAgIH0KIAogICAgICAgICBsZXQgY2xpZW50UmVjdCA9IHRoaXMuX2VsZW1l bnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgICAgIGlmIChjbGllbnRSZWN0LmxlZnQg PT09IDAgJiYgY2xpZW50UmVjdC50b3AgPT09IDApCisgICAgICAgICAgICByZXR1cm4gbnVsbDsK KwogICAgICAgICBjb25zdCBsZWZ0UGFkZGluZyA9IHBhcnNlSW50KGdldENvbXB1dGVkU3R5bGUo dGhpcy5fZWxlbWVudCkucGFkZGluZ0xlZnQpIHx8IDA7CiAgICAgICAgIHJldHVybiBuZXcgV0ku UmVjdChjbGllbnRSZWN0LmxlZnQgKyBsZWZ0UGFkZGluZywgY2xpZW50UmVjdC50b3AsIGNsaWVu dFJlY3Qud2lkdGgsIGNsaWVudFJlY3QuaGVpZ2h0KTsKICAgICB9Cg== 332205 2018-01-24 15:23:44 -0800 2018-01-24 15:25:14 -0800 Patch patch.txt text/plain 5329 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ0NDI5OTYuLmU5NDFlNjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTAxLTI0ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyMjY5OTQp OiBXZWIgSW5zcGVjdG9yOiBTdHlsZXM6IFN1Z2dlc3Rpb25zIHBvcG92ZXIgZmxvYXRzIGluIHRv cC1sZWZ0IGNvcm5lciBvZiBXZWIgSW5zcGVjdG9yIGFmdGVyIHRhYmJpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjAyNworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHIyMjY5OTQgYWRkZWQgYSBsYXlv dXQgb2YgYWxsIHByb3BlcnRpZXMgb24gcHJvcGVydHkgcmVtb3ZhbC4gTGF5b3V0IGNhdXNlZAor ICAgICAgICBhIHByb3BlcnR5IGVsZW1lbnQgdG8gYmUgcmVtb3ZlZCBmcm9tIERPTSByaWdodCBi ZWZvcmUgZGlzbGF5aW5nIHRoZSBzdWdnZXN0aW9uCisgICAgICAgIHBvcG92ZXIsIHJlc3VsdGlu ZyB0aGUgcG9wb3ZlciB0byBiZSBkaXNwbGF5ZWQgYXQgdGhlIHRvcCBsZWZ0IGNvcm5lci4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0 aW9uRWRpdG9yLmpzOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yLnByb3RvdHlwZS5sYXlvdXQpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHls ZURlY2xhcmF0aW9uRWRpdG9yLnByb3RvdHlwZS5zcHJlYWRzaGVldFN0eWxlUHJvcGVydHlSZW1v dmVkKToKKyAgICAgICAgT25seSB1cGRhdGUgcHJvcGVydHkgdmlldyBpbmRpY2VzIHdoZW4gYSBw cm9wZXJ0eSBpcyByZW1vdmVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJl YWRzaGVldFN0eWxlUHJvcGVydHkuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFN0eWxlUHJv cGVydHkpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LnByb3RvdHlwZS5z ZXQgaW5kZXgpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRl eHRGaWVsZC5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkLnByb3RvdHlwZS5f dXBkYXRlQ29tcGxldGlvbnMpOgorICAgICAgICBDaGVja2luZyB0aGlzLl9lbGVtZW50LnBhcmVu dE5vZGUgdG8gc2VlIGlmIHRoZSBlbGVtZW50IGlzIGF0dGFjaGVkIHRvIHRoZSBET00gdHJlZSBp cyB1bnJlbGlhYmxlLAorICAgICAgICBzaW5jZSB0aGUgZWxlbWVudCBtYXkgaGF2ZSBhIG5vbi1u dWxsIHBhcmVudCBub2RlIHdoaWNoIGlzIGRldGFjaGVkIGZyb20gdGhlIERPTSB0cmVlLiBUbyBm aXggdGhhdCwKKyAgICAgICAgd2UgY291bGQgdHJhdmVyc2UgZWxlbWVudCdzIGFuY2VzdG9ycywg YnV0IEkgdXNlZCBhIGNvbmNpc2UgaXNDb25uZWN0ZWQgcHJvcGVydHkgaW5zdGVhZC4KKwogMjAx OC0wMS0yMiAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBTdHlsZXMgUmVkZXNpZ246IGRhdGEgY29ycnVwdGlvbiB3aGVuIHVw ZGF0aW5nIHZhbHVlcyBxdWlja2x5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3Iu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVl dENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanMKaW5kZXggNDhiY2JmYS4uNGM3ZTU3MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFk c2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVk aXRvci5qcwpAQCAtNzQsNyArNzQsOCBAQCBXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRp b25FZGl0b3IgPSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZAogICAgICAg ICBsZXQgcHJvcGVydHlWaWV3UGVuZGluZ1N0YXJ0RWRpdGluZyA9IG51bGw7CiAgICAgICAgIGZv ciAobGV0IGluZGV4ID0gMDsgaW5kZXggPCBwcm9wZXJ0aWVzLmxlbmd0aDsgaW5kZXgrKykgewog ICAgICAgICAgICAgbGV0IHByb3BlcnR5ID0gcHJvcGVydGllc1tpbmRleF07Ci0gICAgICAgICAg ICBsZXQgcHJvcGVydHlWaWV3ID0gbmV3IFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSh0aGlz LCBwcm9wZXJ0eSwgaW5kZXgpOworICAgICAgICAgICAgbGV0IHByb3BlcnR5VmlldyA9IG5ldyBX SS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkodGhpcywgcHJvcGVydHkpOworICAgICAgICAgICAg cHJvcGVydHlWaWV3LmluZGV4ID0gaW5kZXg7CiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYXBw ZW5kKHByb3BlcnR5Vmlldy5lbGVtZW50KTsKICAgICAgICAgICAgIHRoaXMuX3Byb3BlcnR5Vmll d3MucHVzaChwcm9wZXJ0eVZpZXcpOwogCkBAIC0yNTYsNyArMjU3LDkgQEAgV0kuU3ByZWFkc2hl ZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHlsZURl Y2xhcmF0aW9uRWQKICAgICBzcHJlYWRzaGVldFN0eWxlUHJvcGVydHlSZW1vdmVkKHByb3BlcnR5 VmlldykKICAgICB7CiAgICAgICAgIHRoaXMuX3Byb3BlcnR5Vmlld3MucmVtb3ZlKHByb3BlcnR5 Vmlldyk7Ci0gICAgICAgIHRoaXMudXBkYXRlTGF5b3V0KCk7CisKKyAgICAgICAgZm9yIChsZXQg aW5kZXggPSAwOyBpbmRleCA8IHRoaXMuX3Byb3BlcnR5Vmlld3MubGVuZ3RoOyBpbmRleCsrKQor ICAgICAgICAgICAgdGhpcy5fcHJvcGVydHlWaWV3c1tpbmRleF0uaW5kZXggPSBpbmRleDsKICAg ICB9CiAKICAgICBzdHlsZVByb3BlcnR5SW5saW5lU3dhdGNoQWN0aXZhdGVkKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0 U3R5bGVQcm9wZXJ0eS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcwppbmRleCAwOWY4YzgzLi5hM2M1YTgzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJl YWRzaGVldFN0eWxlUHJvcGVydHkuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzCkBAIC0yNSw3ICsyNSw3 IEBACiAKIFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSA9IGNsYXNzIFNwcmVhZHNoZWV0U3R5 bGVQcm9wZXJ0eSBleHRlbmRzIFdJLk9iamVjdAogewotICAgIGNvbnN0cnVjdG9yKGRlbGVnYXRl LCBwcm9wZXJ0eSwgaW5kZXgpCisgICAgY29uc3RydWN0b3IoZGVsZWdhdGUsIHByb3BlcnR5KQog ICAgIHsKICAgICAgICAgc3VwZXIoKTsKIApAQCAtMzQsNyArMzQsNiBAQCBXSS5TcHJlYWRzaGVl dFN0eWxlUHJvcGVydHkgPSBjbGFzcyBTcHJlYWRzaGVldFN0eWxlUHJvcGVydHkgZXh0ZW5kcyBX SS5PYmplY3QKICAgICAgICAgdGhpcy5fZGVsZWdhdGUgPSBkZWxlZ2F0ZSB8fCBudWxsOwogICAg ICAgICB0aGlzLl9wcm9wZXJ0eSA9IHByb3BlcnR5OwogICAgICAgICB0aGlzLl9lbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIHRoaXMuX2VsZW1lbnQuZGF0 YXNldC5wcm9wZXJ0eUluZGV4ID0gaW5kZXg7CiAKICAgICAgICAgdGhpcy5fY29udGVudEVsZW1l bnQgPSBudWxsOwogICAgICAgICB0aGlzLl9uYW1lRWxlbWVudCA9IG51bGw7CkBAIC01OSw2ICs1 OCwxMSBAQCBXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkgPSBjbGFzcyBTcHJlYWRzaGVldFN0 eWxlUHJvcGVydHkgZXh0ZW5kcyBXSS5PYmplY3QKICAgICBnZXQgdmFsdWVUZXh0RmllbGQoKSB7 IHJldHVybiB0aGlzLl92YWx1ZVRleHRGaWVsZDsgfQogICAgIGdldCBlbmFibGVkKCkgeyByZXR1 cm4gdGhpcy5fcHJvcGVydHkuZW5hYmxlZDsgfQogCisgICAgc2V0IGluZGV4KGluZGV4KQorICAg IHsKKyAgICAgICAgdGhpcy5fZWxlbWVudC5kYXRhc2V0LnByb3BlcnR5SW5kZXggPSBpbmRleDsK KyAgICB9CisKICAgICBkZXRhY2hlZCgpCiAgICAgewogICAgICAgICB0aGlzLl9wcm9wZXJ0eS5f X3Byb3BlcnR5VmlldyA9IG51bGw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0VGV4dEZpZWxkLmpzCmlu ZGV4IDc0ZWQ3NzUuLmFhOTZjNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0VGV4dEZpZWxkLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0VGV4dEZpZWxkLmpz CkBAIC0zNjUsOCArMzY1LDggQEAgV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQgPSBjbGFzcyBTcHJl YWRzaGVldFRleHRGaWVsZAogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAg ICAgY29uc29sZS5hc3NlcnQodGhpcy5fZWxlbWVudC5wYXJlbnROb2RlLCAiX3VwZGF0ZUNvbXBs ZXRpb25zIGdvdCBjYWxsZWQgYWZ0ZXIgU3ByZWFkc2hlZXRUZXh0RmllbGQgd2FzIHJlbW92ZWQg ZnJvbSB0aGUgRE9NIik7Ci0gICAgICAgIGlmICghdGhpcy5fZWxlbWVudC5wYXJlbnROb2RlKSB7 CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX2VsZW1lbnQuaXNDb25uZWN0ZWQsICJfdXBk YXRlQ29tcGxldGlvbnMgZ290IGNhbGxlZCBhZnRlciBTcHJlYWRzaGVldFRleHRGaWVsZCB3YXMg cmVtb3ZlZCBmcm9tIHRoZSBET00iKTsKKyAgICAgICAgaWYgKCF0aGlzLl9lbGVtZW50LmlzQ29u bmVjdGVkKSB7CiAgICAgICAgICAgICB0aGlzLl9zdWdnZXN0aW9uc1ZpZXcuaGlkZSgpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Cg== 332206 2018-01-24 15:25:14 -0800 2018-01-24 15:41:13 -0800 Patch patch.txt text/plain 5331 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ0NDI5OTYuLmM5NmNiMTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTAxLTI0ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyMjY5OTQp OiBXZWIgSW5zcGVjdG9yOiBTdHlsZXM6IFN1Z2dlc3Rpb25zIHBvcG92ZXIgZmxvYXRzIGluIHRv cC1sZWZ0IGNvcm5lciBvZiBXZWIgSW5zcGVjdG9yIGFmdGVyIHRhYmJpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjAyNworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHIyMjY5OTQgYWRkZWQgYSBsYXlv dXQgb2YgYWxsIHByb3BlcnRpZXMgb24gcHJvcGVydHkgcmVtb3ZhbC4gTGF5b3V0IGNhdXNlZAor ICAgICAgICBhIHByb3BlcnR5IGVsZW1lbnQgdG8gYmUgcmVtb3ZlZCBmcm9tIERPTSByaWdodCBi ZWZvcmUgZGlzbGF5aW5nIHRoZSBzdWdnZXN0aW9uCisgICAgICAgIHBvcG92ZXIsIHJlc3VsdGlu ZyBpbiB0aGUgcG9wb3ZlciBiZWluZyBkaXNwbGF5ZWQgYXQgdGhlIHRvcCBsZWZ0IGNvcm5lci4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xh cmF0aW9uRWRpdG9yLmpzOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0 aW9uRWRpdG9yLnByb3RvdHlwZS5sYXlvdXQpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NT dHlsZURlY2xhcmF0aW9uRWRpdG9yLnByb3RvdHlwZS5zcHJlYWRzaGVldFN0eWxlUHJvcGVydHlS ZW1vdmVkKToKKyAgICAgICAgT25seSB1cGRhdGUgcHJvcGVydHkgdmlldyBpbmRpY2VzIHdoZW4g YSBwcm9wZXJ0eSBpcyByZW1vdmVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9T cHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFN0eWxl UHJvcGVydHkpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LnByb3RvdHlw ZS5zZXQgaW5kZXgpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVl dFRleHRGaWVsZC5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkLnByb3RvdHlw ZS5fdXBkYXRlQ29tcGxldGlvbnMpOgorICAgICAgICBDaGVja2luZyB0aGlzLl9lbGVtZW50LnBh cmVudE5vZGUgdG8gc2VlIGlmIHRoZSBlbGVtZW50IGlzIGF0dGFjaGVkIHRvIHRoZSBET00gdHJl ZSBpcyB1bnJlbGlhYmxlLAorICAgICAgICBzaW5jZSB0aGUgZWxlbWVudCBtYXkgaGF2ZSBhIG5v bi1udWxsIHBhcmVudCBub2RlIHRoYXQgaXMgZGV0YWNoZWQgZnJvbSB0aGUgRE9NIHRyZWUuIFRv IGZpeCB0aGF0LAorICAgICAgICB3ZSBjb3VsZCB0cmF2ZXJzZSBlbGVtZW50J3MgYW5jZXN0b3Jz LCBidXQgSSB1c2VkIGEgY29uY2lzZSBpc0Nvbm5lY3RlZCBwcm9wZXJ0eSBpbnN0ZWFkLgorCiAy MDE4LTAxLTIyICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFN0eWxlcyBSZWRlc2lnbjogZGF0YSBjb3JydXB0aW9uIHdoZW4g dXBkYXRpbmcgdmFsdWVzIHF1aWNrbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRv ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNo ZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5qcwppbmRleCA0OGJjYmZhLi40YzdlNTcxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJl YWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yLmpzCkBAIC03NCw3ICs3NCw4IEBAIFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJh dGlvbkVkaXRvciA9IGNsYXNzIFNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkCiAgICAg ICAgIGxldCBwcm9wZXJ0eVZpZXdQZW5kaW5nU3RhcnRFZGl0aW5nID0gbnVsbDsKICAgICAgICAg Zm9yIChsZXQgaW5kZXggPSAwOyBpbmRleCA8IHByb3BlcnRpZXMubGVuZ3RoOyBpbmRleCsrKSB7 CiAgICAgICAgICAgICBsZXQgcHJvcGVydHkgPSBwcm9wZXJ0aWVzW2luZGV4XTsKLSAgICAgICAg ICAgIGxldCBwcm9wZXJ0eVZpZXcgPSBuZXcgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5KHRo aXMsIHByb3BlcnR5LCBpbmRleCk7CisgICAgICAgICAgICBsZXQgcHJvcGVydHlWaWV3ID0gbmV3 IFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSh0aGlzLCBwcm9wZXJ0eSk7CisgICAgICAgICAg ICBwcm9wZXJ0eVZpZXcuaW5kZXggPSBpbmRleDsKICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5h cHBlbmQocHJvcGVydHlWaWV3LmVsZW1lbnQpOwogICAgICAgICAgICAgdGhpcy5fcHJvcGVydHlW aWV3cy5wdXNoKHByb3BlcnR5Vmlldyk7CiAKQEAgLTI1Niw3ICsyNTcsOSBAQCBXSS5TcHJlYWRz aGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IgPSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxl RGVjbGFyYXRpb25FZAogICAgIHNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eVJlbW92ZWQocHJvcGVy dHlWaWV3KQogICAgIHsKICAgICAgICAgdGhpcy5fcHJvcGVydHlWaWV3cy5yZW1vdmUocHJvcGVy dHlWaWV3KTsKLSAgICAgICAgdGhpcy51cGRhdGVMYXlvdXQoKTsKKworICAgICAgICBmb3IgKGxl dCBpbmRleCA9IDA7IGluZGV4IDwgdGhpcy5fcHJvcGVydHlWaWV3cy5sZW5ndGg7IGluZGV4Kysp CisgICAgICAgICAgICB0aGlzLl9wcm9wZXJ0eVZpZXdzW2luZGV4XS5pbmRleCA9IGluZGV4Owog ICAgIH0KIAogICAgIHN0eWxlUHJvcGVydHlJbmxpbmVTd2F0Y2hBY3RpdmF0ZWQoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hl ZXRTdHlsZVByb3BlcnR5LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzCmluZGV4IDA5ZjhjODMuLmEzYzVhODMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nw cmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKQEAgLTI1LDcgKzI1 LDcgQEAKIAogV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFkc2hlZXRT dHlsZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiB7Ci0gICAgY29uc3RydWN0b3IoZGVsZWdh dGUsIHByb3BlcnR5LCBpbmRleCkKKyAgICBjb25zdHJ1Y3RvcihkZWxlZ2F0ZSwgcHJvcGVydHkp CiAgICAgewogICAgICAgICBzdXBlcigpOwogCkBAIC0zNCw3ICszNCw2IEBAIFdJLlNwcmVhZHNo ZWV0U3R5bGVQcm9wZXJ0eSA9IGNsYXNzIFNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSBleHRlbmRz IFdJLk9iamVjdAogICAgICAgICB0aGlzLl9kZWxlZ2F0ZSA9IGRlbGVnYXRlIHx8IG51bGw7CiAg ICAgICAgIHRoaXMuX3Byb3BlcnR5ID0gcHJvcGVydHk7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgdGhpcy5fZWxlbWVudC5k YXRhc2V0LnByb3BlcnR5SW5kZXggPSBpbmRleDsKIAogICAgICAgICB0aGlzLl9jb250ZW50RWxl bWVudCA9IG51bGw7CiAgICAgICAgIHRoaXMuX25hbWVFbGVtZW50ID0gbnVsbDsKQEAgLTU5LDYg KzU4LDExIEBAIFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eSA9IGNsYXNzIFNwcmVhZHNoZWV0 U3R5bGVQcm9wZXJ0eSBleHRlbmRzIFdJLk9iamVjdAogICAgIGdldCB2YWx1ZVRleHRGaWVsZCgp IHsgcmV0dXJuIHRoaXMuX3ZhbHVlVGV4dEZpZWxkOyB9CiAgICAgZ2V0IGVuYWJsZWQoKSB7IHJl dHVybiB0aGlzLl9wcm9wZXJ0eS5lbmFibGVkOyB9CiAKKyAgICBzZXQgaW5kZXgoaW5kZXgpCisg ICAgeworICAgICAgICB0aGlzLl9lbGVtZW50LmRhdGFzZXQucHJvcGVydHlJbmRleCA9IGluZGV4 OworICAgIH0KKwogICAgIGRldGFjaGVkKCkKICAgICB7CiAgICAgICAgIHRoaXMuX3Byb3BlcnR5 Ll9fcHJvcGVydHlWaWV3ID0gbnVsbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0VGV4dEZpZWxkLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMK aW5kZXggNzRlZDc3NS4uYWE5NmM1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQu anMKQEAgLTM2NSw4ICszNjUsOCBAQCBXSS5TcHJlYWRzaGVldFRleHRGaWVsZCA9IGNsYXNzIFNw cmVhZHNoZWV0VGV4dEZpZWxkCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAg ICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9lbGVtZW50LnBhcmVudE5vZGUsICJfdXBkYXRlQ29t cGxldGlvbnMgZ290IGNhbGxlZCBhZnRlciBTcHJlYWRzaGVldFRleHRGaWVsZCB3YXMgcmVtb3Zl ZCBmcm9tIHRoZSBET00iKTsKLSAgICAgICAgaWYgKCF0aGlzLl9lbGVtZW50LnBhcmVudE5vZGUp IHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fZWxlbWVudC5pc0Nvbm5lY3RlZCwgIl91 cGRhdGVDb21wbGV0aW9ucyBnb3QgY2FsbGVkIGFmdGVyIFNwcmVhZHNoZWV0VGV4dEZpZWxkIHdh cyByZW1vdmVkIGZyb20gdGhlIERPTSIpOworICAgICAgICBpZiAoIXRoaXMuX2VsZW1lbnQuaXND b25uZWN0ZWQpIHsKICAgICAgICAgICAgIHRoaXMuX3N1Z2dlc3Rpb25zVmlldy5oaWRlKCk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0K 332209 2018-01-24 15:41:13 -0800 2018-01-24 16:15:44 -0800 Patch patch.txt text/plain 5296 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ0NDI5OTYuLjdiNDQ2ZmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTAxLTI0ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyMjY5OTQp OiBXZWIgSW5zcGVjdG9yOiBTdHlsZXM6IFN1Z2dlc3Rpb25zIHBvcG92ZXIgZmxvYXRzIGluIHRv cC1sZWZ0IGNvcm5lciBvZiBXZWIgSW5zcGVjdG9yIGFmdGVyIHRhYmJpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjAyNworCisgICAgICAgIFJl dmlld2VkIGJ5IE1hdHQgQmFrZXIuCisKKyAgICAgICAgcjIyNjk5NCBhZGRlZCBhIGxheW91dCBv ZiBhbGwgcHJvcGVydGllcyBvbiBwcm9wZXJ0eSByZW1vdmFsLiBMYXlvdXQgY2F1c2VkCisgICAg ICAgIGEgcHJvcGVydHkgZWxlbWVudCB0byBiZSByZW1vdmVkIGZyb20gRE9NIHJpZ2h0IGJlZm9y ZSBkaXNsYXlpbmcgdGhlIHN1Z2dlc3Rpb24KKyAgICAgICAgcG9wb3ZlciwgcmVzdWx0aW5nIGlu IHRoZSBwb3BvdmVyIGJlaW5nIGRpc3BsYXllZCBhdCB0aGUgdG9wIGxlZnQgY29ybmVyLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRp b25FZGl0b3IuanM6CisgICAgICAgIChXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25F ZGl0b3IucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgIChXSS5TcHJlYWRzaGVldENTU1N0eWxl RGVjbGFyYXRpb25FZGl0b3IucHJvdG90eXBlLnNwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eVJlbW92 ZWQpOgorICAgICAgICBPbmx5IHVwZGF0ZSBwcm9wZXJ0eSB2aWV3IGluZGljZXMgd2hlbiBhIHBy b3BlcnR5IGlzIHJlbW92ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVh ZHNoZWV0U3R5bGVQcm9wZXJ0eS5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0U3R5bGVQcm9w ZXJ0eSk6CisgICAgICAgIChXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkucHJvdG90eXBlLnNl dCBpbmRleCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0VGV4 dEZpZWxkLmpzOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRUZXh0RmllbGQucHJvdG90eXBlLl91 cGRhdGVDb21wbGV0aW9ucyk6CisgICAgICAgIENoZWNraW5nIHRoaXMuX2VsZW1lbnQucGFyZW50 Tm9kZSB0byBzZWUgaWYgdGhlIGVsZW1lbnQgaXMgYXR0YWNoZWQgdG8gdGhlIERPTSB0cmVlIGlz IHVucmVsaWFibGUsCisgICAgICAgIHNpbmNlIHRoZSBlbGVtZW50IG1heSBoYXZlIGEgbm9uLW51 bGwgcGFyZW50IG5vZGUgdGhhdCBpcyBkZXRhY2hlZCBmcm9tIHRoZSBET00gdHJlZS4gVG8gZml4 IHRoYXQsCisgICAgICAgIHdlIGNvdWxkIHRyYXZlcnNlIGVsZW1lbnQncyBhbmNlc3RvcnMsIGJ1 dCBJIHVzZWQgYSBjb25jaXNlIGlzQ29ubmVjdGVkIHByb3BlcnR5IGluc3RlYWQuCisKIDIwMTgt MDEtMjIgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogU3R5bGVzIFJlZGVzaWduOiBkYXRhIGNvcnJ1cHRpb24gd2hlbiB1cGRh dGluZyB2YWx1ZXMgcXVpY2tseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRD U1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzCmluZGV4IDQ4YmNiZmEuLjRjN2U1NzEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNo ZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0 b3IuanMKQEAgLTc0LDcgKzc0LDggQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWQKICAgICAgICAg bGV0IHByb3BlcnR5Vmlld1BlbmRpbmdTdGFydEVkaXRpbmcgPSBudWxsOwogICAgICAgICBmb3Ig KGxldCBpbmRleCA9IDA7IGluZGV4IDwgcHJvcGVydGllcy5sZW5ndGg7IGluZGV4KyspIHsKICAg ICAgICAgICAgIGxldCBwcm9wZXJ0eSA9IHByb3BlcnRpZXNbaW5kZXhdOwotICAgICAgICAgICAg bGV0IHByb3BlcnR5VmlldyA9IG5ldyBXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkodGhpcywg cHJvcGVydHksIGluZGV4KTsKKyAgICAgICAgICAgIGxldCBwcm9wZXJ0eVZpZXcgPSBuZXcgV0ku U3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5KHRoaXMsIHByb3BlcnR5KTsKKyAgICAgICAgICAgIHBy b3BlcnR5Vmlldy5pbmRleCA9IGluZGV4OwogICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZChwcm9wZXJ0eVZpZXcuZWxlbWVudCk7CiAgICAgICAgICAgICB0aGlzLl9wcm9wZXJ0eVZpZXdz LnB1c2gocHJvcGVydHlWaWV3KTsKIApAQCAtMjU2LDcgKzI1Nyw5IEBAIFdJLlNwcmVhZHNoZWV0 Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvciA9IGNsYXNzIFNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNs YXJhdGlvbkVkCiAgICAgc3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5UmVtb3ZlZChwcm9wZXJ0eVZp ZXcpCiAgICAgewogICAgICAgICB0aGlzLl9wcm9wZXJ0eVZpZXdzLnJlbW92ZShwcm9wZXJ0eVZp ZXcpOwotICAgICAgICB0aGlzLnVwZGF0ZUxheW91dCgpOworCisgICAgICAgIGZvciAobGV0IGlu ZGV4ID0gMDsgaW5kZXggPCB0aGlzLl9wcm9wZXJ0eVZpZXdzLmxlbmd0aDsgaW5kZXgrKykKKyAg ICAgICAgICAgIHRoaXMuX3Byb3BlcnR5Vmlld3NbaW5kZXhdLmluZGV4ID0gaW5kZXg7CiAgICAg fQogCiAgICAgc3R5bGVQcm9wZXJ0eUlubGluZVN3YXRjaEFjdGl2YXRlZCgpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFN0 eWxlUHJvcGVydHkuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKaW5kZXggMDlmOGM4My4uYTNjNWE4MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFk c2hlZXRTdHlsZVByb3BlcnR5LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcwpAQCAtMjUsNyArMjUsNyBA QAogCiBXSS5TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkgPSBjbGFzcyBTcHJlYWRzaGVldFN0eWxl UHJvcGVydHkgZXh0ZW5kcyBXSS5PYmplY3QKIHsKLSAgICBjb25zdHJ1Y3RvcihkZWxlZ2F0ZSwg cHJvcGVydHksIGluZGV4KQorICAgIGNvbnN0cnVjdG9yKGRlbGVnYXRlLCBwcm9wZXJ0eSkKICAg ICB7CiAgICAgICAgIHN1cGVyKCk7CiAKQEAgLTM0LDcgKzM0LDYgQEAgV0kuU3ByZWFkc2hlZXRT dHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5IGV4dGVuZHMgV0ku T2JqZWN0CiAgICAgICAgIHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGUgfHwgbnVsbDsKICAgICAg ICAgdGhpcy5fcHJvcGVydHkgPSBwcm9wZXJ0eTsKICAgICAgICAgdGhpcy5fZWxlbWVudCA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICB0aGlzLl9lbGVtZW50LmRhdGFz ZXQucHJvcGVydHlJbmRleCA9IGluZGV4OwogCiAgICAgICAgIHRoaXMuX2NvbnRlbnRFbGVtZW50 ID0gbnVsbDsKICAgICAgICAgdGhpcy5fbmFtZUVsZW1lbnQgPSBudWxsOwpAQCAtNTksNiArNTgs MTEgQEAgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFkc2hlZXRTdHls ZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgZ2V0IHZhbHVlVGV4dEZpZWxkKCkgeyBy ZXR1cm4gdGhpcy5fdmFsdWVUZXh0RmllbGQ7IH0KICAgICBnZXQgZW5hYmxlZCgpIHsgcmV0dXJu IHRoaXMuX3Byb3BlcnR5LmVuYWJsZWQ7IH0KIAorICAgIHNldCBpbmRleChpbmRleCkKKyAgICB7 CisgICAgICAgIHRoaXMuX2VsZW1lbnQuZGF0YXNldC5wcm9wZXJ0eUluZGV4ID0gaW5kZXg7Cisg ICAgfQorCiAgICAgZGV0YWNoZWQoKQogICAgIHsKICAgICAgICAgdGhpcy5fcHJvcGVydHkuX19w cm9wZXJ0eVZpZXcgPSBudWxsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRUZXh0RmllbGQuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcwppbmRl eCA3NGVkNzc1Li5lYTE1ZTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldFRleHRGaWVsZC5qcwpA QCAtMzY1LDggKzM2NSw4IEBAIFdJLlNwcmVhZHNoZWV0VGV4dEZpZWxkID0gY2xhc3MgU3ByZWFk c2hlZXRUZXh0RmllbGQKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAg IGNvbnNvbGUuYXNzZXJ0KHRoaXMuX2VsZW1lbnQucGFyZW50Tm9kZSwgIl91cGRhdGVDb21wbGV0 aW9ucyBnb3QgY2FsbGVkIGFmdGVyIFNwcmVhZHNoZWV0VGV4dEZpZWxkIHdhcyByZW1vdmVkIGZy b20gdGhlIERPTSIpOwotICAgICAgICBpZiAoIXRoaXMuX2VsZW1lbnQucGFyZW50Tm9kZSkgewor ICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9lbGVtZW50LmlzQ29ubmVjdGVkLCAiU3ByZWFk c2hlZXRUZXh0RmllbGQgYWxyZWFkeSByZW1vdmVkIGZyb20gdGhlIERPTS4iKTsKKyAgICAgICAg aWYgKCF0aGlzLl9lbGVtZW50LmlzQ29ubmVjdGVkKSB7CiAgICAgICAgICAgICB0aGlzLl9zdWdn ZXN0aW9uc1ZpZXcuaGlkZSgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Cg==