136662 2014-09-08 20:26:12 -0700 Web Inspector: DOM Tree search highlights are not appearing 2014-09-11 11:36:21 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 joepeck joepeck graouts joepeck timothy webkit-bug-importer oldest_to_newest 1034050 0 joepeck 2014-09-08 20:26:12 -0700 When performing a search in the DOM Tree, we should see the results highlighted immediately. However, the highlights were not showing and the related code was unused and stale (would have thrown exceptions). Hook up the code and make it work! 1034053 1 237837 joepeck 2014-09-08 20:37:28 -0700 Created attachment 237837 [PATCH] Proposed Fix This fixes the issue. I have to work on the highlight colors a bit. 1034303 2 237837 timothy 2014-09-10 08:22:41 -0700 Comment on attachment 237837 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=237837&action=review > Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js:472 > + if (error) > + return; > + if (this._searchIdentifier !== searchIdentifier) > + return; Combine? Otherwise I'd throw a newline between these. > Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.css:179 > +.dom-tree-outline .highlighted { > + color: black; > + background-color: rgba(235, 215, 38, 0.2); > + border-bottom: 1px solid rgb(237, 202, 71); > +} > + > +.dom-tree-outline li.selected .highlighted, > +.dom-tree-outline:focus li.selected .highlighted { > + background-color: rgba(235, 215, 38, 0.7); > + border-bottom: 1px solid rgb(237, 202, 31); > +} > + > +.dom-tree-outline .highlighted .highlight { > + background-color: rgb(255, 230, 179); > + border-radius: 4px; > + padding-bottom: 2px; > + margin-bottom: -2px; > +} Screenshot? 1034430 3 237837 joepeck 2014-09-10 15:15:19 -0700 Comment on attachment 237837 [PATCH] Proposed Fix I want to tweak the styles to look like the sidebar. I'll show You in person. 1034530 4 237932 joepeck 2014-09-10 22:52:35 -0700 Created attachment 237932 [PATCH] Proposed Fix This patch is much better. It is cleaner, matches the style of highlights in the sidebar (though they could still be tweaked, it is hard to see in the a selected but non-:focus row), and it adds a bouncy-highlight when moving between DOMTreeContentView search results! 1034548 5 237932 timothy 2014-09-11 00:07:09 -0700 Comment on attachment 237932 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=237932&action=review > Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js:506 > + this._searchResultNodes.forEach(function(domNode) { > + var treeElement = this._domTreeOutline.findTreeElement(domNode); > + if (treeElement) > + treeElement.hideSearchHighlights(); > + }, this); for(..of..)? 1034658 6 joepeck 2014-09-11 11:36:13 -0700 <http://trac.webkit.org/changeset/173522> 237837 2014-09-08 20:37:28 -0700 2014-09-10 22:52:35 -0700 [PATCH] Proposed Fix search-highlight.patch text/plain 7741 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRlOTJiNjUuLjg1NDlhYjYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE0LTA5LTA4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRE9NIFRy ZWUgc2VhcmNoIGhpZ2hsaWdodHMgYXJlIG5vdCBhcHBlYXJpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjY2MgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gcGVyZm9ybWluZyBhIHNlYXJjaCB3 aXRoaW4gdGhlIERPTVRyZWVDb250ZW50VmlldyBhbGwKKyAgICAgICAgc2VhcmNoIHJlc3VsdHMg c2hvdWxkIGltbWVkaWF0ZWx5IGhpZ2hsaWdodC4gUmVtZW1iZXIgdG8KKyAgICAgICAgcmVtb3Zl IHRoZSBoaWdobGlnaHRzIHdoZW4gdGhlIHNlYXJjaCBpcyBjaGFuZ2VkIG9yIGNsZWFyZWQuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlQ29udGVudFZpZXcucHJvdG90eXBlLnBlcmZvcm1T ZWFyY2guc2VhcmNoUmVzdWx0c1JlYWR5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVl Q29udGVudFZpZXcucHJvdG90eXBlLnNlYXJjaENsZWFyZWQpOgorICAgICAgICBTaG93IG9yIGhp ZGUgaGlnaGxpZ2h0cyB3aGVuIHNlYXJjaGVzIGNoYW5nZS4KKworICAgICAgICAoV2ViSW5zcGVj dG9yLkRPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5cGUuX3Nob3dTZWFyY2hIaWdobGlnaHRzKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlQ29udGVudFZpZXcucHJvdG90eXBlLl9oaWRl U2VhcmNoSGlnaGxpZ2h0cyk6CisgICAgICAgIE9uIGVhY2ggYWZmZWN0ZWQgRE9NVHJlZUVsZW1l bnQgc2hvdyBvciBoaWRlIHNlYXJjaCBoaWdobGlnaHRzLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01U cmVlRWxlbWVudC5wcm90b3R5cGUuX2hpZ2hsaWdodFNlYXJjaFJlc3VsdHMpOgorICAgICAgICBV cGRhdGUgdGhlIHN0YWxlIGNvZGUgdG8gdXNlIG5ldyBmdW5jdGlvbiBuYW1lcyBhbmQgYWNjZXNz b3JzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5jc3M6 CisgICAgICAgICguZG9tLXRyZWUtb3V0bGluZSAuaGlnaGxpZ2h0ZWQpOgorICAgICAgICAoLmRv bS10cmVlLW91dGxpbmU6Zm9jdXMgbGkuc2VsZWN0ZWQgLmhpZ2hsaWdodGVkKToKKyAgICAgICAg KC5kb20tdHJlZS1vdXRsaW5lIC5oaWdobGlnaHRlZCAuaGlnaGxpZ2h0KToKKyAgICAgICAgU3R5 bGVzIGZvciBpbmxpbmUgaGlnaGxpZ2h0cy4KKworMjAxNC0wOS0wOCAgSm9zZXBoIFBlY29yYXJv ICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSB1 bnVzZWQgQ29uc29sZSBzZWFyY2ggaGlnaGxpZ2h0IG1ldGhvZHMKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjY2MQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29u dGVudFZpZXcuanMKaW5kZXggMDYxN2M3My4uYjAwODNjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250 ZW50Vmlldy5qcwpAQCAtMjAwLDggKzIwMCwxMCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRl bnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX3NlYXJjaFF1ZXJ5ID09PSBx dWVyeSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAodGhpcy5fc2VhcmNoSWRl bnRpZmllcikKKyAgICAgICAgaWYgKHRoaXMuX3NlYXJjaElkZW50aWZpZXIpIHsKICAgICAgICAg ICAgIERPTUFnZW50LmRpc2NhcmRTZWFyY2hSZXN1bHRzKHRoaXMuX3NlYXJjaElkZW50aWZpZXIp OworICAgICAgICAgICAgdGhpcy5faGlkZVNlYXJjaEhpZ2hsaWdodHMoKTsKKyAgICAgICAgfQog CiAgICAgICAgIHRoaXMuX3NlYXJjaFF1ZXJ5ID0gcXVlcnk7CiAgICAgICAgIHRoaXMuX3NlYXJj aElkZW50aWZpZXIgPSBudWxsOwpAQCAtMjE4LDYgKzIyMCw4IEBAIFdlYkluc3BlY3Rvci5ET01U cmVlQ29udGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcuRXZlbnQuTnVtYmVyT2ZT ZWFyY2hSZXN1bHRzRGlkQ2hhbmdlKTsKIAorICAgICAgICAgICAgdGhpcy5fc2hvd1NlYXJjaEhp Z2hsaWdodHMoKTsKKwogICAgICAgICAgICAgaWYgKHRoaXMuX2F1dG9tYXRpY2FsbHlSZXZlYWxG aXJzdFNlYXJjaFJlc3VsdCkKICAgICAgICAgICAgICAgICB0aGlzLnJldmVhbE5leHRTZWFyY2hS ZXN1bHQoKTsKICAgICAgICAgfQpAQCAtMjM5LDggKzI0MywxMCBAQCBXZWJJbnNwZWN0b3IuRE9N VHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIHNlYXJjaENsZWFyZWQ6IGZ1bmN0 aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9zZWFyY2hJZGVudGlmaWVyKQorICAgICAg ICBpZiAodGhpcy5fc2VhcmNoSWRlbnRpZmllcikgewogICAgICAgICAgICAgRE9NQWdlbnQuZGlz Y2FyZFNlYXJjaFJlc3VsdHModGhpcy5fc2VhcmNoSWRlbnRpZmllcik7CisgICAgICAgICAgICB0 aGlzLl9oaWRlU2VhcmNoSGlnaGxpZ2h0cygpOworICAgICAgICB9CiAKICAgICAgICAgdGhpcy5f c2VhcmNoUXVlcnkgPSBudWxsOwogICAgICAgICB0aGlzLl9zZWFyY2hJZGVudGlmaWVyID0gbnVs bDsKQEAgLTQ0OSw1ICs0NTUsNTEgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVDb250ZW50Vmlldy5w cm90b3R5cGUgPSB7CiAgICAgX3RvZ2dsZVNob3dzU2hhZG93RE9NU2V0dGluZzogZnVuY3Rpb24o ZXZlbnQpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NoYWRvd0RPTVNldHRpbmcu dmFsdWUgPSAhV2ViSW5zcGVjdG9yLnNob3dTaGFkb3dET01TZXR0aW5nLnZhbHVlOworICAgIH0s CisKKyAgICBfc2hvd1NlYXJjaEhpZ2hsaWdodHM6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3NlYXJjaElkZW50aWZpZXIpOworCisgICAgICAgIHRoaXMu X3NlYXJjaFJlc3VsdE5vZGVzID0gW107CisKKyAgICAgICAgdmFyIHNlYXJjaElkZW50aWZpZXIg PSB0aGlzLl9zZWFyY2hJZGVudGlmaWVyOworCisgICAgICAgIERPTUFnZW50LmdldFNlYXJjaFJl c3VsdHModGhpcy5fc2VhcmNoSWRlbnRpZmllciwgMCwgdGhpcy5fbnVtYmVyT2ZTZWFyY2hSZXN1 bHRzLCBmdW5jdGlvbihlcnJvciwgbm9kZUlkZW50aWZpZXJzKSB7CisgICAgICAgICAgICBpZiAo ZXJyb3IpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgaWYgKHRoaXMuX3Nl YXJjaElkZW50aWZpZXIgIT09IHNlYXJjaElkZW50aWZpZXIpCisgICAgICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgICAgICBjb25zb2xlLmFzc2VydChub2RlSWRlbnRpZmllcnMubGVuZ3Ro ID09PSB0aGlzLl9udW1iZXJPZlNlYXJjaFJlc3VsdHMpOworCisgICAgICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IG5vZGVJZGVudGlmaWVycy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAg ICAgIHZhciBkb21Ob2RlID0gV2ViSW5zcGVjdG9yLmRvbVRyZWVNYW5hZ2VyLm5vZGVGb3JJZChu b2RlSWRlbnRpZmllcnNbaV0pOworICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGRvbU5v ZGUpOworICAgICAgICAgICAgICAgIGlmICghZG9tTm9kZSkKKyAgICAgICAgICAgICAgICAgICAg Y29udGludWU7CisKKyAgICAgICAgICAgICAgICB0aGlzLl9zZWFyY2hSZXN1bHROb2Rlcy5wdXNo KGRvbU5vZGUpOworCisgICAgICAgICAgICAgICAgdmFyIHRyZWVFbGVtZW50ID0gdGhpcy5fZG9t VHJlZU91dGxpbmUuZmluZFRyZWVFbGVtZW50KGRvbU5vZGUpOworICAgICAgICAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KHRyZWVFbGVtZW50KTsKKyAgICAgICAgICAgICAgICBpZiAodHJlZUVsZW1l bnQpCisgICAgICAgICAgICAgICAgICAgIHRyZWVFbGVtZW50LmhpZ2hsaWdodFNlYXJjaFJlc3Vs dHModGhpcy5fc2VhcmNoUXVlcnkpOworICAgICAgICAgICAgfQorICAgICAgICB9LmJpbmQodGhp cykpOworICAgIH0sCisKKyAgICBfaGlkZVNlYXJjaEhpZ2hsaWdodHM6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIGlmICghdGhpcy5fc2VhcmNoUmVzdWx0Tm9kZXMpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgdGhpcy5fc2VhcmNoUmVzdWx0Tm9kZXMuZm9yRWFjaChmdW5jdGlv bihkb21Ob2RlKSB7CisgICAgICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLl9kb21UcmVl T3V0bGluZS5maW5kVHJlZUVsZW1lbnQoZG9tTm9kZSk7CisgICAgICAgICAgICBpZiAodHJlZUVs ZW1lbnQpCisgICAgICAgICAgICAgICAgdHJlZUVsZW1lbnQuaGlkZVNlYXJjaEhpZ2hsaWdodHMo KTsKKyAgICAgICAgfSwgdGhpcyk7CisKKyAgICAgICAgZGVsZXRlIHRoaXMuX3NlYXJjaFJlc3Vs dE5vZGVzOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCmluZGV4IDM1MGE0MTguLjA1 Yjk5ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCkBAIC0xMjY2LDIyICsxMjY2LDIzIEBAIFdl Ykluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAKICAgICBfaGlnaGxpZ2h0 U2VhcmNoUmVzdWx0czogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9zZWFy Y2hRdWVyeSB8fCAhdGhpcy5fc2VhcmNoSGlnaGxpZ2h0c1Zpc2libGUpCisgICAgICAgIGlmICgh dGhpcy50aXRsZSB8fCAhdGhpcy5fc2VhcmNoUXVlcnkgfHwgIXRoaXMuX3NlYXJjaEhpZ2hsaWdo dHNWaXNpYmxlKQogICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIGlmICh0aGlzLl9oaWdo bGlnaHRSZXN1bHQpIHsKICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaEhpZ2hsaWdodCh0 cnVlKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHZhciB0ZXh0 ID0gdGhpcy5saXN0SXRlbUVsZW1lbnQudGV4dENvbnRlbnQ7Ci0gICAgICAgIHZhciByZWdleE9i amVjdCA9IGNyZWF0ZVBsYWluVGV4dFNlYXJjaFJlZ2V4KHRoaXMuX3NlYXJjaFF1ZXJ5LCAiZ2ki KTsKKyAgICAgICAgdmFyIHRleHQgPSB0aGlzLnRpdGxlLnRleHRDb250ZW50OworICAgICAgICB2 YXIgc2VhcmNoUmVnZXggPSBuZXcgUmVnRXhwKHRoaXMuX3NlYXJjaFF1ZXJ5LmVzY2FwZUZvclJl Z0V4cCgpLCAiZ2kiKTsKIAogICAgICAgICB2YXIgb2Zmc2V0ID0gMDsKLSAgICAgICAgdmFyIG1h dGNoID0gcmVnZXhPYmplY3QuZXhlYyh0ZXh0KTsKKyAgICAgICAgdmFyIG1hdGNoID0gc2VhcmNo UmVnZXguZXhlYyh0ZXh0KTsKICAgICAgICAgdmFyIG1hdGNoUmFuZ2VzID0gW107CiAgICAgICAg IHdoaWxlIChtYXRjaCkgewogICAgICAgICAgICAgbWF0Y2hSYW5nZXMucHVzaCh7IG9mZnNldDog bWF0Y2guaW5kZXgsIGxlbmd0aDogbWF0Y2hbMF0ubGVuZ3RoIH0pOwotICAgICAgICAgICAgbWF0 Y2ggPSByZWdleE9iamVjdC5leGVjKHRleHQpOworICAgICAgICAgICAgbWF0Y2ggPSBzZWFyY2hS ZWdleC5leGVjKHRleHQpOwogICAgICAgICB9CiAKICAgICAgICAgLy8gRmFsbCBiYWNrIGZvciBY UGF0aCwgZXRjLiBtYXRjaGVzLgpAQCAtMTI4OSw3ICsxMjkwLDcgQEAgV2ViSW5zcGVjdG9yLkRP TVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIG1hdGNoUmFuZ2VzLnB1c2go eyBvZmZzZXQ6IDAsIGxlbmd0aDogdGV4dC5sZW5ndGggfSk7CiAKICAgICAgICAgdGhpcy5faGln aGxpZ2h0UmVzdWx0ID0gW107Ci0gICAgICAgIGhpZ2hsaWdodFNlYXJjaFJlc3VsdHModGhpcy5s aXN0SXRlbUVsZW1lbnQsIG1hdGNoUmFuZ2VzLCB0aGlzLl9oaWdobGlnaHRSZXN1bHQpOworICAg ICAgICBXZWJJbnNwZWN0b3IuaGlnaGxpZ2h0UmFuZ2VzV2l0aFN0eWxlQ2xhc3ModGhpcy50aXRs ZSwgbWF0Y2hSYW5nZXMsICJoaWdobGlnaHRlZCIsIHRoaXMuX2hpZ2hsaWdodFJlc3VsdCk7CiAg ICAgfSwKIAogICAgIGhhbmRsZUV2ZW50OiBmdW5jdGlvbihldmVudCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNz cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRs aW5lLmNzcwppbmRleCBjNGMxZDkyLi5mNWM0NmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5jc3MKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuY3Nz CkBAIC0xNTgsMyArMTU4LDIyIEBAIGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZG9tLXRyZWUt b3V0bGluZTpmb2N1cyBsaS5zZWxlY3RlZCAuc2VsZWN0aW9uIHsKICAgICBtaW4td2lkdGg6IDEw MCU7CiAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOwogfQorCisuZG9tLXRyZWUtb3V0bGluZSAu aGlnaGxpZ2h0ZWQgeworICAgIGNvbG9yOiBibGFjazsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBy Z2JhKDIzNSwgMjE1LCAzOCwgMC4yKTsKKyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdi KDIzNywgMjAyLCA3MSk7Cit9CisKKy5kb20tdHJlZS1vdXRsaW5lIGxpLnNlbGVjdGVkIC5oaWdo bGlnaHRlZCwKKy5kb20tdHJlZS1vdXRsaW5lOmZvY3VzIGxpLnNlbGVjdGVkIC5oaWdobGlnaHRl ZCB7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiYSgyMzUsIDIxNSwgMzgsIDAuNyk7CisgICAg Ym9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigyMzcsIDIwMiwgMzEpOworfQorCisuZG9tLXRy ZWUtb3V0bGluZSAuaGlnaGxpZ2h0ZWQgLmhpZ2hsaWdodCB7CisgICAgYmFja2dyb3VuZC1jb2xv cjogcmdiKDI1NSwgMjMwLCAxNzkpOworICAgIGJvcmRlci1yYWRpdXM6IDRweDsKKyAgICBwYWRk aW5nLWJvdHRvbTogMnB4OworICAgIG1hcmdpbi1ib3R0b206IC0ycHg7Cit9Cg== 237932 2014-09-10 22:52:35 -0700 2014-09-11 11:36:21 -0700 [PATCH] Proposed Fix much-better.patch text/plain 14201 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU1MTM1M2UuLmQ0NjE4N2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUxIEBACiAyMDE0LTA5LTEwICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRE9NIFRy ZWUgc2VhcmNoIGhpZ2hsaWdodHMgYXJlIG5vdCBhcHBlYXJpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjY2MgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gcGVyZm9ybWluZyBhIHNlYXJjaCB3 aXRoaW4gdGhlIERPTVRyZWVDb250ZW50VmlldyBhbGwKKyAgICAgICAgc2VhcmNoIHJlc3VsdHMg c2hvdWxkIGltbWVkaWF0ZWx5IGhpZ2hsaWdodC4gV2hlbiBtb3ZpbmcKKyAgICAgICAgYmV0d2Vl biBzZWFyY2ggcmVzdWx0cywgZW1waGFzaXplIHRoZSBjdXJyZW50IHdpdGggYSBib3VuY3kuCisg ICAgICAgIFJlbWVtYmVyIHRvIHJlbW92ZSB0aGUgaGlnaGxpZ2h0cyB3aGVuIHRoZSBzZWFyY2gg aXMgY2hhbmdlZAorICAgICAgICBvciBjbGVhcmVkLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9N VHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5wZXJmb3JtU2VhcmNoLnNlYXJjaFJlc3VsdHNSZWFk eSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5z ZWFyY2hDbGVhcmVkKToKKyAgICAgICAgU2hvciBvciBoaWRlIGhpZ2hsaWdodHMgd2hlbiBzZWFy Y2hlcyBjaGFuZ2UuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlQ29udGVudFZpZXcu cHJvdG90eXBlLnJldmVhbFJlc3VsdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUNv bnRlbnRWaWV3LnByb3RvdHlwZS5fcmV2ZWFsU2VhcmNoUmVzdWx0KToKKyAgICAgICAgRW1waGFz aXplIHRoZSBoaWdobGlnaHQgd2hlbiBtb3ZpbmcgdG8gYSBuZXcgY3VycmVudCByZXN1bHQuCisK KyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlQ29udGVudFZpZXcucHJvdG90eXBlLl9zaG93 U2VhcmNoSGlnaGxpZ2h0cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRW aWV3LnByb3RvdHlwZS5faGlkZVNlYXJjaEhpZ2hsaWdodHMpOgorICAgICAgICBPbiBlYWNoIGFm ZmVjdGVkIERPTVRyZWVFbGVtZW50IHNob3cgb3IgaGlkZSBzZWFyY2ggaGlnaGxpZ2h0cy4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlLmVtcGhhc2l6ZVNlYXJjaEhp Z2hsaWdodC5hbmltYXRpb25FbmRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZUVs ZW1lbnQucHJvdG90eXBlLmVtcGhhc2l6ZVNlYXJjaEhpZ2hsaWdodCk6CisgICAgICAgIEdpdmUg YSBicmllZiBib3VuY3ktaGlnaGxpZ2h0IHdoZW4gdG9sZCB0byBlbXBoYXNpemUgdGhlIHNlYXJj aCBoaWdobGlnaHQuCisKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90 b3R5cGUudXBkYXRlVGl0bGUpOgorICAgICAgICBSZW1vdmUgdW51c2VkIGFuZCB1bm5lY2Vzc2Fy eSBzdHlsZSBjbGFzcyBvbiBlYWNoIHJvdy4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRy ZWVFbGVtZW50LnByb3RvdHlwZS5faGlnaGxpZ2h0U2VhcmNoUmVzdWx0cyk6CisgICAgICAgIFVw ZGF0ZSB0aGUgc3RhbGUgY29kZSB0byB1c2UgbmV3IGZ1bmN0aW9uIG5hbWVzIGFuZCBhY2Nlc3Nv cnMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzczoK KyAgICAgICAgKC5kb20tdHJlZS1vdXRsaW5lIC5zZWFyY2gtaGlnaGxpZ2h0KToKKyAgICAgICAg U3R5bGVzIGZvciB0aGUgc2VhcmNoIGhpZ2hsaWdodCBtYXRjaCBzZWFyY2ggaGlnaGxpZ2h0cyBp biB0aGUgc2lkZWJhci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTWFpbi5jc3M6 CisgICAgICAgICguYm91bmN5LWhpZ2hsaWdodCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9UZXh0RWRpdG9yLmNzczoKKyAgICAgICAgTW92ZSBib3VuY3ktaGlnaGxpZ2h0IHRvIE1h aW4uY3NzLgorCisyMDE0LTA5LTEwICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5j b20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IG9ic2N1cmUgRVNMaW50IHdhcm5pbmdz IGFuZCBza2lwIGRpcmVjdG9yaWVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzY2ODYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUNvbnRlbnRWaWV3LmpzCmluZGV4 IDA2MTdjNzMuLjkyY2ZkNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlQ29udGVudFZpZXcuanMKQEAgLTIw MCw4ICsyMDAsMTAgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5cGUg PSB7CiAgICAgICAgIGlmICh0aGlzLl9zZWFyY2hRdWVyeSA9PT0gcXVlcnkpCiAgICAgICAgICAg ICByZXR1cm47CiAKLSAgICAgICAgaWYgKHRoaXMuX3NlYXJjaElkZW50aWZpZXIpCisgICAgICAg IGlmICh0aGlzLl9zZWFyY2hJZGVudGlmaWVyKSB7CiAgICAgICAgICAgICBET01BZ2VudC5kaXNj YXJkU2VhcmNoUmVzdWx0cyh0aGlzLl9zZWFyY2hJZGVudGlmaWVyKTsKKyAgICAgICAgICAgIHRo aXMuX2hpZGVTZWFyY2hIaWdobGlnaHRzKCk7CisgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9z ZWFyY2hRdWVyeSA9IHF1ZXJ5OwogICAgICAgICB0aGlzLl9zZWFyY2hJZGVudGlmaWVyID0gbnVs bDsKQEAgLTIxOCw2ICsyMjAsOCBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZUNvbnRlbnRWaWV3LnBy b3RvdHlwZSA9IHsKIAogICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LkV2ZW50Lk51bWJlck9mU2VhcmNoUmVzdWx0c0RpZENo YW5nZSk7CiAKKyAgICAgICAgICAgIHRoaXMuX3Nob3dTZWFyY2hIaWdobGlnaHRzKCk7CisKICAg ICAgICAgICAgIGlmICh0aGlzLl9hdXRvbWF0aWNhbGx5UmV2ZWFsRmlyc3RTZWFyY2hSZXN1bHQp CiAgICAgICAgICAgICAgICAgdGhpcy5yZXZlYWxOZXh0U2VhcmNoUmVzdWx0KCk7CiAgICAgICAg IH0KQEAgLTIzOSw4ICsyNDMsMTAgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVDb250ZW50Vmlldy5w cm90b3R5cGUgPSB7CiAKICAgICBzZWFyY2hDbGVhcmVkOiBmdW5jdGlvbigpCiAgICAgewotICAg ICAgICBpZiAodGhpcy5fc2VhcmNoSWRlbnRpZmllcikKKyAgICAgICAgaWYgKHRoaXMuX3NlYXJj aElkZW50aWZpZXIpIHsKICAgICAgICAgICAgIERPTUFnZW50LmRpc2NhcmRTZWFyY2hSZXN1bHRz KHRoaXMuX3NlYXJjaElkZW50aWZpZXIpOworICAgICAgICAgICAgdGhpcy5faGlkZVNlYXJjaEhp Z2hsaWdodHMoKTsKKyAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX3NlYXJjaFF1ZXJ5ID0gbnVs bDsKICAgICAgICAgdGhpcy5fc2VhcmNoSWRlbnRpZmllciA9IG51bGw7CkBAIC0yOTksNiArMzA1 LDEwIEBAIFdlYkluc3BlY3Rvci5ET01UcmVlQ29udGVudFZpZXcucHJvdG90eXBlID0gewogICAg ICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgdGhpcy5fZG9tVHJlZU91dGxpbmUu c2VsZWN0RE9NTm9kZShkb21Ob2RlLCBjaGFuZ2VGb2N1cyk7CisKKyAgICAgICAgICAgIHZhciBz ZWxlY3RlZFRyZWVFbGVtZW50ID0gdGhpcy5fZG9tVHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxl bWVudDsKKyAgICAgICAgICAgIGlmIChzZWxlY3RlZFRyZWVFbGVtZW50KQorICAgICAgICAgICAg ICAgIHNlbGVjdGVkVHJlZUVsZW1lbnQuZW1waGFzaXplU2VhcmNoSGlnaGxpZ2h0KCk7CiAgICAg ICAgIH0KIAogICAgICAgICBET01BZ2VudC5nZXRTZWFyY2hSZXN1bHRzKHRoaXMuX3NlYXJjaElk ZW50aWZpZXIsIGluZGV4LCBpbmRleCArIDEsIHJldmVhbFJlc3VsdC5iaW5kKHRoaXMpKTsKQEAg LTQ0OSw1ICs0NTksNTIgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVDb250ZW50Vmlldy5wcm90b3R5 cGUgPSB7CiAgICAgX3RvZ2dsZVNob3dzU2hhZG93RE9NU2V0dGluZzogZnVuY3Rpb24oZXZlbnQp CiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NoYWRvd0RPTVNldHRpbmcudmFsdWUg PSAhV2ViSW5zcGVjdG9yLnNob3dTaGFkb3dET01TZXR0aW5nLnZhbHVlOworICAgIH0sCisKKyAg ICBfc2hvd1NlYXJjaEhpZ2hsaWdodHM6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHRoaXMuX3NlYXJjaElkZW50aWZpZXIpOworCisgICAgICAgIHRoaXMuX3NlYXJj aFJlc3VsdE5vZGVzID0gW107CisKKyAgICAgICAgdmFyIHNlYXJjaElkZW50aWZpZXIgPSB0aGlz Ll9zZWFyY2hJZGVudGlmaWVyOworCisgICAgICAgIERPTUFnZW50LmdldFNlYXJjaFJlc3VsdHMo dGhpcy5fc2VhcmNoSWRlbnRpZmllciwgMCwgdGhpcy5fbnVtYmVyT2ZTZWFyY2hSZXN1bHRzLCBm dW5jdGlvbihlcnJvciwgbm9kZUlkZW50aWZpZXJzKSB7CisgICAgICAgICAgICBpZiAoZXJyb3Ip CisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBpZiAodGhpcy5fc2VhcmNo SWRlbnRpZmllciAhPT0gc2VhcmNoSWRlbnRpZmllcikKKyAgICAgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KG5vZGVJZGVudGlmaWVycy5sZW5ndGggPT09 IHRoaXMuX251bWJlck9mU2VhcmNoUmVzdWx0cyk7CisKKyAgICAgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgbm9kZUlkZW50aWZpZXJzLmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICAgICAg dmFyIGRvbU5vZGUgPSBXZWJJbnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIubm9kZUZvcklkKG5vZGVJ ZGVudGlmaWVyc1tpXSk7CisgICAgICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoZG9tTm9kZSk7 CisgICAgICAgICAgICAgICAgaWYgKCFkb21Ob2RlKQorICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKKworICAgICAgICAgICAgICAgIHRoaXMuX3NlYXJjaFJlc3VsdE5vZGVzLnB1c2goZG9t Tm9kZSk7CisKKyAgICAgICAgICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLl9kb21UcmVl T3V0bGluZS5maW5kVHJlZUVsZW1lbnQoZG9tTm9kZSk7CisgICAgICAgICAgICAgICAgY29uc29s ZS5hc3NlcnQodHJlZUVsZW1lbnQpOworICAgICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudCkK KyAgICAgICAgICAgICAgICAgICAgdHJlZUVsZW1lbnQuaGlnaGxpZ2h0U2VhcmNoUmVzdWx0cyh0 aGlzLl9zZWFyY2hRdWVyeSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0uYmluZCh0aGlzKSk7 CisgICAgfSwKKworICAgIF9oaWRlU2VhcmNoSGlnaGxpZ2h0czogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgaWYgKCF0aGlzLl9zZWFyY2hSZXN1bHROb2RlcykKKyAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICB0aGlzLl9zZWFyY2hSZXN1bHROb2Rlcy5mb3JFYWNoKGZ1bmN0aW9uKGRv bU5vZGUpIHsKKyAgICAgICAgICAgIHZhciB0cmVlRWxlbWVudCA9IHRoaXMuX2RvbVRyZWVPdXRs aW5lLmZpbmRUcmVlRWxlbWVudChkb21Ob2RlKTsKKyAgICAgICAgICAgIGlmICh0cmVlRWxlbWVu dCkKKyAgICAgICAgICAgICAgICB0cmVlRWxlbWVudC5oaWRlU2VhcmNoSGlnaGxpZ2h0cygpOwor ICAgICAgICB9LCB0aGlzKTsKKworICAgICAgICBkZWxldGUgdGhpcy5fc2VhcmNoUmVzdWx0Tm9k ZXM7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKaW5kZXggZjQ0MmNkNC4uNDI5OWMy MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RE9NVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKQEAgLTU4LDYgKzU4LDkgQEAgV2ViSW5zcGVjdG9y LkRPTVRyZWVFbGVtZW50LkVkaXRUYWdCbGFja2xpc3QgPSBbCiAgICAgImh0bWwiLCAiaGVhZCIs ICJib2R5IgogXS5rZXlTZXQoKTsKIAorV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LlNlYXJj aEhpZ2hsaWdodFN0eWxlQ2xhc3NOYW1lID0gInNlYXJjaC1oaWdobGlnaHQiOworV2ViSW5zcGVj dG9yLkRPTVRyZWVFbGVtZW50LkJvdW5jeUhpZ2hsaWdodFN0eWxlQ2xhc3NOYW1lID0gImJvdW5j eS1oaWdobGlnaHQiOworCiBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlID0g ewogICAgIGlzQ2xvc2VUYWc6IGZ1bmN0aW9uKCkKICAgICB7CkBAIC04Miw2ICs4NSwzOSBAQCBX ZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91 cGRhdGVTZWFyY2hIaWdobGlnaHQoZmFsc2UpOwogICAgIH0sCiAKKyAgICBlbXBoYXNpemVTZWFy Y2hIaWdobGlnaHQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBoaWdobGlnaHRFbGVt ZW50ID0gdGhpcy50aXRsZS5xdWVyeVNlbGVjdG9yKCIuIiArIFdlYkluc3BlY3Rvci5ET01UcmVl RWxlbWVudC5TZWFyY2hIaWdobGlnaHRTdHlsZUNsYXNzTmFtZSk7CisgICAgICAgIGNvbnNvbGUu YXNzZXJ0KGhpZ2hsaWdodEVsZW1lbnQpOworICAgICAgICBpZiAoIWhpZ2hsaWdodEVsZW1lbnQp CisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKHRoaXMuX2JvdW5jeUhpZ2hsaWdo dEVsZW1lbnQpCisgICAgICAgICAgICB0aGlzLl9ib3VuY3lIaWdobGlnaHRFbGVtZW50LnJlbW92 ZSgpOworCisgICAgICAgIHRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgdGhpcy5fYm91bmN5SGlnaGxpZ2h0RWxlbWVu dC5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQuQm91bmN5SGlnaGxpZ2h0 U3R5bGVDbGFzc05hbWU7CisgICAgICAgIHRoaXMuX2JvdW5jeUhpZ2hsaWdodEVsZW1lbnQudGV4 dENvbnRlbnQgPSBoaWdobGlnaHRFbGVtZW50LnRleHRDb250ZW50OworCisgICAgICAgIC8vIFBv c2l0aW9uIGFuZCBzaG93IHRoZSBib3VuY3kgaGlnaGxpZ2h0IGFkanVzdGluZyB0aGUgY29vcmRp bmF0ZXMgdG8gYmUgaW5zaWRlIHRoZSBUcmVlT3V0bGluZSdzIHNwYWNlLgorICAgICAgICB2YXIg aGlnaGxpZ2h0RWxlbWVudFJlY3QgPSBoaWdobGlnaHRFbGVtZW50LmdldEJvdW5kaW5nQ2xpZW50 UmVjdCgpOworICAgICAgICB2YXIgdHJlZU91dGxpbmVSZWN0ID0gdGhpcy50cmVlT3V0bGluZS5l bGVtZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgICAgICB0aGlzLl9ib3VuY3lIaWdo bGlnaHRFbGVtZW50LnN0eWxlLnRvcCA9IChoaWdobGlnaHRFbGVtZW50UmVjdC50b3AgLSB0cmVl T3V0bGluZVJlY3QudG9wKSArICJweCI7CisgICAgICAgIHRoaXMuX2JvdW5jeUhpZ2hsaWdodEVs ZW1lbnQuc3R5bGUubGVmdCA9IChoaWdobGlnaHRFbGVtZW50UmVjdC5sZWZ0IC0gdHJlZU91dGxp bmVSZWN0LmxlZnQpICsgInB4IjsKKyAgICAgICAgdGhpcy50aXRsZS5hcHBlbmRDaGlsZCh0aGlz Ll9ib3VuY3lIaWdobGlnaHRFbGVtZW50KTsKKworICAgICAgICBmdW5jdGlvbiBhbmltYXRpb25F bmRlZCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICghdGhpcy5fYm91bmN5SGlnaGxpZ2h0 RWxlbWVudCkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIHRoaXMuX2Jv dW5jeUhpZ2hsaWdodEVsZW1lbnQucmVtb3ZlKCk7CisgICAgICAgICAgICBkZWxldGUgdGhpcy5f Ym91bmN5SGlnaGxpZ2h0RWxlbWVudDsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX2JvdW5j eUhpZ2hsaWdodEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigid2Via2l0QW5pbWF0aW9uRW5kIiwg YW5pbWF0aW9uRW5kZWQuYmluZCh0aGlzKSk7CisgICAgfSwKKwogICAgIF91cGRhdGVTZWFyY2hI aWdobGlnaHQ6IGZ1bmN0aW9uKHNob3cpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX2hpZ2hs aWdodFJlc3VsdCkKQEAgLTk4NiwxMCArMTAyMiw4IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxl bWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBpZiAodGhpcy5faGlnaGxpZ2h0UmVzdWx0 KQogICAgICAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlYXJjaEhpZ2hsaWdodChmYWxzZSk7CiAg ICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB2YXIgaGlnaGxpZ2h0RWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgICAgIGhpZ2hsaWdodEVsZW1lbnQu Y2xhc3NOYW1lID0gImhpZ2hsaWdodCI7Ci0gICAgICAgICAgICBoaWdobGlnaHRFbGVtZW50LmFw cGVuZENoaWxkKHRoaXMuX25vZGVUaXRsZUluZm8oKS50aXRsZURPTSk7Ci0gICAgICAgICAgICB0 aGlzLnRpdGxlID0gaGlnaGxpZ2h0RWxlbWVudDsKKyAgICAgICAgICAgIHRoaXMudGl0bGUgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgICAgICB0aGlzLnRpdGxlLmFw cGVuZENoaWxkKHRoaXMuX25vZGVUaXRsZUluZm8oKS50aXRsZURPTSk7CiAgICAgICAgICAgICBk ZWxldGUgdGhpcy5faGlnaGxpZ2h0UmVzdWx0OwogICAgICAgICB9CiAKQEAgLTEyNzAsMjIgKzEz MDQsMjMgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKIAogICAg IF9oaWdobGlnaHRTZWFyY2hSZXN1bHRzOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBpZiAo IXRoaXMuX3NlYXJjaFF1ZXJ5IHx8ICF0aGlzLl9zZWFyY2hIaWdobGlnaHRzVmlzaWJsZSkKKyAg ICAgICAgaWYgKCF0aGlzLnRpdGxlIHx8ICF0aGlzLl9zZWFyY2hRdWVyeSB8fCAhdGhpcy5fc2Vh cmNoSGlnaGxpZ2h0c1Zpc2libGUpCiAgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgaWYg KHRoaXMuX2hpZ2hsaWdodFJlc3VsdCkgewogICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2VhcmNo SGlnaGxpZ2h0KHRydWUpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAg ICAgdmFyIHRleHQgPSB0aGlzLmxpc3RJdGVtRWxlbWVudC50ZXh0Q29udGVudDsKLSAgICAgICAg dmFyIHJlZ2V4T2JqZWN0ID0gY3JlYXRlUGxhaW5UZXh0U2VhcmNoUmVnZXgodGhpcy5fc2VhcmNo UXVlcnksICJnaSIpOworICAgICAgICB2YXIgdGV4dCA9IHRoaXMudGl0bGUudGV4dENvbnRlbnQ7 CisgICAgICAgIHZhciBzZWFyY2hSZWdleCA9IG5ldyBSZWdFeHAodGhpcy5fc2VhcmNoUXVlcnku ZXNjYXBlRm9yUmVnRXhwKCksICJnaSIpOwogCiAgICAgICAgIHZhciBvZmZzZXQgPSAwOwotICAg ICAgICB2YXIgbWF0Y2ggPSByZWdleE9iamVjdC5leGVjKHRleHQpOworICAgICAgICB2YXIgbWF0 Y2ggPSBzZWFyY2hSZWdleC5leGVjKHRleHQpOwogICAgICAgICB2YXIgbWF0Y2hSYW5nZXMgPSBb XTsKICAgICAgICAgd2hpbGUgKG1hdGNoKSB7CiAgICAgICAgICAgICBtYXRjaFJhbmdlcy5wdXNo KHsgb2Zmc2V0OiBtYXRjaC5pbmRleCwgbGVuZ3RoOiBtYXRjaFswXS5sZW5ndGggfSk7Ci0gICAg ICAgICAgICBtYXRjaCA9IHJlZ2V4T2JqZWN0LmV4ZWModGV4dCk7CisgICAgICAgICAgICBtYXRj aCA9IHNlYXJjaFJlZ2V4LmV4ZWModGV4dCk7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBGYWxs IGJhY2sgZm9yIFhQYXRoLCBldGMuIG1hdGNoZXMuCkBAIC0xMjkzLDcgKzEzMjgsNyBAQCBXZWJJ bnNwZWN0b3IuRE9NVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgbWF0Y2hS YW5nZXMucHVzaCh7IG9mZnNldDogMCwgbGVuZ3RoOiB0ZXh0Lmxlbmd0aCB9KTsKIAogICAgICAg ICB0aGlzLl9oaWdobGlnaHRSZXN1bHQgPSBbXTsKLSAgICAgICAgaGlnaGxpZ2h0U2VhcmNoUmVz dWx0cyh0aGlzLmxpc3RJdGVtRWxlbWVudCwgbWF0Y2hSYW5nZXMsIHRoaXMuX2hpZ2hsaWdodFJl c3VsdCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5oaWdobGlnaHRSYW5nZXNXaXRoU3R5bGVDbGFz cyh0aGlzLnRpdGxlLCBtYXRjaFJhbmdlcywgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LlNl YXJjaEhpZ2hsaWdodFN0eWxlQ2xhc3NOYW1lLCB0aGlzLl9oaWdobGlnaHRSZXN1bHQpOwogICAg IH0sCiAKICAgICBoYW5kbGVFdmVudDogZnVuY3Rpb24oZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5jc3Mg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGlu ZS5jc3MKaW5kZXggYzRjMWQ5Mi4uZTY3ZTk1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuY3NzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzcwpA QCAtMTU4LDMgKzE1OCw5IEBAIGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZG9tLXRyZWUtb3V0 bGluZTpmb2N1cyBsaS5zZWxlY3RlZCAuc2VsZWN0aW9uIHsKICAgICBtaW4td2lkdGg6IDEwMCU7 CiAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOwogfQorCisuZG9tLXRyZWUtb3V0bGluZSAuc2Vh cmNoLWhpZ2hsaWdodCB7CisgICAgY29sb3I6IGJsYWNrOworICAgIGJhY2tncm91bmQtY29sb3I6 IHJnYmEoMjM1LCAyMTUsIDM4LCAwLjIpOworICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCBy Z2IoMjM3LCAyMDIsIDcxKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL01haW4uY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTWFpbi5jc3MKaW5kZXggZDU3MTMzZS4uYWNhMzllZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWFpbi5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWFpbi5jc3MKQEAg LTI5MCwzICsyOTAsNTAgQEAgYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5ICNzcGxpdC1jb250ZW50 LWJyb3dzZXIgPiAubmF2aWdhdGlvbi1iYXIgewogLnZhbHVlLXdpdGgtY2xhcmlmaWNhdGlvbiAu Y2xhcmlmaWNhdGlvbiB7CiAgICAgY29sb3I6ICM2NjY7CiB9CisKKy5ib3VuY3ktaGlnaGxpZ2h0 IHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgei1pbmRleDogMTAwOworCisgICAgYm94 LXNoYWRvdzogaW5zZXQgcmdiKDI1MCwgMjMyLCAxNDApIDAgLTFweCAwLCByZ2JhKDIxMSwgMTk3 LCA5NiwgMSkgMCAxcHggMXB4LCByZ2JhKDAsIDAsIDAsIDAuMzMpIDAgMXB4IDJweCAxcHg7Cisg ICAgdGV4dC1zaGFkb3c6IHdoaXRlIDAgMCAycHg7CisKKyAgICBiYWNrZ3JvdW5kOiBsaW5lYXIt Z3JhZGllbnQodG8gYm90dG9tLCByZ2IoMjUwLCAyMzcsIDEwOCksIHJnYigyNDIsIDIyMCwgMTAw KSk7CisgICAgYm9yZGVyLXJhZGl1czogN3B4OworCisgICAgcGFkZGluZzogMnB4IDRweDsKKyAg ICBtYXJnaW4tdG9wOiAtMnB4OworICAgIG1hcmdpbi1sZWZ0OiAtNHB4OworCisgICAgLXdlYmtp dC11c2VyLXNlbGVjdDogbm9uZTsKKyAgICBwb2ludGVyLWV2ZW50czogbm9uZTsKKworICAgIC13 ZWJraXQtYW5pbWF0aW9uLW5hbWU6IGJvdW5jeS1oaWdobGlnaHQtYW5pbWF0aW9uOworICAgIC13 ZWJraXQtYW5pbWF0aW9uLWR1cmF0aW9uOiA3NTBtczsKKyAgICAtd2Via2l0LWFuaW1hdGlvbi10 aW1pbmctZnVuY3Rpb246IGVhc2UtaW4tb3V0OworCisgICAgb3BhY2l0eTogMDsKK30KKworQC13 ZWJraXQta2V5ZnJhbWVzIGJvdW5jeS1oaWdobGlnaHQtYW5pbWF0aW9uIHsKKyAgICAwJSB7Cisg ICAgICAgIC13ZWJraXQtdHJhbnNmb3JtOiBzY2FsZSgxKTsKKyAgICAgICAgb3BhY2l0eTogMTsK KyAgICB9CisKKyAgICAxMi41JSB7CisgICAgICAgIC13ZWJraXQtdHJhbnNmb3JtOiBzY2FsZSgx LjI1KTsKKyAgICB9CisKKyAgICAyNSUgeworICAgICAgICAtd2Via2l0LXRyYW5zZm9ybTogc2Nh bGUoMSk7CisgICAgfQorCisgICAgNjIuNSUgeworICAgICAgICBvcGFjaXR5OiAxOworICAgIH0K KworICAgIDEwMCUgeworICAgICAgICBvcGFjaXR5OiAwOworICAgIH0KK30KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRFZGl0b3IuY3Nz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5j c3MKaW5kZXggMTFiMjNhZS4uNmU2ODU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5jc3MKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dEVkaXRvci5jc3MKQEAgLTEwMiw1MyAr MTAyLDYgQEAKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjE3LCAyMzQsIDIwOCkgIWltcG9y dGFudDsKIH0KIAotLnRleHQtZWRpdG9yIC5ib3VuY3ktaGlnaGxpZ2h0IHsKLSAgICBwb3NpdGlv bjogYWJzb2x1dGU7Ci0gICAgei1pbmRleDogMTAwOwotCi0gICAgYm94LXNoYWRvdzogaW5zZXQg cmdiKDI1MCwgMjMyLCAxNDApIDAgLTFweCAwLCByZ2JhKDIxMSwgMTk3LCA5NiwgMSkgMCAxcHgg MXB4LCByZ2JhKDAsIDAsIDAsIDAuMzMpIDAgMXB4IDJweCAxcHg7Ci0gICAgdGV4dC1zaGFkb3c6 IHdoaXRlIDAgMCAycHg7Ci0KLSAgICBiYWNrZ3JvdW5kOiBsaW5lYXItZ3JhZGllbnQodG8gYm90 dG9tLCByZ2IoMjUwLCAyMzcsIDEwOCksIHJnYigyNDIsIDIyMCwgMTAwKSk7Ci0gICAgYm9yZGVy LXJhZGl1czogN3B4OwotCi0gICAgcGFkZGluZzogMnB4IDRweDsKLSAgICBtYXJnaW4tdG9wOiAt MnB4OwotICAgIG1hcmdpbi1sZWZ0OiAtNHB4OwotCi0gICAgLXdlYmtpdC11c2VyLXNlbGVjdDog bm9uZTsKLSAgICBwb2ludGVyLWV2ZW50czogbm9uZTsKLQotICAgIC13ZWJraXQtYW5pbWF0aW9u LW5hbWU6IHRleHQtZWRpdG9yLWJvdW5jeTsKLSAgICAtd2Via2l0LWFuaW1hdGlvbi1kdXJhdGlv bjogNzUwbXM7Ci0gICAgLXdlYmtpdC1hbmltYXRpb24tdGltaW5nLWZ1bmN0aW9uOiBlYXNlLWlu LW91dDsKLQotICAgIG9wYWNpdHk6IDA7Ci19Ci0KLUAtd2Via2l0LWtleWZyYW1lcyB0ZXh0LWVk aXRvci1ib3VuY3kgewotICAgIDAlIHsKLSAgICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHNjYWxl KDEpOwotICAgICAgICBvcGFjaXR5OiAxOwotICAgIH0KLQotICAgIDEyLjUlIHsKLSAgICAgICAg LXdlYmtpdC10cmFuc2Zvcm06IHNjYWxlKDEuMjUpOwotICAgIH0KLQotICAgIDI1JSB7Ci0gICAg ICAgIC13ZWJraXQtdHJhbnNmb3JtOiBzY2FsZSgxKTsKLSAgICB9Ci0KLSAgICA2Mi41JSB7Ci0g ICAgICAgIG9wYWNpdHk6IDE7Ci0gICAgfQotCi0gICAgMTAwJSB7Ci0gICAgICAgIG9wYWNpdHk6 IDA7Ci0gICAgfQotfQotCiAudGV4dC1lZGl0b3IgPiAuQ29kZU1pcnJvciAuaGlnaGxpZ2h0ZWQg ewogICAgIC13ZWJraXQtYW5pbWF0aW9uOiAidGV4dC1lZGl0b3ItaGlnaGxpZ2h0LWZhZGVvdXQi IDJzOwogfQo=