201571 2019-09-06 18:40:47 -0700 Web Inspector: Styles: for rules that don't match selected node, property values always show as invalid 2019-10-02 14:54:49 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev commit-queue hi inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1568792 0 378260 nvasilyev 2019-09-06 18:40:47 -0700 Created attachment 378260 Reduction Steps To Reproduce: 1. Inspect attached reduction.html 2. In the style sidebar, hit the + to add a new selector 3. Type “iframe” as the selector 4. Add “outline: 2px solid orange;” Results: Rule is marked as invalid, but applies. <rdar://problem/54530335> 1568795 1 378262 nvasilyev 2019-09-06 18:48:19 -0700 Created attachment 378262 Patch This fixes the bug but it also updates rules that do match selected node twice. I'm still thinking of a better way of fixing this. 1570915 2 378805 nvasilyev 2019-09-14 18:41:36 -0700 Created attachment 378805 Patch 1572997 3 joepeck 2019-09-20 18:06:55 -0700 inspector/css/modify-inline-style.html seems to be failing after this change. 1573002 4 378805 nvasilyev 2019-09-20 18:09:24 -0700 Comment on attachment 378805 Patch This broken tests on wk1 and there only. Looking into it. 1575115 5 nvasilyev 2019-09-28 18:55:24 -0700 (In reply to Nikita Vasilyev from comment #4) > Comment on attachment 378805 [details] > Patch > > This broken tests on wk1 and there only. Looking into it. Updating twice (after CSSAgent.setStyleText and on CSSAgent.getMatchedStylesForNode) caused a race condition on WK1. In my next patch, updates only happen once. If it matches the selected DOM node, update on CSSAgent.getMatchedStylesForNode. If it doesn't, update on CSSAgent.setStyleText. 1575116 6 379798 nvasilyev 2019-09-28 18:55:59 -0700 Created attachment 379798 Patch 1575796 7 mattbaker 2019-10-01 16:39:43 -0700 I don't understand what is meant by "rule is marked invalid, but applies". 1. Inspect test case 2. Open Elements tab (<foo> is selected by default) 2. Press "+" to add new selector 3. Adds selector: foo { } 4. Type "frame", replacing the selection "foo" 5. Press tab. Type "outline". Press tab. Type "2px solid orange". Press tab. Result: Rule marked invalid, but style doesn't apply (there are no iframe elements in document) Repeating the above without changing "foo" to "iframe" works as expected. Am I missing something? 1575804 8 nvasilyev 2019-10-01 16:50:58 -0700 (In reply to Matt Baker from comment #7) > I don't understand what is meant by "rule is marked invalid, but applies". Property value (e.g. "2px solid orange") is marked invalid (has a red strikethrough and a warning), but applies. See rdar://problem/54530335 if it's still unclear. (In reply to Matt Baker from comment #7) > Repeating the above without changing "foo" to "iframe" works as expected. Am > I missing something? Yes, repeating the above without changing "foo" to "iframe" works as expected, even before the patch. The bug is specifically about the rules that don't match the selected node. 1575814 9 mattbaker 2019-10-01 17:06:54 -0700 (In reply to Nikita Vasilyev from comment #8) > (In reply to Matt Baker from comment #7) > > I don't understand what is meant by "rule is marked invalid, but applies". > > Property value (e.g. "2px solid orange") is marked invalid (has a red > strikethrough and a warning), but applies. > > See rdar://problem/54530335 if it's still unclear. > > (In reply to Matt Baker from comment #7) > > Repeating the above without changing "foo" to "iframe" works as expected. Am > > I missing something? > > Yes, repeating the above without changing "foo" to "iframe" works as > expected, even before the patch. > > The bug is specifically about the rules that don't match the selected node. Okay I get it. I think it would have been helpful to have an <iframe> in the test case, and mention this. 1575821 10 mattbaker 2019-10-01 17:28:10 -0700 I saw some strange results with the patch applied. Test page: <div>I'm a div</div> <p>And I'm a paragraph</p> Steps to Reproduce: 1. Inspect test page 2. Elements > select the <div> 3. Press "+" to add new selector 4. Type "p", replacing "div" 5. Hit tab. Type "outline". Hit tab. Type "20px solid orange". Hit tab. => Selector not applied. Property value shown as invalid. 6. Select the <p> node in the DOM tree => Style sidebar shows selector contents: p { outline: outline: 20; outline: 20p; utline: 20; outline: 20px; tline: 20; outline: 20p; utline: 20; outline: 20px saddlebrown; line: 20; outline: 20p; ... } Looks like a parsing step might be getting stuck in a loop. 1575827 11 nvasilyev 2019-10-01 18:09:09 -0700 The console is full of "_styleSheetTextRange data is invalid" errors: [Error] Assertion Failed: Cannot have negative numbers in TextRange 0:-2...0:9 cloneAndModify (TextRange.js:134) _updateOwnerStyleText (CSSProperty.js:463) _updateStyleText (CSSProperty.js:438) rawValue (CSSProperty.js:257) _handleValueChange (SpreadsheetStyleProperty.js:736) spreadsheetTextFieldDidChange (SpreadsheetStyleProperty.js:348) _handleInput (SpreadsheetTextField.js:370) _handleInput [Error] Assertion Failed: _styleSheetTextRange data is invalid. _updateOwnerStyleText (CSSProperty.js:468) _updateStyleText (CSSProperty.js:438) rawValue (CSSProperty.js:257) _handleValueChange (SpreadsheetStyleProperty.js:736) spreadsheetTextFieldDidChange (SpreadsheetStyleProperty.js:348) _handleInput (SpreadsheetTextField.js:370) _handleInput 1575843 12 379983 nvasilyev 2019-10-01 19:28:16 -0700 Created attachment 379983 Patch The problem with the previous patch was that I updated CSSProperty#styleSheetTextRange but didn't update CSSStyleDeclaration#styleSheetTextRange, which caused data corruption. 1575844 13 379983 nvasilyev 2019-10-01 19:30:59 -0700 Comment on attachment 379983 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379983&action=review > Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:595 > - let existingStyles = this._stylesMap.get(mapKey); > - if (existingStyles && !style) { > - for (let existingStyle of existingStyles) { > - if (existingStyle.node === node && existingStyle.inherited === inherited) { > - style = existingStyle; > - break; > + if (matchesNode) { > + let existingStyles = this._stylesMap.get(mapKey); > + if (existingStyles && !style) { > + for (let existingStyle of existingStyles) { > + if (existingStyle.node === node && existingStyle.inherited === inherited) { > + style = existingStyle; > + break; > + } > } > } > - } > > - if (style) > - this._stylesMap.add(mapKey, style); > + if (style) > + this._stylesMap.add(mapKey, style); > > - var shorthands = {}; > - for (var i = 0; payload.shorthandEntries && i < payload.shorthandEntries.length; ++i) { > - var shorthand = payload.shorthandEntries[i]; > - shorthands[shorthand.name] = shorthand.value; > + var shorthands = {}; > + for (var i = 0; payload.shorthandEntries && i < payload.shorthandEntries.length; ++i) { > + var shorthand = payload.shorthandEntries[i]; > + shorthands[shorthand.name] = shorthand.value; > + } This seem like a lot of changes but I simply wrapped a chunk of code in `if (matchesNode) { ... }` 1575883 14 379983 hi 2019-10-01 21:33:21 -0700 Comment on attachment 379983 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379983&action=review > Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:459 > + // Update validity status of each property for rules that don't match the selected DOM node. I'd either say "`valid` status" or "validity". > Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:460 > + // These rules don't get updated by CSSAgent.getMatchedStylesForNode. We haven't been adding the "Agent" to comments like these lately, as the `CSSAgent` is purely a frontend concept. It should just be `CSS.getMatchedStylesForNode` (e.g. "Domain.command"). > Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:464 > + const inherited = false; > + const pseudoId = null; > + const matchesNode = false; We don't typically create `const` variables when calling functions that are in the same file (especially "private" functions) as it's easy to just scroll up/down, rather than having to switch files. > Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:560 > + _parseStyleDeclarationPayload(payload, node, inherited, pseudoId, type, rule, matchesNode = true) We usually put optional values like this in a bag, and often have the "default" case be `false`. ``` _parseStyleDeclarationPayload(payload, node, type, {inherited, pseudoId, rule, nonMatching} = {}) ``` This way, we can make all the callsites a bit cleaner in that they only have to pass what they actually need. > Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:575 > let style = rule ? rule.style : null; I'd imagine that if `nonMatching` is provided, you'd expect a `rule` to be provided. We should assert as such: ``` console.assert(!nonMatching || style); ``` > Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:578 > + let existingStyles = this._stylesMap.get(mapKey); We still use `mapKey` below in this function, which adds a newly created `WI.CSSStyleDeclaration` to `_stylesMap`, so we should probably add a `console.assert(!nonMatching)` there. > Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:594 > + var shorthands = {}; > + for (var i = 0; payload.shorthandEntries && i < payload.shorthandEntries.length; ++i) { > + var shorthand = payload.shorthandEntries[i]; > + shorthands[shorthand.name] = shorthand.value; Can we just remove this code? It doesn't look like it's used for anything. 1576096 15 379983 nvasilyev 2019-10-02 11:57:36 -0700 Comment on attachment 379983 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379983&action=review >> Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:459 >> + // Update validity status of each property for rules that don't match the selected DOM node. > > I'd either say "`valid` status" or "validity". Thanks. >> Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:460 >> + // These rules don't get updated by CSSAgent.getMatchedStylesForNode. > > We haven't been adding the "Agent" to comments like these lately, as the `CSSAgent` is purely a frontend concept. It should just be `CSS.getMatchedStylesForNode` (e.g. "Domain.command"). `CSSAgent.getMatchedStylesForNode` is something you can search for in this file and find a function call. >> Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js:560 >> + _parseStyleDeclarationPayload(payload, node, inherited, pseudoId, type, rule, matchesNode = true) > > We usually put optional values like this in a bag, and often have the "default" case be `false`. > ``` > _parseStyleDeclarationPayload(payload, node, type, {inherited, pseudoId, rule, nonMatching} = {}) > ``` > This way, we can make all the callsites a bit cleaner in that they only have to pass what they actually need. I'd prefer to update all _parseStyleDeclarationPayload and _parseRulePayload in a follow-up patch. I prefer to separate refactoring patches from bug fixes. Also, I don't want to use `nonMatching` name because it's a negative. I'd prefer to use `matchesNode` or `matchingNode`. 1576100 16 380046 nvasilyev 2019-10-02 12:03:00 -0700 Created attachment 380046 Patch 1576177 17 380046 mattbaker 2019-10-02 14:09:06 -0700 Comment on attachment 380046 Patch r=me 1576200 18 380046 commit-queue 2019-10-02 14:54:47 -0700 Comment on attachment 380046 Patch Clearing flags on attachment: 380046 Committed r250633: <https://trac.webkit.org/changeset/250633> 1576201 19 commit-queue 2019-10-02 14:54:49 -0700 All reviewed patches have been landed. Closing bug. 378260 2019-09-06 18:40:47 -0700 2019-09-06 18:48:19 -0700 Reduction reduction.html text/html 16 nvasilyev PGZvbz5BIGRpdjwvZm9vPg== 378262 2019-09-06 18:48:19 -0700 2019-09-14 18:41:36 -0700 Patch patch.txt text/plain 1393 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDUzZDJiYjg0YzgyLi41MzVlM2U5MDkzMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDktMDYgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBmb3IgcnVsZXMgdGhhdCBkb24ndCBtYXRjaCBzZWxlY3RlZCBub2RlLCBwcm9w ZXJ0eSB2YWx1ZXMgYWx3YXlzIHNob3cgYXMgaW52YWxpZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2Rl U3R5bGVzLmpzOgorICAgICAgICAoV0kuRE9NTm9kZVN0eWxlcy5wcm90b3R5cGUuY2hhbmdlU3R5 bGVUZXh0KToKKwogMjAxOS0wOS0wNCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogdW5pZnkgdGhlIGludGVyYWN0aW9uIG9mIHNob3cv aGlkZSBzdGF0dXMgaWNvbnMgaW4gU291cmNlcyBhbmQgQ2FudmFzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVz LmpzCmluZGV4IDVkOWM3YmNkMGQ4Li5kZWZhMjBlYjUxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMu anMKQEAgLTQ1Niw2ICs0NTYsMTAgQEAgV0kuRE9NTm9kZVN0eWxlcyA9IGNsYXNzIERPTU5vZGVT dHlsZXMgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgY2Fs bGJhY2soKTsKKworICAgICAgICAgICAgY29uc3QgaW5oZXJpdGVkID0gZmFsc2U7CisgICAgICAg ICAgICBjb25zdCBwc2V1ZG9JZCA9IG51bGw7CisgICAgICAgICAgICB0aGlzLl9wYXJzZVN0eWxl RGVjbGFyYXRpb25QYXlsb2FkKHN0eWxlUGF5bG9hZCwgdGhpcy5fbm9kZSwgaW5oZXJpdGVkLCBw c2V1ZG9JZCwgc3R5bGUudHlwZSwgc3R5bGUub3duZXJSdWxlKTsKICAgICAgICAgICAgIHRoaXMu cmVmcmVzaCgpOwogICAgICAgICB9OwogCg== 378805 2019-09-14 18:41:36 -0700 2019-09-28 18:55:59 -0700 Patch patch.txt text/plain 1917 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3MjQ1NjI4MmIyLi4yMWQyMjVmMDY2ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMDktMTQgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBmb3IgcnVsZXMgdGhhdCBkb24ndCBtYXRjaCBzZWxlY3RlZCBub2RlLCBwcm9w ZXJ0eSB2YWx1ZXMgYWx3YXlzIHNob3cgYXMgaW52YWxpZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGdpc3Qgb2YgdGhlIGJ1ZzoKKyAgICAgICAg LSBXSS5DU1NQcm9wZXJ0eSBpcyBpbnN0YW50aWF0ZWQgd2l0aCBgdmFsaWRgIGZhbHNlLgorICAg ICAgICAtIENTU0FnZW50LmdldE1hdGNoZWRTdHlsZXNGb3JOb2RlIG5ldmVyIHVwZGF0ZXMgV0ku Q1NTUHJvcGVydHkgaW5zdGFuY2VzIGJlY2F1c2UKKyAgICAgICAgICB0aGUgZWRpdGVkIHN0eWxl IGRvZXMgbm90IGluIGZhY3QgbWF0Y2ggdGhlIHNlbGVjdGVkIERPTSBub2RlLgorCisgICAgICAg IFRvIHJlc29sdmUgdGhpcywgV0kuQ1NTUHJvcGVydHkgaW5zdGFuY2VzIGFyZSBub3cgYWx3YXlz IHVwZGF0ZWQgYWZ0ZXIgZWRpdGluZworICAgICAgICBmcm9tIHRoZSBjYWxsYmFjayBvZiBgQ1NT QWdlbnQuc2V0U3R5bGVUZXh0YC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RP TU5vZGVTdHlsZXMuanM6CisgICAgICAgIChXSS5ET01Ob2RlU3R5bGVzLnByb3RvdHlwZS5jaGFu Z2VTdHlsZVRleHQpOgorCiAyMDE5LTA4LTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb2RlTWlycm9yIHN0aWxsIGluc2VydHMg YSB0YWIgZXZlbiB3aGVuICJQcmVmZXIgaW5kZW50IHVzaW5nIiBpcyBzZXQgdG8gIlNwYWNlcyIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9E T01Ob2RlU3R5bGVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL0RPTU5vZGVTdHlsZXMuanMKaW5kZXggNDMwOWI2YTYxZTMuLjU2ODA1MzRkNGRiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9k ZVN0eWxlcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2Rl bHMvRE9NTm9kZVN0eWxlcy5qcwpAQCAtNDU1LDYgKzQ1NSwxMiBAQCBXSS5ET01Ob2RlU3R5bGVz ID0gY2xhc3MgRE9NTm9kZVN0eWxlcyBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgLy8gVXBkYXRlIHZhbGlkaXR5 IG9mIGVhY2ggcHJvcGVydHkuCisgICAgICAgICAgICBpZiAoc3R5bGVQYXlsb2FkLmNzc1Byb3Bl cnRpZXMpIHsKKyAgICAgICAgICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8IHN0eWxlUGF5bG9h ZC5jc3NQcm9wZXJ0aWVzLmxlbmd0aDsgKytpKQorICAgICAgICAgICAgICAgICAgICB0aGlzLl9w YXJzZVN0eWxlUHJvcGVydHlQYXlsb2FkKHN0eWxlUGF5bG9hZC5jc3NQcm9wZXJ0aWVzW2ldLCBp LCBzdHlsZSk7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIGNhbGxiYWNrKCk7CiAgICAg ICAgICAgICB0aGlzLnJlZnJlc2goKTsKICAgICAgICAgfTsK 379798 2019-09-28 18:55:59 -0700 2019-10-01 19:28:16 -0700 Patch patch.txt text/plain 2090 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZlMzVlZmRhNWI3Li40MTQzYzcwY2NmMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDktMjggIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBmb3IgcnVsZXMgdGhhdCBkb24ndCBtYXRjaCBzZWxlY3RlZCBub2RlLCBwcm9w ZXJ0eSB2YWx1ZXMgYWx3YXlzIHNob3cgYXMgaW52YWxpZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGdpc3Qgb2YgdGhlIGJ1ZzoKKyAgICAgICAg LSBXSS5DU1NQcm9wZXJ0eSBpcyBpbnN0YW50aWF0ZWQgd2l0aCBgdmFsaWRgIGZhbHNlLgorICAg ICAgICAtIENTU0FnZW50LmdldE1hdGNoZWRTdHlsZXNGb3JOb2RlIG5ldmVyIHVwZGF0ZXMgV0ku Q1NTUHJvcGVydHkgaW5zdGFuY2VzIGJlY2F1c2UKKyAgICAgICAgICB0aGUgZWRpdGVkIHN0eWxl IGRvZXMgbm90IGluIGZhY3QgbWF0Y2ggdGhlIHNlbGVjdGVkIERPTSBub2RlLiBBIHZhbGlkIENT UyBwcm9wZXJ0eQorICAgICAgICAgIGlzIHNob3duIGFzIGludmFsaWQuCisKKyAgICAgICAgVG8g cmVzb2x2ZSB0aGlzLCBXSS5DU1NQcm9wZXJ0eSBpbnN0YW5jZXMgYXJlIG5vdyB1cGRhdGVkIGFm dGVyIGVkaXRpbmcKKyAgICAgICAgaW4gdGhlIGNhbGxiYWNrIG9mIGBDU1NBZ2VudC5zZXRTdHls ZVRleHRgLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5q czoKKyAgICAgICAgKFdJLkRPTU5vZGVTdHlsZXMucHJvdG90eXBlLmNoYW5nZVN0eWxlVGV4dCk6 CisKIDIwMTktMDktMTMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBUaWdodGVyIGF1dG9jb21wbGV0ZSBidWJibGVzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9k ZVN0eWxlcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9E T01Ob2RlU3R5bGVzLmpzCmluZGV4IDVkOWM3YmNkMGQ4Li5iNDIxMjAzZjViYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVTdHls ZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RP TU5vZGVTdHlsZXMuanMKQEAgLTQ1NSw2ICs0NTUsMTMgQEAgV0kuRE9NTm9kZVN0eWxlcyA9IGNs YXNzIERPTU5vZGVTdHlsZXMgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgIC8vIFVwZGF0ZSB2YWxpZGl0eSBzdGF0 dXMgb2YgZWFjaCBwcm9wZXJ0eSBmb3IgcnVsZXMgdGhhdCBkb24ndCBtYXRjaCB0aGUgc2VsZWN0 ZWQgRE9NIG5vZGUuCisgICAgICAgICAgICAvLyBUaGVzZSBydWxlcyBkb24ndCBnZXQgdXBkYXRl ZCBieSBDU1NBZ2VudC5nZXRNYXRjaGVkU3R5bGVzRm9yTm9kZS4KKyAgICAgICAgICAgIGlmIChz dHlsZS5vd25lclJ1bGUgJiYgIXN0eWxlLm93bmVyUnVsZS5tYXRjaGVkU2VsZWN0b3JJbmRpY2Vz Lmxlbmd0aCkgeworICAgICAgICAgICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwgc3R5bGVQYXls b2FkLmNzc1Byb3BlcnRpZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgICAgIHRoaXMu X3BhcnNlU3R5bGVQcm9wZXJ0eVBheWxvYWQoc3R5bGVQYXlsb2FkLmNzc1Byb3BlcnRpZXNbaV0s IGksIHN0eWxlKTsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgY2FsbGJhY2soKTsKICAg ICAgICAgICAgIHRoaXMucmVmcmVzaCgpOwogICAgICAgICB9Owo= 379983 2019-10-01 19:28:16 -0700 2019-10-02 12:03:00 -0700 Patch patch.txt text/plain 4498 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZlMzVlZmRhNWI3Li5hNmE0NzFmODUzZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMTAtMDEgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBmb3IgcnVsZXMgdGhhdCBkb24ndCBtYXRjaCBzZWxlY3RlZCBub2RlLCBwcm9w ZXJ0eSB2YWx1ZXMgYWx3YXlzIHNob3cgYXMgaW52YWxpZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGdpc3Qgb2YgdGhlIGJ1ZzoKKyAgICAgICAg LSBXSS5DU1NQcm9wZXJ0eSBpcyBpbnN0YW50aWF0ZWQgd2l0aCBgdmFsaWRgIGZhbHNlLgorICAg ICAgICAtIENTU0FnZW50LmdldE1hdGNoZWRTdHlsZXNGb3JOb2RlIG5ldmVyIHVwZGF0ZXMgV0ku Q1NTUHJvcGVydHkgaW5zdGFuY2VzIGJlY2F1c2UKKyAgICAgICAgICB0aGUgZWRpdGVkIHN0eWxl IGRvZXMgbm90IGluIGZhY3QgbWF0Y2ggdGhlIHNlbGVjdGVkIERPTSBub2RlLiBBIHZhbGlkIENT UyBwcm9wZXJ0eQorICAgICAgICAgIGlzIHNob3duIGFzIGludmFsaWQuCisKKyAgICAgICAgVG8g cmVzb2x2ZSB0aGlzLCBXSS5DU1NQcm9wZXJ0eSBpbnN0YW5jZXMgYXJlIG5vdyB1cGRhdGVkIGFm dGVyIGVkaXRpbmcKKyAgICAgICAgaW4gdGhlIGNhbGxiYWNrIG9mIGBDU1NBZ2VudC5zZXRTdHls ZVRleHRgLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5q czoKKyAgICAgICAgKFdJLkRPTU5vZGVTdHlsZXMucHJvdG90eXBlLmNoYW5nZVN0eWxlVGV4dCk6 CisgICAgICAgIChXSS5ET01Ob2RlU3R5bGVzLnByb3RvdHlwZS5fcGFyc2VTdHlsZURlY2xhcmF0 aW9uUGF5bG9hZCk6CisgICAgICAgIERvbid0IHN0b3JlIGBzdHlsZWAgaW4gYHRoaXMuX3N0eWxl c01hcGAgb2YgV0kuRE9NTm9kZVN0eWxlcyB3aGVuIHRoZSBzdHlsZSBkb2Vzbid0IG1hdGNoIHRo ZSBzZWxlY3RlZCBub2RlLgorCiAyMDE5LTA5LTEzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVGlnaHRlciBhdXRvY29tcGxl dGUgYnViYmxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcwppbmRleCA1ZDljN2JjZDBkOC4uNmJiYTJj ZmRmYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9ET01Ob2RlU3R5bGVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCkBAIC00NTQsOCArNDU0LDE3IEBAIFdJLkRP TU5vZGVTdHlsZXMgPSBjbGFzcyBET01Ob2RlU3R5bGVzIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAg ICAgICAgICAgICAgY2FsbGJhY2soZXJyb3IpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgIH0KLQogICAgICAgICAgICAgY2FsbGJhY2soKTsKKworICAgICAgICAgICAgLy8g VXBkYXRlIHZhbGlkaXR5IHN0YXR1cyBvZiBlYWNoIHByb3BlcnR5IGZvciBydWxlcyB0aGF0IGRv bid0IG1hdGNoIHRoZSBzZWxlY3RlZCBET00gbm9kZS4KKyAgICAgICAgICAgIC8vIFRoZXNlIHJ1 bGVzIGRvbid0IGdldCB1cGRhdGVkIGJ5IENTU0FnZW50LmdldE1hdGNoZWRTdHlsZXNGb3JOb2Rl LgorICAgICAgICAgICAgaWYgKHN0eWxlLm93bmVyUnVsZSAmJiAhc3R5bGUub3duZXJSdWxlLm1h dGNoZWRTZWxlY3RvckluZGljZXMubGVuZ3RoKSB7CisgICAgICAgICAgICAgICAgY29uc3QgaW5o ZXJpdGVkID0gZmFsc2U7CisgICAgICAgICAgICAgICAgY29uc3QgcHNldWRvSWQgPSBudWxsOwor ICAgICAgICAgICAgICAgIGNvbnN0IG1hdGNoZXNOb2RlID0gZmFsc2U7CisgICAgICAgICAgICAg ICAgdGhpcy5fcGFyc2VTdHlsZURlY2xhcmF0aW9uUGF5bG9hZChzdHlsZVBheWxvYWQsIHRoaXMu X25vZGUsIGluaGVyaXRlZCwgcHNldWRvSWQsIHN0eWxlLnR5cGUsIHN0eWxlLm93bmVyUnVsZSwg bWF0Y2hlc05vZGUpOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICB0aGlzLnJlZnJlc2go KTsKICAgICAgICAgfTsKIApAQCAtNTQ4LDcgKzU1Nyw3IEBAIFdJLkRPTU5vZGVTdHlsZXMgPSBj bGFzcyBET01Ob2RlU3R5bGVzIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHJldHVybiBuZXcg V0kuQ1NTUHJvcGVydHkoaW5kZXgsIHRleHQsIG5hbWUsIHZhbHVlLCBwcmlvcml0eSwgZW5hYmxl ZCwgb3ZlcnJpZGRlbiwgaW1wbGljaXQsIGFub255bW91cywgdmFsaWQsIHN0eWxlU2hlZXRUZXh0 UmFuZ2UpOwogICAgIH0KIAotICAgIF9wYXJzZVN0eWxlRGVjbGFyYXRpb25QYXlsb2FkKHBheWxv YWQsIG5vZGUsIGluaGVyaXRlZCwgcHNldWRvSWQsIHR5cGUsIHJ1bGUpCisgICAgX3BhcnNlU3R5 bGVEZWNsYXJhdGlvblBheWxvYWQocGF5bG9hZCwgbm9kZSwgaW5oZXJpdGVkLCBwc2V1ZG9JZCwg dHlwZSwgcnVsZSwgbWF0Y2hlc05vZGUgPSB0cnVlKQogICAgIHsKICAgICAgICAgaWYgKCFwYXls b2FkKQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CkBAIC01NjUsMjMgKzU3NCwyNSBAQCBXSS5E T01Ob2RlU3R5bGVzID0gY2xhc3MgRE9NTm9kZVN0eWxlcyBleHRlbmRzIFdJLk9iamVjdAogCiAg ICAgICAgIGxldCBzdHlsZSA9IHJ1bGUgPyBydWxlLnN0eWxlIDogbnVsbDsKIAotICAgICAgICBs ZXQgZXhpc3RpbmdTdHlsZXMgPSB0aGlzLl9zdHlsZXNNYXAuZ2V0KG1hcEtleSk7Ci0gICAgICAg IGlmIChleGlzdGluZ1N0eWxlcyAmJiAhc3R5bGUpIHsKLSAgICAgICAgICAgIGZvciAobGV0IGV4 aXN0aW5nU3R5bGUgb2YgZXhpc3RpbmdTdHlsZXMpIHsKLSAgICAgICAgICAgICAgICBpZiAoZXhp c3RpbmdTdHlsZS5ub2RlID09PSBub2RlICYmIGV4aXN0aW5nU3R5bGUuaW5oZXJpdGVkID09PSBp bmhlcml0ZWQpIHsKLSAgICAgICAgICAgICAgICAgICAgc3R5bGUgPSBleGlzdGluZ1N0eWxlOwot ICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgaWYgKG1hdGNoZXNOb2RlKSB7Cisg ICAgICAgICAgICBsZXQgZXhpc3RpbmdTdHlsZXMgPSB0aGlzLl9zdHlsZXNNYXAuZ2V0KG1hcEtl eSk7CisgICAgICAgICAgICBpZiAoZXhpc3RpbmdTdHlsZXMgJiYgIXN0eWxlKSB7CisgICAgICAg ICAgICAgICAgZm9yIChsZXQgZXhpc3RpbmdTdHlsZSBvZiBleGlzdGluZ1N0eWxlcykgeworICAg ICAgICAgICAgICAgICAgICBpZiAoZXhpc3RpbmdTdHlsZS5ub2RlID09PSBub2RlICYmIGV4aXN0 aW5nU3R5bGUuaW5oZXJpdGVkID09PSBpbmhlcml0ZWQpIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHN0eWxlID0gZXhpc3RpbmdTdHlsZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQotICAgICAgICB9CiAKLSAgICAgICAgaWYgKHN0eWxlKQotICAgICAgICAgICAgdGhpcy5fc3R5 bGVzTWFwLmFkZChtYXBLZXksIHN0eWxlKTsKKyAgICAgICAgICAgIGlmIChzdHlsZSkKKyAgICAg ICAgICAgICAgICB0aGlzLl9zdHlsZXNNYXAuYWRkKG1hcEtleSwgc3R5bGUpOwogCi0gICAgICAg IHZhciBzaG9ydGhhbmRzID0ge307Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBwYXlsb2FkLnNo b3J0aGFuZEVudHJpZXMgJiYgaSA8IHBheWxvYWQuc2hvcnRoYW5kRW50cmllcy5sZW5ndGg7ICsr aSkgewotICAgICAgICAgICAgdmFyIHNob3J0aGFuZCA9IHBheWxvYWQuc2hvcnRoYW5kRW50cmll c1tpXTsKLSAgICAgICAgICAgIHNob3J0aGFuZHNbc2hvcnRoYW5kLm5hbWVdID0gc2hvcnRoYW5k LnZhbHVlOworICAgICAgICAgICAgdmFyIHNob3J0aGFuZHMgPSB7fTsKKyAgICAgICAgICAgIGZv ciAodmFyIGkgPSAwOyBwYXlsb2FkLnNob3J0aGFuZEVudHJpZXMgJiYgaSA8IHBheWxvYWQuc2hv cnRoYW5kRW50cmllcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgIHZhciBzaG9ydGhh bmQgPSBwYXlsb2FkLnNob3J0aGFuZEVudHJpZXNbaV07CisgICAgICAgICAgICAgICAgc2hvcnRo YW5kc1tzaG9ydGhhbmQubmFtZV0gPSBzaG9ydGhhbmQudmFsdWU7CisgICAgICAgICAgICB9CiAg ICAgICAgIH0KIAogICAgICAgICB2YXIgaW5oZXJpdGVkUHJvcGVydHlDb3VudCA9IDA7Cg== 380046 2019-10-02 12:03:00 -0700 2019-10-02 14:54:47 -0700 Patch patch.txt text/plain 4516 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZlMzVlZmRhNWI3Li45MzdjYmM3ZDM5MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTktMTAtMDIgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBmb3IgcnVsZXMgdGhhdCBkb24ndCBtYXRjaCBzZWxlY3RlZCBub2RlLCBwcm9w ZXJ0eSB2YWx1ZXMgYWx3YXlzIHNob3cgYXMgaW52YWxpZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNTcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGdpc3Qgb2YgdGhlIGJ1ZzoKKyAgICAgICAg LSBXSS5DU1NQcm9wZXJ0eSBpcyBpbnN0YW50aWF0ZWQgd2l0aCBgdmFsaWRgIGZhbHNlLgorICAg ICAgICAtIENTU0FnZW50LmdldE1hdGNoZWRTdHlsZXNGb3JOb2RlIG5ldmVyIHVwZGF0ZXMgV0ku Q1NTUHJvcGVydHkgaW5zdGFuY2VzIGJlY2F1c2UKKyAgICAgICAgICB0aGUgZWRpdGVkIHN0eWxl IGRvZXMgbm90IGluIGZhY3QgbWF0Y2ggdGhlIHNlbGVjdGVkIERPTSBub2RlLiBBIHZhbGlkIENT UyBwcm9wZXJ0eQorICAgICAgICAgIGlzIHNob3duIGFzIGludmFsaWQuCisKKyAgICAgICAgVG8g cmVzb2x2ZSB0aGlzLCBXSS5DU1NQcm9wZXJ0eSBpbnN0YW5jZXMgYXJlIG5vdyB1cGRhdGVkIGFm dGVyIGVkaXRpbmcKKyAgICAgICAgaW4gdGhlIGNhbGxiYWNrIG9mIGBDU1NBZ2VudC5zZXRTdHls ZVRleHRgLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5q czoKKyAgICAgICAgKFdJLkRPTU5vZGVTdHlsZXMucHJvdG90eXBlLmNoYW5nZVN0eWxlVGV4dCk6 CisgICAgICAgIChXSS5ET01Ob2RlU3R5bGVzLnByb3RvdHlwZS5fcGFyc2VTdHlsZURlY2xhcmF0 aW9uUGF5bG9hZCk6CisgICAgICAgIERvbid0IHN0b3JlIGBzdHlsZWAgaW4gYHRoaXMuX3N0eWxl c01hcGAgb2YgV0kuRE9NTm9kZVN0eWxlcyB3aGVuIHRoZSBzdHlsZSBkb2Vzbid0IG1hdGNoIHRo ZSBzZWxlY3RlZCBub2RlLgorCiAyMDE5LTA5LTEzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVGlnaHRlciBhdXRvY29tcGxl dGUgYnViYmxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvTW9kZWxzL0RPTU5vZGVTdHlsZXMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvRE9NTm9kZVN0eWxlcy5qcwppbmRleCA1ZDljN2JjZDBkOC4uZmVmMGZl ODVlMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9ET01Ob2RlU3R5bGVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVzLmpzCkBAIC00NTQsOCArNDU0LDEzIEBAIFdJLkRP TU5vZGVTdHlsZXMgPSBjbGFzcyBET01Ob2RlU3R5bGVzIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAg ICAgICAgICAgICAgY2FsbGJhY2soZXJyb3IpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgIH0KLQogICAgICAgICAgICAgY2FsbGJhY2soKTsKKworICAgICAgICAgICAgLy8g VXBkYXRlIHZhbGlkaXR5IG9mIGVhY2ggcHJvcGVydHkgZm9yIHJ1bGVzIHRoYXQgZG9uJ3QgbWF0 Y2ggdGhlIHNlbGVjdGVkIERPTSBub2RlLgorICAgICAgICAgICAgLy8gVGhlc2UgcnVsZXMgZG9u J3QgZ2V0IHVwZGF0ZWQgYnkgQ1NTQWdlbnQuZ2V0TWF0Y2hlZFN0eWxlc0Zvck5vZGUuCisgICAg ICAgICAgICBpZiAoc3R5bGUub3duZXJSdWxlICYmICFzdHlsZS5vd25lclJ1bGUubWF0Y2hlZFNl bGVjdG9ySW5kaWNlcy5sZW5ndGgpCisgICAgICAgICAgICAgICAgdGhpcy5fcGFyc2VTdHlsZURl Y2xhcmF0aW9uUGF5bG9hZChzdHlsZVBheWxvYWQsIHRoaXMuX25vZGUsIGZhbHNlLCBudWxsLCBz dHlsZS50eXBlLCBzdHlsZS5vd25lclJ1bGUsIGZhbHNlKTsKKwogICAgICAgICAgICAgdGhpcy5y ZWZyZXNoKCk7CiAgICAgICAgIH07CiAKQEAgLTU0OCw3ICs1NTMsNyBAQCBXSS5ET01Ob2RlU3R5 bGVzID0gY2xhc3MgRE9NTm9kZVN0eWxlcyBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICByZXR1 cm4gbmV3IFdJLkNTU1Byb3BlcnR5KGluZGV4LCB0ZXh0LCBuYW1lLCB2YWx1ZSwgcHJpb3JpdHks IGVuYWJsZWQsIG92ZXJyaWRkZW4sIGltcGxpY2l0LCBhbm9ueW1vdXMsIHZhbGlkLCBzdHlsZVNo ZWV0VGV4dFJhbmdlKTsKICAgICB9CiAKLSAgICBfcGFyc2VTdHlsZURlY2xhcmF0aW9uUGF5bG9h ZChwYXlsb2FkLCBub2RlLCBpbmhlcml0ZWQsIHBzZXVkb0lkLCB0eXBlLCBydWxlKQorICAgIF9w YXJzZVN0eWxlRGVjbGFyYXRpb25QYXlsb2FkKHBheWxvYWQsIG5vZGUsIGluaGVyaXRlZCwgcHNl dWRvSWQsIHR5cGUsIHJ1bGUsIG1hdGNoZXNOb2RlID0gdHJ1ZSkKICAgICB7CiAgICAgICAgIGlm ICghcGF5bG9hZCkKICAgICAgICAgICAgIHJldHVybiBudWxsOwpAQCAtNTY0LDI0ICs1NjksMjEg QEAgV0kuRE9NTm9kZVN0eWxlcyA9IGNsYXNzIERPTU5vZGVTdHlsZXMgZXh0ZW5kcyBXSS5PYmpl Y3QKICAgICAgICAgICAgIG1hcEtleSArPSAiOiIgKyBub2RlLmlkICsgIjphdHRyaWJ1dGUiOwog CiAgICAgICAgIGxldCBzdHlsZSA9IHJ1bGUgPyBydWxlLnN0eWxlIDogbnVsbDsKLQotICAgICAg ICBsZXQgZXhpc3RpbmdTdHlsZXMgPSB0aGlzLl9zdHlsZXNNYXAuZ2V0KG1hcEtleSk7Ci0gICAg ICAgIGlmIChleGlzdGluZ1N0eWxlcyAmJiAhc3R5bGUpIHsKLSAgICAgICAgICAgIGZvciAobGV0 IGV4aXN0aW5nU3R5bGUgb2YgZXhpc3RpbmdTdHlsZXMpIHsKLSAgICAgICAgICAgICAgICBpZiAo ZXhpc3RpbmdTdHlsZS5ub2RlID09PSBub2RlICYmIGV4aXN0aW5nU3R5bGUuaW5oZXJpdGVkID09 PSBpbmhlcml0ZWQpIHsKLSAgICAgICAgICAgICAgICAgICAgc3R5bGUgPSBleGlzdGluZ1N0eWxl OwotICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY29uc29sZS5hc3NlcnQobWF0 Y2hlc05vZGUgfHwgc3R5bGUpOworCisgICAgICAgIGlmIChtYXRjaGVzTm9kZSkgeworICAgICAg ICAgICAgbGV0IGV4aXN0aW5nU3R5bGVzID0gdGhpcy5fc3R5bGVzTWFwLmdldChtYXBLZXkpOwor ICAgICAgICAgICAgaWYgKGV4aXN0aW5nU3R5bGVzICYmICFzdHlsZSkgeworICAgICAgICAgICAg ICAgIGZvciAobGV0IGV4aXN0aW5nU3R5bGUgb2YgZXhpc3RpbmdTdHlsZXMpIHsKKyAgICAgICAg ICAgICAgICAgICAgaWYgKGV4aXN0aW5nU3R5bGUubm9kZSA9PT0gbm9kZSAmJiBleGlzdGluZ1N0 eWxlLmluaGVyaXRlZCA9PT0gaW5oZXJpdGVkKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBz dHlsZSA9IGV4aXN0aW5nU3R5bGU7CisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAg ICAgICAgfQotCi0gICAgICAgIGlmIChzdHlsZSkKLSAgICAgICAgICAgIHRoaXMuX3N0eWxlc01h cC5hZGQobWFwS2V5LCBzdHlsZSk7CiAKLSAgICAgICAgdmFyIHNob3J0aGFuZHMgPSB7fTsKLSAg ICAgICAgZm9yICh2YXIgaSA9IDA7IHBheWxvYWQuc2hvcnRoYW5kRW50cmllcyAmJiBpIDwgcGF5 bG9hZC5zaG9ydGhhbmRFbnRyaWVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgc2hv cnRoYW5kID0gcGF5bG9hZC5zaG9ydGhhbmRFbnRyaWVzW2ldOwotICAgICAgICAgICAgc2hvcnRo YW5kc1tzaG9ydGhhbmQubmFtZV0gPSBzaG9ydGhhbmQudmFsdWU7CisgICAgICAgICAgICBpZiAo c3R5bGUpCisgICAgICAgICAgICAgICAgdGhpcy5fc3R5bGVzTWFwLmFkZChtYXBLZXksIHN0eWxl KTsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBpbmhlcml0ZWRQcm9wZXJ0eUNvdW50ID0gMDsK QEAgLTYwNSw2ICs2MDcsOSBAQCBXSS5ET01Ob2RlU3R5bGVzID0gY2xhc3MgRE9NTm9kZVN0eWxl cyBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICAgICAgcmV0dXJuIHN0eWxlOwogICAgICAgICB9 CiAKKyAgICAgICAgaWYgKCFtYXRjaGVzTm9kZSkKKyAgICAgICAgICAgIHJldHVybiBudWxsOwor CiAgICAgICAgIHZhciBzdHlsZVNoZWV0ID0gaWQgPyBXSS5jc3NNYW5hZ2VyLnN0eWxlU2hlZXRG b3JJZGVudGlmaWVyKGlkLnN0eWxlU2hlZXRJZCkgOiBudWxsOwogICAgICAgICBpZiAoc3R5bGVT aGVldCkgewogICAgICAgICAgICAgaWYgKHR5cGUgPT09IFdJLkNTU1N0eWxlRGVjbGFyYXRpb24u VHlwZS5JbmxpbmUpCg==