152014 2015-12-08 14:22:18 -0800 Web Inspector: Add a hidden property to TreeOutline 2015-12-08 16:05:09 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1147476 0 mattbaker 2015-12-08 14:22:18 -0800 * SUMMARY Add a hidden property to TreeOutline. Currently it's stored in the DOM only, in the form of a CSS class. 1147477 1 webkit-bug-importer 2015-12-08 14:22:37 -0800 <rdar://problem/23809742> 1147478 2 266940 mattbaker 2015-12-08 14:25:45 -0800 Created attachment 266940 [Patch] Proposed Fix 1147485 3 266940 timothy 2015-12-08 15:04:28 -0800 Comment on attachment 266940 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=266940&action=review > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:68 > + this.element.classList.toggle("hidden", this._hidden); We can actually switch to using the "hidden" property on DOM elements: this.hidden = this._hidden; 1147489 4 mattbaker 2015-12-08 15:08:46 -0800 (In reply to comment #3) > Comment on attachment 266940 [details] > [Patch] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=266940&action=review > > > Source/WebInspectorUI/UserInterface/Views/TreeOutline.js:68 > > + this.element.classList.toggle("hidden", this._hidden); > > We can actually switch to using the "hidden" property on DOM elements: > this.hidden = this._hidden; Neat, I'll change it and file another bug for doing a find/replace on our other uses of "hidden". 1147492 5 266944 mattbaker 2015-12-08 15:17:12 -0800 Created attachment 266944 [Patch] Proposed Fix 1147514 6 266944 commit-queue 2015-12-08 16:05:06 -0800 Comment on attachment 266944 [Patch] Proposed Fix Clearing flags on attachment: 266944 Committed r193791: <http://trac.webkit.org/changeset/193791> 1147515 7 commit-queue 2015-12-08 16:05:09 -0800 All reviewed patches have been landed. Closing bug. 266940 2015-12-08 14:25:45 -0800 2015-12-08 15:17:10 -0800 [Patch] Proposed Fix bug-152014-20151208142514.patch text/plain 7891 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTkzNzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 ZTEzYTI0ZjgzODY5Y2QzODUxMmU0NTdmY2E3ZWZiZTQ5Yzk5YjI5Li5iZjVjZjhjMDFmZGMwYWQx YTNkZTMyNjgzMTc3Y2RlNjFiZTNiMDNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyOCBAQAogMjAxNS0xMi0wOCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGEgaGlkZGVuIHByb3BlcnR5IHRvIFRyZWVP dXRsaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTIwMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qczoKKyAgICAgICAg UmVtb3ZlZCBzdGF0aWMgcHJvcGVydHkgZm9yICJoaWRkZW4iIENTUyBjbGFzcy4gTW92ZWQgdG8g VHJlZU91dGxpbmUuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5l bC5wcm90b3R5cGUuc2V0IGNvbnRlbnRUcmVlT3V0bGluZSk6CisgICAgICAgIEZpeGVkIGJ1ZyBp biBvcmRlciBvZiB2aXNpYmxlVHJlZU91dGxpbmVzIGFkZC9yZW1vdmUuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuY3JlYXRlQ29udGVudFRy ZWVPdXRsaW5lKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRl YmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZS5f Y2hhbmdlVmlld01vZGUpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0 bGluZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUucHJvdG90eXBlLmdldCBoaWRkZW4pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lLnByb3RvdHlwZS5zZXQgaGlkZGVuKToKKyAgICAgICAg QWRkZWQgaGlkZGVuIHByb3BlcnR5LCB0b2dnbGVzIENTUyBjbGFzcy4KKworMjAxNS0xMi0wOCAg TWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3Rv cjogR2xvYmFsIEJyZWFrcG9pbnRzIHNob3VsZCBhbHdheXMgYmUgdmlzaWJsZQogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMDY2CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25T aWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCmluZGV4IDVhZDNkZDY5ZDhiOGQzMjVmNzlkNmJi YjhlZTdmZDU2MGIzOTM5NDYuLjY4MTlmZGQ5YzllNjY4OWE2MmFlM2ViZTRkMGExNDc5MjlmMDE0 M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwpAQCAtMTEzLDEzICsx MTMsMTQgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBOYXZp Z2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAgaWYgKCFuZXdUcmVlT3V0 bGluZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAodGhpcy5fY29udGVudFRy ZWVPdXRsaW5lKQotICAgICAgICAgICAgdGhpcy5fY29udGVudFRyZWVPdXRsaW5lLmVsZW1lbnQu Y2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5Db250ZW50 VHJlZU91dGxpbmVFbGVtZW50SGlkZGVuU3R5bGVDbGFzc05hbWUpOworICAgICAgICBpZiAodGhp cy5fY29udGVudFRyZWVPdXRsaW5lKSB7CisgICAgICAgICAgICB0aGlzLl9jb250ZW50VHJlZU91 dGxpbmUuaGlkZGVuID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuX3Zpc2libGVDb250ZW50VHJl ZU91dGxpbmVzLmRlbGV0ZSh0aGlzLl9jb250ZW50VHJlZU91dGxpbmUpOworICAgICAgICB9CiAK ICAgICAgICAgdGhpcy5fY29udGVudFRyZWVPdXRsaW5lID0gbmV3VHJlZU91dGxpbmU7Ci0gICAg ICAgIHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZS5lbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoV2Vi SW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwuQ29udGVudFRyZWVPdXRsaW5lRWxlbWVu dEhpZGRlblN0eWxlQ2xhc3NOYW1lKTsKKyAgICAgICAgdGhpcy5fY29udGVudFRyZWVPdXRsaW5l LmhpZGRlbiA9IGZhbHNlOwogCi0gICAgICAgIHRoaXMuX3Zpc2libGVDb250ZW50VHJlZU91dGxp bmVzLmRlbGV0ZSh0aGlzLl9jb250ZW50VHJlZU91dGxpbmUpOwogICAgICAgICB0aGlzLl92aXNp YmxlQ29udGVudFRyZWVPdXRsaW5lcy5hZGQobmV3VHJlZU91dGxpbmUpOwogCiAgICAgICAgIHRo aXMuX3VwZGF0ZUZpbHRlcigpOwpAQCAtMTU2LDE0ICsxNTcsMTIgQEAgV2ViSW5zcGVjdG9yLk5h dmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVu ZHMgV2ViSW4KIAogICAgIGNyZWF0ZUNvbnRlbnRUcmVlT3V0bGluZShkb250SGlkZUJ5RGVmYXVs dCwgc3VwcHJlc3NGaWx0ZXJpbmcpCiAgICAgewotICAgICAgICB2YXIgY29udGVudFRyZWVPdXRs aW5lRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7Ci0gICAgICAgIGNvbnRl bnRUcmVlT3V0bGluZUVsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25T aWRlYmFyUGFuZWwuQ29udGVudFRyZWVPdXRsaW5lRWxlbWVudFN0eWxlQ2xhc3NOYW1lOwotICAg ICAgICBpZiAoIWRvbnRIaWRlQnlEZWZhdWx0KQotICAgICAgICAgICAgY29udGVudFRyZWVPdXRs aW5lRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBh bmVsLkNvbnRlbnRUcmVlT3V0bGluZUVsZW1lbnRIaWRkZW5TdHlsZUNsYXNzTmFtZSk7Ci0gICAg ICAgIHRoaXMuY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoY29udGVudFRyZWVPdXRsaW5lRWxl bWVudCk7Ci0KLSAgICAgICAgdmFyIGNvbnRlbnRUcmVlT3V0bGluZSA9IG5ldyBXZWJJbnNwZWN0 b3IuVHJlZU91dGxpbmUoY29udGVudFRyZWVPdXRsaW5lRWxlbWVudCk7CisgICAgICAgIGxldCBj b250ZW50VHJlZU91dGxpbmUgPSBuZXcgV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lKGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoIm9sIikpOwogICAgICAgICBjb250ZW50VHJlZU91dGxpbmUuYWxsb3dz UmVwZWF0U2VsZWN0aW9uID0gdHJ1ZTsKKyAgICAgICAgY29udGVudFRyZWVPdXRsaW5lLmhpZGRl biA9ICFkb250SGlkZUJ5RGVmYXVsdDsKKyAgICAgICAgY29udGVudFRyZWVPdXRsaW5lLmVsZW1l bnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5Db250 ZW50VHJlZU91dGxpbmVFbGVtZW50U3R5bGVDbGFzc05hbWUpOworCisgICAgICAgIHRoaXMuY29u dGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoY29udGVudFRyZWVPdXRsaW5lLmVsZW1lbnQpOwogCiAg ICAgICAgIGlmICghc3VwcHJlc3NGaWx0ZXJpbmcpIHsKICAgICAgICAgICAgIGNvbnRlbnRUcmVl T3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5FdmVudC5F bGVtZW50QWRkZWQsIHRoaXMuX3RyZWVFbGVtZW50QWRkZWRPckNoYW5nZWQsIHRoaXMpOwpAQCAt NzM0LDcgKzczMyw2IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLldhc0V4 cGFuZGVkRHVyaW5nRmlsdGVyaW5nU3ltYm9sID0gU3ltYm9sKCJ3CiAKIFdlYkluc3BlY3Rvci5O YXZpZ2F0aW9uU2lkZWJhclBhbmVsLk92ZXJmbG93U2hhZG93RWxlbWVudFN0eWxlQ2xhc3NOYW1l ID0gIm92ZXJmbG93LXNoYWRvdyI7CiBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5l bC5Ub3BPdmVyZmxvd1NoYWRvd0VsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJ0b3AiOwotV2ViSW5z cGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwuQ29udGVudFRyZWVPdXRsaW5lRWxlbWVudEhp ZGRlblN0eWxlQ2xhc3NOYW1lID0gImhpZGRlbiI7CiBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5Db250ZW50VHJlZU91dGxpbmVFbGVtZW50U3R5bGVDbGFzc05hbWUgPSAibmF2 aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIjsKIFdlYkluc3BlY3Rv ci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLkhpZGVEaXNjbG9zdXJlQnV0dG9uc1N0eWxlQ2xhc3NO YW1lID0gImhpZGUtZGlzY2xvc3VyZS1idXR0b25zIjsKIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9u U2lkZWJhclBhbmVsLkVtcHR5Q29udGVudFBsYWNlaG9sZGVyRWxlbWVudFN0eWxlQ2xhc3NOYW1l ID0gImVtcHR5LWNvbnRlbnQtcGxhY2Vob2xkZXIiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQ YW5lbC5qcwppbmRleCBlMzQ0YTFlZjVjYjZiODYxNmY1Yzc4ZmVjNjkyZjAxNWVmZWU5ZTZmLi4z MDc0NjE2YmZmMjI4Y2I4NzAzZDZjNzAxMzRhMGJiMjNlMjU3MWUzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5l bC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVNpZGViYXJQYW5lbC5qcwpAQCAtNjEsNyArNjEsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVTaWRlYmFyUGFuZWwgPSBjbGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYklu c3BlYwogICAgICAgICB0aGlzLl9yZWNvcmRpbmdUcmVlRWxlbWVudE1hcCA9IG5ldyBNYXA7CiAg ICAgICAgIHRoaXMuX3JlY29yZGluZ3NUcmVlT3V0bGluZSA9IHRoaXMuY3JlYXRlQ29udGVudFRy ZWVPdXRsaW5lKHRydWUsIHRydWUpOwogICAgICAgICB0aGlzLl9yZWNvcmRpbmdzVHJlZU91dGxp bmUuZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBh bmVsLkhpZGVEaXNjbG9zdXJlQnV0dG9uc1N0eWxlQ2xhc3NOYW1lKTsKLSAgICAgICAgdGhpcy5f cmVjb3JkaW5nc1RyZWVPdXRsaW5lLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3Iu TmF2aWdhdGlvblNpZGViYXJQYW5lbC5Db250ZW50VHJlZU91dGxpbmVFbGVtZW50SGlkZGVuU3R5 bGVDbGFzc05hbWUpOworICAgICAgICB0aGlzLl9yZWNvcmRpbmdzVHJlZU91dGxpbmUuaGlkZGVu ID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nc1RyZWVPdXRsaW5lLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lLkV2ZW50LlNlbGVjdGlvbkRpZENoYW5nZSwg dGhpcy5fcmVjb3JkaW5nc1RyZWVTZWxlY3Rpb25EaWRDaGFuZ2UsIHRoaXMpOwogICAgICAgICB0 aGlzLl90aW1lbGluZXNDb250ZW50Q29udGFpbmVyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9y ZWNvcmRpbmdzVHJlZU91dGxpbmUuZWxlbWVudCk7CiAKQEAgLTkzMCwxMCArOTMwLDEwIEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCA9IGNsYXNzIFRpbWVsaW5lU2lkZWJhclBh bmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgIHRoaXMuX3ZpZXdNb2RlTmF2aWdhdGlvbkJh ci5zZWxlY3RlZE5hdmlnYXRpb25JdGVtID0gdGhpcy5fdmlld01vZGU7CiAKICAgICAgICAgaWYg KHRoaXMuX3ZpZXdNb2RlID09PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuVmll d01vZGUuVGltZWxpbmVzKSB7Ci0gICAgICAgICAgICB0aGlzLl90aW1lbGluZXNUcmVlT3V0bGlu ZS5lbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFy UGFuZWwuQ29udGVudFRyZWVPdXRsaW5lRWxlbWVudEhpZGRlblN0eWxlQ2xhc3NOYW1lKTsKKyAg ICAgICAgICAgIHRoaXMuX3RpbWVsaW5lc1RyZWVPdXRsaW5lLmhpZGRlbiA9IGZhbHNlOwogICAg ICAgICAgICAgdGhpcy5fZnJhbWVTZWxlY3Rpb25DaGFydFNlY3Rpb24uY29sbGFwc2VkID0gdHJ1 ZTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5lc1RyZWVPdXRs aW5lLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQ YW5lbC5Db250ZW50VHJlZU91dGxpbmVFbGVtZW50SGlkZGVuU3R5bGVDbGFzc05hbWUpOworICAg ICAgICAgICAgdGhpcy5fdGltZWxpbmVzVHJlZU91dGxpbmUuaGlkZGVuID0gdHJ1ZTsKICAgICAg ICAgICAgIHRoaXMuX2ZyYW1lU2VsZWN0aW9uQ2hhcnRTZWN0aW9uLmNvbGxhcHNlZCA9IGZhbHNl OwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKaW5kZXggYjE1OGUxNTY3NmY3OTVkNjc2ZTNm ZDFlNGY1ZGEwMjZmMjllYjVlYS4uNzQwNDc5Y2Q2YWQwY2EwYTYxM2U4NWJiZGU4NThmODFkNTMw YmVkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVHJlZU91dGxpbmUuanMKQEAgLTQ2LDEyICs0NiwyNyBAQCBXZWJJbnNwZWN0b3Iu VHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmpl Y3QKICAgICAgICAgdGhpcy5leHBhbmRlZCA9IHRydWU7CiAgICAgICAgIHRoaXMuc2VsZWN0ZWQg PSBmYWxzZTsKICAgICAgICAgdGhpcy50cmVlT3V0bGluZSA9IHRoaXM7CisgICAgICAgIHRoaXMu X2hpZGRlbiA9IGZhbHNlOwogCiAgICAgICAgIHRoaXMuX2NoaWxkcmVuTGlzdE5vZGUudGFiSW5k ZXggPSAwOwogICAgICAgICB0aGlzLl9jaGlsZHJlbkxpc3ROb2RlLmFkZEV2ZW50TGlzdGVuZXIo ImtleWRvd24iLCB0aGlzLl90cmVlS2V5RG93bi5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICB9CiAK LSAgICAvLyBNZXRob2RzCisgICAgLy8gUHVibGljCisKKyAgICBnZXQgaGlkZGVuKCkKKyAgICB7 CisgICAgICAgIHJldHVybiB0aGlzLl9oaWRkZW47CisgICAgfQorCisgICAgc2V0IGhpZGRlbih4 KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2hpZGRlbiA9PT0geCkKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICB0aGlzLl9oaWRkZW4gPSB4OworICAgICAgICB0aGlzLmVsZW1lbnQu Y2xhc3NMaXN0LnRvZ2dsZSgiaGlkZGVuIiwgdGhpcy5faGlkZGVuKTsKKyAgICB9CiAKICAgICBh cHBlbmRDaGlsZChjaGlsZCkKICAgICB7Cg== 266944 2015-12-08 15:17:12 -0800 2015-12-08 16:05:06 -0800 [Patch] Proposed Fix bug-152014-20151208151642.patch text/plain 10103 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTkzNzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA2 ZTEzYTI0ZjgzODY5Y2QzODUxMmU0NTdmY2E3ZWZiZTQ5Yzk5YjI5Li5hNjhlYjBlMmIzYmYwNjdm YjFlNDNiYzIzMGU4Zjg5YzkzYTI3ZWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMiBAQAogMjAxNS0xMi0wOCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGEgaGlkZGVuIHByb3BlcnR5IHRvIFRyZWVP dXRsaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTIwMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qczoKKyAgICAgICAg UmVtb3ZlZCBzdGF0aWMgcHJvcGVydHkgZm9yICJoaWRkZW4iIENTUyBjbGFzcy4gTm8gbG9uZ2Vy IHVzZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90 b3R5cGUuc2V0IGNvbnRlbnRUcmVlT3V0bGluZSk6CisgICAgICAgIEZpeGVkIGJ1ZyBpbiBvcmRl ciBvZiB2aXNpYmxlVHJlZU91dGxpbmVzIGFkZC9yZW1vdmUuCisgICAgICAgIChXZWJJbnNwZWN0 b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuY3JlYXRlQ29udGVudFRyZWVPdXRs aW5lKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFu ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fY2hhbmdl Vmlld01vZGUpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVHJlZU91dGxpbmUucHJvdG90eXBlLmdldCBoaWRkZW4pOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRyZWVPdXRsaW5lLnByb3RvdHlwZS5zZXQgaGlkZGVuKToKKyAgICAgICAgQWRkZWQg aGlkZGVuIHByb3BlcnR5LCBzZXQgRE9NIGVsZW1lbnQgaGlkZGVuIGF0dHJpYnV0ZS4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UcmVlRWxlbWVudC5wcm90b3R5cGUuc2V0IGhpZGRlbik6CisgICAg ICAgIFJlbW92ZSBDU1MgY2xhc3MsIHNldCBET00gZWxlbWVudCBoaWRkZW4gYXR0cmlidXRlLgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRyZWVFbGVtZW50LnByb3RvdHlwZS5fYXR0YWNoKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UcmVlRWxlbWVudC5wcm90b3R5cGUuZXhwYW5kKToKKworMjAx NS0xMi0wOCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CisKICAgICAgICAgV2Vi IEluc3BlY3RvcjogR2xvYmFsIEJyZWFrcG9pbnRzIHNob3VsZCBhbHdheXMgYmUgdmlzaWJsZQog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxMDY2CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05h dmlnYXRpb25TaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCmluZGV4IDVhZDNkZDY5ZDhiOGQz MjVmNzlkNmJiYjhlZTdmZDU2MGIzOTM5NDYuLjY4MTlmZGQ5YzllNjY4OWE2MmFlM2ViZTRkMGEx NDc5MjlmMDE0M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcwpAQCAt MTEzLDEzICsxMTMsMTQgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBj bGFzcyBOYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW4KICAgICAgICAgaWYgKCFu ZXdUcmVlT3V0bGluZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAodGhpcy5f Y29udGVudFRyZWVPdXRsaW5lKQotICAgICAgICAgICAgdGhpcy5fY29udGVudFRyZWVPdXRsaW5l LmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5l bC5Db250ZW50VHJlZU91dGxpbmVFbGVtZW50SGlkZGVuU3R5bGVDbGFzc05hbWUpOworICAgICAg ICBpZiAodGhpcy5fY29udGVudFRyZWVPdXRsaW5lKSB7CisgICAgICAgICAgICB0aGlzLl9jb250 ZW50VHJlZU91dGxpbmUuaGlkZGVuID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuX3Zpc2libGVD b250ZW50VHJlZU91dGxpbmVzLmRlbGV0ZSh0aGlzLl9jb250ZW50VHJlZU91dGxpbmUpOworICAg ICAgICB9CiAKICAgICAgICAgdGhpcy5fY29udGVudFRyZWVPdXRsaW5lID0gbmV3VHJlZU91dGxp bmU7Ci0gICAgICAgIHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZS5lbGVtZW50LmNsYXNzTGlzdC5y ZW1vdmUoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwuQ29udGVudFRyZWVPdXRs aW5lRWxlbWVudEhpZGRlblN0eWxlQ2xhc3NOYW1lKTsKKyAgICAgICAgdGhpcy5fY29udGVudFRy ZWVPdXRsaW5lLmhpZGRlbiA9IGZhbHNlOwogCi0gICAgICAgIHRoaXMuX3Zpc2libGVDb250ZW50 VHJlZU91dGxpbmVzLmRlbGV0ZSh0aGlzLl9jb250ZW50VHJlZU91dGxpbmUpOwogICAgICAgICB0 aGlzLl92aXNpYmxlQ29udGVudFRyZWVPdXRsaW5lcy5hZGQobmV3VHJlZU91dGxpbmUpOwogCiAg ICAgICAgIHRoaXMuX3VwZGF0ZUZpbHRlcigpOwpAQCAtMTU2LDE0ICsxNTcsMTIgQEAgV2ViSW5z cGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBOYXZpZ2F0aW9uU2lkZWJhclBh bmVsIGV4dGVuZHMgV2ViSW4KIAogICAgIGNyZWF0ZUNvbnRlbnRUcmVlT3V0bGluZShkb250SGlk ZUJ5RGVmYXVsdCwgc3VwcHJlc3NGaWx0ZXJpbmcpCiAgICAgewotICAgICAgICB2YXIgY29udGVu dFRyZWVPdXRsaW5lRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7Ci0gICAg ICAgIGNvbnRlbnRUcmVlT3V0bGluZUVsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLk5h dmlnYXRpb25TaWRlYmFyUGFuZWwuQ29udGVudFRyZWVPdXRsaW5lRWxlbWVudFN0eWxlQ2xhc3NO YW1lOwotICAgICAgICBpZiAoIWRvbnRIaWRlQnlEZWZhdWx0KQotICAgICAgICAgICAgY29udGVu dFRyZWVPdXRsaW5lRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9u U2lkZWJhclBhbmVsLkNvbnRlbnRUcmVlT3V0bGluZUVsZW1lbnRIaWRkZW5TdHlsZUNsYXNzTmFt ZSk7Ci0gICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoY29udGVudFRyZWVP dXRsaW5lRWxlbWVudCk7Ci0KLSAgICAgICAgdmFyIGNvbnRlbnRUcmVlT3V0bGluZSA9IG5ldyBX ZWJJbnNwZWN0b3IuVHJlZU91dGxpbmUoY29udGVudFRyZWVPdXRsaW5lRWxlbWVudCk7CisgICAg ICAgIGxldCBjb250ZW50VHJlZU91dGxpbmUgPSBuZXcgV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5l KGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIikpOwogICAgICAgICBjb250ZW50VHJlZU91dGxp bmUuYWxsb3dzUmVwZWF0U2VsZWN0aW9uID0gdHJ1ZTsKKyAgICAgICAgY29udGVudFRyZWVPdXRs aW5lLmhpZGRlbiA9ICFkb250SGlkZUJ5RGVmYXVsdDsKKyAgICAgICAgY29udGVudFRyZWVPdXRs aW5lLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQ YW5lbC5Db250ZW50VHJlZU91dGxpbmVFbGVtZW50U3R5bGVDbGFzc05hbWUpOworCisgICAgICAg IHRoaXMuY29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoY29udGVudFRyZWVPdXRsaW5lLmVsZW1l bnQpOwogCiAgICAgICAgIGlmICghc3VwcHJlc3NGaWx0ZXJpbmcpIHsKICAgICAgICAgICAgIGNv bnRlbnRUcmVlT3V0bGluZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UcmVlT3V0bGlu ZS5FdmVudC5FbGVtZW50QWRkZWQsIHRoaXMuX3RyZWVFbGVtZW50QWRkZWRPckNoYW5nZWQsIHRo aXMpOwpAQCAtNzM0LDcgKzczMyw2IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBh bmVsLldhc0V4cGFuZGVkRHVyaW5nRmlsdGVyaW5nU3ltYm9sID0gU3ltYm9sKCJ3CiAKIFdlYklu c3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLk92ZXJmbG93U2hhZG93RWxlbWVudFN0eWxl Q2xhc3NOYW1lID0gIm92ZXJmbG93LXNoYWRvdyI7CiBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5Ub3BPdmVyZmxvd1NoYWRvd0VsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJ0b3Ai OwotV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwuQ29udGVudFRyZWVPdXRsaW5l RWxlbWVudEhpZGRlblN0eWxlQ2xhc3NOYW1lID0gImhpZGRlbiI7CiBXZWJJbnNwZWN0b3IuTmF2 aWdhdGlvblNpZGViYXJQYW5lbC5Db250ZW50VHJlZU91dGxpbmVFbGVtZW50U3R5bGVDbGFzc05h bWUgPSAibmF2aWdhdGlvbi1zaWRlYmFyLXBhbmVsLWNvbnRlbnQtdHJlZS1vdXRsaW5lIjsKIFdl Ykluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLkhpZGVEaXNjbG9zdXJlQnV0dG9uc1N0 eWxlQ2xhc3NOYW1lID0gImhpZGUtZGlzY2xvc3VyZS1idXR0b25zIjsKIFdlYkluc3BlY3Rvci5O YXZpZ2F0aW9uU2lkZWJhclBhbmVsLkVtcHR5Q29udGVudFBsYWNlaG9sZGVyRWxlbWVudFN0eWxl Q2xhc3NOYW1lID0gImVtcHR5LWNvbnRlbnQtcGxhY2Vob2xkZXIiOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFu ZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZVNpZGViYXJQYW5lbC5qcwppbmRleCBlMzQ0YTFlZjVjYjZiODYxNmY1Yzc4ZmVjNjkyZjAxNWVm ZWU5ZTZmLi4zMDc0NjE2YmZmMjI4Y2I4NzAzZDZjNzAxMzRhMGJiMjNlMjU3MWUzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNp ZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcwpAQCAtNjEsNyArNjEsNyBAQCBXZWJJbnNwZWN0 b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwgPSBjbGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRl bmRzIFdlYkluc3BlYwogICAgICAgICB0aGlzLl9yZWNvcmRpbmdUcmVlRWxlbWVudE1hcCA9IG5l dyBNYXA7CiAgICAgICAgIHRoaXMuX3JlY29yZGluZ3NUcmVlT3V0bGluZSA9IHRoaXMuY3JlYXRl Q29udGVudFRyZWVPdXRsaW5lKHRydWUsIHRydWUpOwogICAgICAgICB0aGlzLl9yZWNvcmRpbmdz VHJlZU91dGxpbmUuZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9u U2lkZWJhclBhbmVsLkhpZGVEaXNjbG9zdXJlQnV0dG9uc1N0eWxlQ2xhc3NOYW1lKTsKLSAgICAg ICAgdGhpcy5fcmVjb3JkaW5nc1RyZWVPdXRsaW5lLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJ bnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5Db250ZW50VHJlZU91dGxpbmVFbGVtZW50 SGlkZGVuU3R5bGVDbGFzc05hbWUpOworICAgICAgICB0aGlzLl9yZWNvcmRpbmdzVHJlZU91dGxp bmUuaGlkZGVuID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nc1RyZWVPdXRsaW5lLmFk ZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lLkV2ZW50LlNlbGVjdGlvbkRp ZENoYW5nZSwgdGhpcy5fcmVjb3JkaW5nc1RyZWVTZWxlY3Rpb25EaWRDaGFuZ2UsIHRoaXMpOwog ICAgICAgICB0aGlzLl90aW1lbGluZXNDb250ZW50Q29udGFpbmVyRWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLl9yZWNvcmRpbmdzVHJlZU91dGxpbmUuZWxlbWVudCk7CiAKQEAgLTkzMCwxMCArOTMw LDEwIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCA9IGNsYXNzIFRpbWVsaW5l U2lkZWJhclBhbmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgIHRoaXMuX3ZpZXdNb2RlTmF2 aWdhdGlvbkJhci5zZWxlY3RlZE5hdmlnYXRpb25JdGVtID0gdGhpcy5fdmlld01vZGU7CiAKICAg ICAgICAgaWYgKHRoaXMuX3ZpZXdNb2RlID09PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFy UGFuZWwuVmlld01vZGUuVGltZWxpbmVzKSB7Ci0gICAgICAgICAgICB0aGlzLl90aW1lbGluZXNU cmVlT3V0bGluZS5lbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoV2ViSW5zcGVjdG9yLk5hdmlnYXRp b25TaWRlYmFyUGFuZWwuQ29udGVudFRyZWVPdXRsaW5lRWxlbWVudEhpZGRlblN0eWxlQ2xhc3NO YW1lKTsKKyAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5lc1RyZWVPdXRsaW5lLmhpZGRlbiA9IGZh bHNlOwogICAgICAgICAgICAgdGhpcy5fZnJhbWVTZWxlY3Rpb25DaGFydFNlY3Rpb24uY29sbGFw c2VkID0gdHJ1ZTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5l c1RyZWVPdXRsaW5lLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTmF2aWdhdGlv blNpZGViYXJQYW5lbC5Db250ZW50VHJlZU91dGxpbmVFbGVtZW50SGlkZGVuU3R5bGVDbGFzc05h bWUpOworICAgICAgICAgICAgdGhpcy5fdGltZWxpbmVzVHJlZU91dGxpbmUuaGlkZGVuID0gdHJ1 ZTsKICAgICAgICAgICAgIHRoaXMuX2ZyYW1lU2VsZWN0aW9uQ2hhcnRTZWN0aW9uLmNvbGxhcHNl ZCA9IGZhbHNlOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKaW5kZXggYjE1OGUxNTY3NmY3 OTVkNjc2ZTNmZDFlNGY1ZGEwMjZmMjllYjVlYS4uNWRjM2NiNGNjNzM4ZDIzZjI3MDBlZjZiMGIx MDNkZDM2OGZmNGYwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKQEAgLTQ2LDEyICs0NiwyNyBAQCBXZWJJ bnNwZWN0b3IuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRlbmRzIFdlYkluc3Bl Y3Rvci5PYmplY3QKICAgICAgICAgdGhpcy5leHBhbmRlZCA9IHRydWU7CiAgICAgICAgIHRoaXMu c2VsZWN0ZWQgPSBmYWxzZTsKICAgICAgICAgdGhpcy50cmVlT3V0bGluZSA9IHRoaXM7CisgICAg ICAgIHRoaXMuX2hpZGRlbiA9IGZhbHNlOwogCiAgICAgICAgIHRoaXMuX2NoaWxkcmVuTGlzdE5v ZGUudGFiSW5kZXggPSAwOwogICAgICAgICB0aGlzLl9jaGlsZHJlbkxpc3ROb2RlLmFkZEV2ZW50 TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl90cmVlS2V5RG93bi5iaW5kKHRoaXMpLCB0cnVlKTsK ICAgICB9CiAKLSAgICAvLyBNZXRob2RzCisgICAgLy8gUHVibGljCisKKyAgICBnZXQgaGlkZGVu KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9oaWRkZW47CisgICAgfQorCisgICAgc2V0 IGhpZGRlbih4KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2hpZGRlbiA9PT0geCkKKyAgICAg ICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9oaWRkZW4gPSB4OworICAgICAgICB0aGlz LmVsZW1lbnQuaGlkZGVuID0gdGhpcy5faGlkZGVuOworICAgIH0KIAogICAgIGFwcGVuZENoaWxk KGNoaWxkKQogICAgIHsKQEAgLTY1OSwxNyArNjc0LDEwIEBAIFdlYkluc3BlY3Rvci5UcmVlRWxl bWVudCA9IGNsYXNzIFRyZWVFbGVtZW50IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAg ICAgICAgIHRoaXMuX2hpZGRlbiA9IHg7CiAKLSAgICAgICAgaWYgKHgpIHsKLSAgICAgICAgICAg IGlmICh0aGlzLl9saXN0SXRlbU5vZGUpCi0gICAgICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1O b2RlLmNsYXNzTGlzdC5hZGQoImhpZGRlbiIpOwotICAgICAgICAgICAgaWYgKHRoaXMuX2NoaWxk cmVuTGlzdE5vZGUpCi0gICAgICAgICAgICAgICAgdGhpcy5fY2hpbGRyZW5MaXN0Tm9kZS5jbGFz c0xpc3QuYWRkKCJoaWRkZW4iKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGlmICh0 aGlzLl9saXN0SXRlbU5vZGUpCi0gICAgICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmNs YXNzTGlzdC5yZW1vdmUoImhpZGRlbiIpOwotICAgICAgICAgICAgaWYgKHRoaXMuX2NoaWxkcmVu TGlzdE5vZGUpCi0gICAgICAgICAgICAgICAgdGhpcy5fY2hpbGRyZW5MaXN0Tm9kZS5jbGFzc0xp c3QucmVtb3ZlKCJoaWRkZW4iKTsKLSAgICAgICAgfQorICAgICAgICBpZiAodGhpcy5fbGlzdEl0 ZW1Ob2RlKQorICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmhpZGRlbiA9IHRoaXMuX2hp ZGRlbjsKKyAgICAgICAgaWYgKHRoaXMuX2NoaWxkcmVuTGlzdE5vZGUpCisgICAgICAgICAgICB0 aGlzLl9jaGlsZHJlbkxpc3ROb2RlLmhpZGRlbiA9IHRoaXMuX2hpZGRlbjsKIAogICAgICAgICBp ZiAodGhpcy50cmVlT3V0bGluZSkKICAgICAgICAgICAgIHRoaXMudHJlZU91dGxpbmUuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UcmVlT3V0bGluZS5FdmVudC5FbGVtZW50 VmlzaWJpbGl0eURpZENoYW5nZSwge2VsZW1lbnQ6IHRoaXN9KTsKQEAgLTczNCw5ICs3NDIsOCBA QCBXZWJJbnNwZWN0b3IuVHJlZUVsZW1lbnQgPSBjbGFzcyBUcmVlRWxlbWVudCBleHRlbmRzIFdl Ykluc3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS50cmVlRWxl bWVudCA9IHRoaXM7CiAgICAgICAgICAgICB0aGlzLl9zZXRMaXN0SXRlbU5vZGVDb250ZW50KCk7 CiAgICAgICAgICAgICB0aGlzLl9saXN0SXRlbU5vZGUudGl0bGUgPSB0aGlzLl90b29sdGlwID8g dGhpcy5fdG9vbHRpcCA6ICIiOworICAgICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmhpZGRl biA9IHRoaXMuaGlkZGVuOwogCi0gICAgICAgICAgICBpZiAodGhpcy5oaWRkZW4pCi0gICAgICAg ICAgICAgICAgdGhpcy5fbGlzdEl0ZW1Ob2RlLmNsYXNzTGlzdC5hZGQoImhpZGRlbiIpOwogICAg ICAgICAgICAgaWYgKHRoaXMuaGFzQ2hpbGRyZW4pCiAgICAgICAgICAgICAgICAgdGhpcy5fbGlz dEl0ZW1Ob2RlLmNsYXNzTGlzdC5hZGQoInBhcmVudCIpOwogICAgICAgICAgICAgaWYgKHRoaXMu ZXhwYW5kZWQpCkBAIC04ODAsOSArODg3LDcgQEAgV2ViSW5zcGVjdG9yLlRyZWVFbGVtZW50ID0g Y2xhc3MgVHJlZUVsZW1lbnQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgICAg ICB0aGlzLl9jaGlsZHJlbkxpc3ROb2RlID0gdGhpcy50cmVlT3V0bGluZS5fY2hpbGRyZW5MaXN0 Tm9kZS5vd25lckRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7CiAgICAgICAgICAgICB0aGlz Ll9jaGlsZHJlbkxpc3ROb2RlLnBhcmVudFRyZWVFbGVtZW50ID0gdGhpczsKICAgICAgICAgICAg IHRoaXMuX2NoaWxkcmVuTGlzdE5vZGUuY2xhc3NMaXN0LmFkZCgiY2hpbGRyZW4iKTsKLQotICAg ICAgICAgICAgaWYgKHRoaXMuaGlkZGVuKQotICAgICAgICAgICAgICAgIHRoaXMuX2NoaWxkcmVu TGlzdE5vZGUuY2xhc3NMaXN0LmFkZCgiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlzLl9jaGls ZHJlbkxpc3ROb2RlLmhpZGRlbiA9IHRoaXMuaGlkZGVuOwogCiAgICAgICAgICAgICB0aGlzLm9u cG9wdWxhdGUoKTsKIAo=