193983 2019-01-29 14:24:16 -0800 Web Inspector: Styles: enable computed style cascades by default 2019-01-29 16:37:08 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 193986 1 nvasilyev nvasilyev commit-queue hi inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1499725 0 nvasilyev 2019-01-29 14:24:16 -0800 <rdar://problem/47645821> 1499729 1 360502 nvasilyev 2019-01-29 14:28:31 -0800 Created attachment 360502 Patch 1499733 2 nvasilyev 2019-01-29 14:31:43 -0800 Note that this patch doesn't remove a lot of the old code. The Variables section is still based on SpreadsheetCSSStyleDeclarationEditor and uses the old computed tab logic. 1499735 3 360502 mattbaker 2019-01-29 14:33:22 -0800 Comment on attachment 360502 Patch rs=me 1499737 4 360502 hi 2019-01-29 14:38:59 -0800 Comment on attachment 360502 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=360502&action=review > Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js:107 > Style: remove this newline. > Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsSidebarPanel.js:32 > + this.element.classList.add("computed-with-traces"); Rather than just always adding this class, why not merge the styles? 1499745 5 360504 nvasilyev 2019-01-29 15:04:25 -0800 Created attachment 360504 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=360502&action=review >> Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsSidebarPanel.js:32 >> + this.element.classList.add("computed-with-traces"); > > Rather than just always adding this class, why not merge the styles? Sure, that was actually not that hard! 1499802 6 360504 commit-queue 2019-01-29 16:37:06 -0800 Comment on attachment 360504 Patch Clearing flags on attachment: 360504 Committed r240691: <https://trac.webkit.org/changeset/240691> 1499803 7 commit-queue 2019-01-29 16:37:08 -0800 All reviewed patches have been landed. Closing bug. 360502 2019-01-29 14:28:31 -0800 2019-01-29 15:04:25 -0800 Patch patch.txt text/plain 7608 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFhY2Y2MGI5NTY4Li4xMmYwMjE5YTVkMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMDEtMjkgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBlbmFibGUgY29tcHV0ZWQgc3R5bGUgY2FzY2FkZXMgYnkgZGVmYXVsdAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzOTgzCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS80NzY0NTgyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qczoKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwuanM6 CisgICAgICAgIChXSS5Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5yZWZyZXNo KToKKyAgICAgICAgKFdJLkNvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90eXBlLmluaXRp YWxMYXlvdXQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHlsZURl dGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5Db21wdXRlZFN0eWxlRGV0YWlsc1Np ZGViYXJQYW5lbCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNv bnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuU2V0dGluZ3NUYWJDb250ZW50Vmlldy5wcm90b3R5 cGUuX2NyZWF0ZUV4cGVyaW1lbnRhbFNldHRpbmdzVmlldyk6CisKIDIwMTktMDEtMjggIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZW1vdmUgdW5uZWNlc3NhcnkgcHJvbWlzZSByZWplY3Rpb24gaGFuZGxlcnMgbm93IHRoYXQg d2UgdXNlIHRoZSBnbG9iYWwgb251bmhhbmRsZWRyZWplY3Rpb24gaGFuZGxlcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggYTg0NjkwZGJiZmYuLmYzYzhiYWZkNzFhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25z L2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTM3Miw3ICszNzIsNiBAQCBsb2NhbGl6 ZWRTdHJpbmdzWyJFbGVtZW50cyJdID0gIkVsZW1lbnRzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVu YWJsZSBCcmVha3BvaW50Il0gPSAiRW5hYmxlIEJyZWFrcG9pbnQiOwogbG9jYWxpemVkU3RyaW5n c1siRW5hYmxlIEJyZWFrcG9pbnRzIl0gPSAiRW5hYmxlIEJyZWFrcG9pbnRzIjsKIGxvY2FsaXpl ZFN0cmluZ3NbIkVuYWJsZSBDaGFuZ2VzIFBhbmVsIl0gPSAiRW5hYmxlIENoYW5nZXMgUGFuZWwi OwotbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIENvbXB1dGVkIFN0eWxlIENhc2NhZGVzIl0gPSAi RW5hYmxlIENvbXB1dGVkIFN0eWxlIENhc2NhZGVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVuYWJs ZSBFdmVudCBMaXN0ZW5lciJdID0gIkVuYWJsZSBFdmVudCBMaXN0ZW5lciI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJFbmFibGUgTGF5ZXJzIFRhYiJdID0gIkVuYWJsZSBMYXllcnMgVGFiIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkVuYWJsZSBOZXcgVGFiIEJhciJdID0gIkVuYWJsZSBOZXcgVGFiIEJhciI7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1Nl dHRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRp bmcuanMKaW5kZXggMTE3M2ZjODEyZmYuLmE4NWIxNjk3OGY5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCkBAIC0xNTIsNyAr MTUyLDYgQEAgV0kuc2V0dGluZ3MgPSB7CiAgICAgem9vbUZhY3RvcjogbmV3IFdJLlNldHRpbmco Inpvb20tZmFjdG9yIiwgMSksCiAKICAgICAvLyBFeHBlcmltZW50YWwKLSAgICBleHBlcmltZW50 YWxFbmFibGVDb21wdXRlZFN0eWxlQ2FzY2FkZXM6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50 YWwtZW5hYmxlLWNvbXB1dGVkLXN0eWxlLWNhc2NhZGVzIiwgZmFsc2UpLAogICAgIGV4cGVyaW1l bnRhbEVuYWJsZUNoYW5nZXNQYW5lbDogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFi bGUtY2hhbmdlcy1wYW5lbCIsIGZhbHNlKSwKICAgICBleHBlcmltZW50YWxFbmFibGVMYXllcnNU YWI6IG5ldyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtZW5hYmxlLWxheWVycy10YWIiLCBmYWxz ZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlTmV3VGFiQmFyOiBuZXcgV0kuU2V0dGluZygiZXhw ZXJpbWVudGFsLWVuYWJsZS1uZXctdGFiLWJhciIsIGZhbHNlKSwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxz UGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21w dXRlZFN0eWxlRGV0YWlsc1BhbmVsLmpzCmluZGV4IGZlMGM1MjBhMTg3Li5jNmQwZjBmMDA1OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29t cHV0ZWRTdHlsZURldGFpbHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLmpzCkBAIC00NSw5ICs0 NSw3IEBAIFdJLkNvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwgPSBjbGFzcyBDb21wdXRlZFN0eWxl RGV0YWlsc1BhbmVsIGV4dGVuZHMgV0kuU3R5bGVECiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KIAotICAgICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlQ29tcHV0 ZWRTdHlsZUNhc2NhZGVzLnZhbHVlKQotICAgICAgICAgICAgdGhpcy5fY29tcHV0ZWRTdHlsZVNl Y3Rpb24uc3R5bGVUcmFjZXMgPSB0aGlzLl9jb21wdXRlUHJvcGVydHlUcmFjZXModGhpcy5ub2Rl U3R5bGVzLnVuaXF1ZU9yZGVyZWRTdHlsZXMpOwotCisgICAgICAgIHRoaXMuX2NvbXB1dGVkU3R5 bGVTZWN0aW9uLnN0eWxlVHJhY2VzID0gdGhpcy5fY29tcHV0ZVByb3BlcnR5VHJhY2VzKHRoaXMu bm9kZVN0eWxlcy51bmlxdWVPcmRlcmVkU3R5bGVzKTsKICAgICAgICAgdGhpcy5fY29tcHV0ZWRT dHlsZVNlY3Rpb24uc3R5bGUgPSB0aGlzLm5vZGVTdHlsZXMuY29tcHV0ZWRTdHlsZTsKIAogICAg ICAgICB0aGlzLl92YXJpYWJsZXNUZXh0RWRpdG9yLnN0eWxlID0gdGhpcy5ub2RlU3R5bGVzLmNv bXB1dGVkU3R5bGU7CkBAIC0xMDMsMTYgKzEwMSw5IEBAIFdJLkNvbXB1dGVkU3R5bGVEZXRhaWxz UGFuZWwgPSBjbGFzcyBDb21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMgV0kuU3R5bGVE CiAgICAgICAgIHRoaXMuX2NvbXB1dGVkU3R5bGVTaG93QWxsQ2hlY2tib3guYWRkRXZlbnRMaXN0 ZW5lcigiY2hhbmdlIiwgdGhpcy5fY29tcHV0ZWRTdHlsZVNob3dBbGxDaGVja2JveFZhbHVlQ2hh bmdlZC5iaW5kKHRoaXMpKTsKICAgICAgICAgY29tcHV0ZWRTdHlsZVNob3dBbGxMYWJlbC5hcHBl bmRDaGlsZCh0aGlzLl9jb21wdXRlZFN0eWxlU2hvd0FsbENoZWNrYm94KTsKIAotICAgICAgICBp ZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlQ29tcHV0ZWRTdHlsZUNhc2NhZGVzLnZh bHVlKSB7Ci0gICAgICAgICAgICB0aGlzLl9jb21wdXRlZFN0eWxlU2VjdGlvbiA9IG5ldyBXSS5D b21wdXRlZFN0eWxlU2VjdGlvbih0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX2NvbXB1dGVkU3R5 bGVTZWN0aW9uLnByb3BlcnR5VmlzaWJpbGl0eU1vZGUgPSBXSS5Db21wdXRlZFN0eWxlU2VjdGlv bi5Qcm9wZXJ0eVZpc2liaWxpdHlNb2RlLkhpZGVWYXJpYWJsZXM7Ci0gICAgICAgICAgICB0aGlz Ll9jb21wdXRlZFN0eWxlU2VjdGlvbi5hZGRFdmVudExpc3RlbmVyKFdJLkNvbXB1dGVkU3R5bGVT ZWN0aW9uLkV2ZW50LkZpbHRlckFwcGxpZWQsIHRoaXMuX2hhbmRsZUVkaXRvckZpbHRlckFwcGxp ZWQsIHRoaXMpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhpcy5fY29tcHV0ZWRT dHlsZVNlY3Rpb24gPSBuZXcgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9y KHRoaXMpOwotICAgICAgICAgICAgdGhpcy5fY29tcHV0ZWRTdHlsZVNlY3Rpb24ucHJvcGVydHlW aXNpYmlsaXR5TW9kZSA9IFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5Q cm9wZXJ0eVZpc2liaWxpdHlNb2RlLkhpZGVWYXJpYWJsZXM7Ci0gICAgICAgICAgICB0aGlzLl9j b21wdXRlZFN0eWxlU2VjdGlvbi5zb3J0UHJvcGVydGllc0J5TmFtZSA9IHRydWU7Ci0gICAgICAg ICAgICB0aGlzLl9jb21wdXRlZFN0eWxlU2VjdGlvbi5hZGRFdmVudExpc3RlbmVyKFdJLlNwcmVh ZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5FdmVudC5GaWx0ZXJBcHBsaWVkLCB0aGlz Ll9oYW5kbGVFZGl0b3JGaWx0ZXJBcHBsaWVkLCB0aGlzKTsKLSAgICAgICAgfQorICAgICAgICB0 aGlzLl9jb21wdXRlZFN0eWxlU2VjdGlvbiA9IG5ldyBXSS5Db21wdXRlZFN0eWxlU2VjdGlvbih0 aGlzKTsKKyAgICAgICAgdGhpcy5fY29tcHV0ZWRTdHlsZVNlY3Rpb24ucHJvcGVydHlWaXNpYmls aXR5TW9kZSA9IFdJLkNvbXB1dGVkU3R5bGVTZWN0aW9uLlByb3BlcnR5VmlzaWJpbGl0eU1vZGUu SGlkZVZhcmlhYmxlczsKKyAgICAgICAgdGhpcy5fY29tcHV0ZWRTdHlsZVNlY3Rpb24uYWRkRXZl bnRMaXN0ZW5lcihXSS5Db21wdXRlZFN0eWxlU2VjdGlvbi5FdmVudC5GaWx0ZXJBcHBsaWVkLCB0 aGlzLl9oYW5kbGVFZGl0b3JGaWx0ZXJBcHBsaWVkLCB0aGlzKTsKIAogICAgICAgICB0aGlzLl9j b21wdXRlZFN0eWxlU2VjdGlvbi5zaG93c0ltcGxpY2l0UHJvcGVydGllcyA9IHRoaXMuX2NvbXB1 dGVkU3R5bGVTaG93QWxsU2V0dGluZy52YWx1ZTsKICAgICAgICAgdGhpcy5fY29tcHV0ZWRTdHls ZVNlY3Rpb24uYWx3YXlzU2hvd1Byb3BlcnR5TmFtZXMgPSBbImRpc3BsYXkiLCAid2lkdGgiLCAi aGVpZ2h0Il07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzU2lkZWJh clBhbmVsLmpzCmluZGV4IDkwMTBjZWI4ZDY2Li4yYWUyY2FmMzQyYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHlsZURldGFp bHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29tcHV0ZWRTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuanMKQEAgLTI5LDcgKzI5 LDYgQEAgV0kuQ29tcHV0ZWRTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBDb21wdXRl ZFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbCBleHQKICAgICB7CiAgICAgICAgIHN1cGVyKCJzdHls ZS1jb21wdXRlZCIsIFdJLlVJU3RyaW5nKCJDb21wdXRlZCIpLCBXSS5Db21wdXRlZFN0eWxlRGV0 YWlsc1BhbmVsKTsKIAotICAgICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxl Q29tcHV0ZWRTdHlsZUNhc2NhZGVzLnZhbHVlKQotICAgICAgICAgICAgdGhpcy5lbGVtZW50LmNs YXNzTGlzdC5hZGQoImNvbXB1dGVkLXdpdGgtdHJhY2VzIik7CisgICAgICAgIHRoaXMuZWxlbWVu dC5jbGFzc0xpc3QuYWRkKCJjb21wdXRlZC13aXRoLXRyYWNlcyIpOwogICAgIH0KIH07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5n c1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwppbmRleCBjZDIzYjRlNGU5OS4uYjQ0MGQ3 N2E3YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMjU1LDcg KzI1NSw2IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNv bnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAKICAgICAgICAgaWYgKHdpbmRvdy5D U1NBZ2VudCkgewogICAgICAgICAgICAgbGV0IGdyb3VwID0gZXhwZXJpbWVudGFsU2V0dGluZ3NW aWV3LmFkZEdyb3VwKFdJLlVJU3RyaW5nKCJTdHlsZXMgU2lkZWJhcjoiKSk7Ci0gICAgICAgICAg ICBncm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUNvbXB1dGVk U3R5bGVDYXNjYWRlcywgV0kuVUlTdHJpbmcoIkVuYWJsZSBDb21wdXRlZCBTdHlsZSBDYXNjYWRl cyIpKTsKICAgICAgICAgICAgIGdyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZXhwZXJpbWVu dGFsRW5hYmxlQ2hhbmdlc1BhbmVsLCBXSS5VSVN0cmluZygiRW5hYmxlIENoYW5nZXMgUGFuZWwi KSk7CiAgICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2VwYXJhdG9yKCk7 CiAgICAgICAgIH0KQEAgLTI5MCw3ICsyODksNiBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 ID0gY2xhc3MgU2V0dGluZ3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQog ICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KIAotICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0ku c2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlQ29tcHV0ZWRTdHlsZUNhc2NhZGVzKTsKICAgICAg ICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZUNoYW5nZXNQ YW5lbCk7CiAgICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxF bmFibGVMYXllcnNUYWIpOwogICAgICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhw ZXJpbWVudGFsRW5hYmxlTmV3VGFiQmFyKTsK 360504 2019-01-29 15:04:25 -0800 2019-01-29 16:37:06 -0800 Patch patch.txt text/plain 10232 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFhY2Y2MGI5NTY4Li5kZjViYjU5ZGFiYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTktMDEtMjkgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBlbmFibGUgY29tcHV0ZWQgc3R5bGUgY2FzY2FkZXMgYnkgZGVmYXVsdAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzOTgzCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS80NzY0NTgyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBNYXR0 IEJha2VyLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJp bmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbC5jc3M6Cisg ICAgICAgICguY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllcyk6CisgICAgICAgICguY29tcHV0ZWQt c3R5bGUtcHJvcGVydGllcyAucHJvcGVydHkgLmdvLXRvLWFycm93KToKKyAgICAgICAgKC5kZXRh aWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllczpub3QoLmNvbGxhcHNlZCkgPiA6 bWF0Y2hlcyguaGVhZGVyLCAuY29udGVudCkpOgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbi5j b21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzID4gLmNvbnRlbnQpOgorICAgICAgICAoQG1lZGlhIChw cmVmZXJzLWNvbG9yLXNjaGVtZTogZGFyaykpOgorICAgICAgICAoLmNvbXB1dGVkLXdpdGgtdHJh Y2VzIC5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzKTogRGVsZXRlZC4KKyAgICAgICAgKC5jb21w dXRlZC13aXRoLXRyYWNlcyAuZGV0YWlscy1zZWN0aW9uLmNvbXB1dGVkLXN0eWxlLXByb3BlcnRp ZXM6bm90KC5jb2xsYXBzZWQpID4gOm1hdGNoZXMoLmhlYWRlciwgLmNvbnRlbnQpKTogRGVsZXRl ZC4KKyAgICAgICAgKC5jb21wdXRlZC13aXRoLXRyYWNlcyAuZGV0YWlscy1zZWN0aW9uLmNvbXB1 dGVkLXN0eWxlLXByb3BlcnRpZXMgPiAuY29udGVudCk6IERlbGV0ZWQuCisgICAgICAgICguY29t cHV0ZWQtd2l0aC10cmFjZXMgLmNvbXB1dGVkLXN0eWxlLXByb3BlcnRpZXMgLnByb3BlcnR5IC5n by10by1hcnJvdyk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db21w dXRlZFN0eWxlRGV0YWlsc1BhbmVsLmpzOgorICAgICAgICAoV0kuQ29tcHV0ZWRTdHlsZURldGFp bHNQYW5lbC5wcm90b3R5cGUucmVmcmVzaCk6CisgICAgICAgIChXSS5Db21wdXRlZFN0eWxlRGV0 YWlsc1BhbmVsLnByb3RvdHlwZS5pbml0aWFsTGF5b3V0KToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAo V0kuQ29tcHV0ZWRTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlNldHRp bmdzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9jcmVhdGVFeHBlcmltZW50YWxTZXR0aW5nc1Zp ZXcpOgorCiAyMDE5LTAxLTI4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIHVubmVjZXNzYXJ5IHByb21pc2UgcmVq ZWN0aW9uIGhhbmRsZXJzIG5vdyB0aGF0IHdlIHVzZSB0aGUgZ2xvYmFsIG9udW5oYW5kbGVkcmVq ZWN0aW9uIGhhbmRsZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IGE4NDY5 MGRiYmZmLi5mM2M4YmFmZDcxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBA IC0zNzIsNyArMzcyLDYgQEAgbG9jYWxpemVkU3RyaW5nc1siRWxlbWVudHMiXSA9ICJFbGVtZW50 cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgQnJlYWtwb2ludCJdID0gIkVuYWJsZSBCcmVh a3BvaW50IjsKIGxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBCcmVha3BvaW50cyJdID0gIkVuYWJs ZSBCcmVha3BvaW50cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgQ2hhbmdlcyBQYW5lbCJd ID0gIkVuYWJsZSBDaGFuZ2VzIFBhbmVsIjsKLWxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBDb21w dXRlZCBTdHlsZSBDYXNjYWRlcyJdID0gIkVuYWJsZSBDb21wdXRlZCBTdHlsZSBDYXNjYWRlcyI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgRXZlbnQgTGlzdGVuZXIiXSA9ICJFbmFibGUgRXZl bnQgTGlzdGVuZXIiOwogbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIExheWVycyBUYWIiXSA9ICJF bmFibGUgTGF5ZXJzIFRhYiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgTmV3IFRhYiBCYXIi XSA9ICJFbmFibGUgTmV3IFRhYiBCYXIiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IDExNzNmYzgxMmZmLi5hODViMTY5 NzhmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9TZXR0aW5nLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jh c2UvU2V0dGluZy5qcwpAQCAtMTUyLDcgKzE1Miw2IEBAIFdJLnNldHRpbmdzID0gewogICAgIHpv b21GYWN0b3I6IG5ldyBXSS5TZXR0aW5nKCJ6b29tLWZhY3RvciIsIDEpLAogCiAgICAgLy8gRXhw ZXJpbWVudGFsCi0gICAgZXhwZXJpbWVudGFsRW5hYmxlQ29tcHV0ZWRTdHlsZUNhc2NhZGVzOiBu ZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFsLWVuYWJsZS1jb21wdXRlZC1zdHlsZS1jYXNjYWRl cyIsIGZhbHNlKSwKICAgICBleHBlcmltZW50YWxFbmFibGVDaGFuZ2VzUGFuZWw6IG5ldyBXSS5T ZXR0aW5nKCJleHBlcmltZW50YWwtZW5hYmxlLWNoYW5nZXMtcGFuZWwiLCBmYWxzZSksCiAgICAg ZXhwZXJpbWVudGFsRW5hYmxlTGF5ZXJzVGFiOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFs LWVuYWJsZS1sYXllcnMtdGFiIiwgZmFsc2UpLAogICAgIGV4cGVyaW1lbnRhbEVuYWJsZU5ld1Rh YkJhcjogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1lbmFibGUtbmV3LXRhYi1iYXIiLCBm YWxzZSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwuY3NzCmluZGV4 IDQ4YjdlNGEwZWY5Li44ZGVlYzIxMzAzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbC5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHls ZURldGFpbHNQYW5lbC5jc3MKQEAgLTI3LDExICsyNywxNSBAQAogICAgIGJhY2tncm91bmQtY29s b3I6IHZhcigtLWJhY2tncm91bmQtY29sb3IpOwogfQogCisuY29tcHV0ZWQtc3R5bGUtcHJvcGVy dGllcyB7CisgICAgLS1kaXNjbG9zdXJlLWJ1dHRvbi1zaXplOiAxNXB4OworfQorCiAuY29tcHV0 ZWQtc3R5bGUtcHJvcGVydGllcyAucHJvcGVydHkgLmdvLXRvLWFycm93IHsKICAgICBkaXNwbGF5 OiBub25lOwogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB3aWR0aDogMTJweDsKLSAgICBo ZWlnaHQ6IDEycHg7CisgICAgd2lkdGg6IHZhcigtLWRpc2Nsb3N1cmUtYnV0dG9uLXNpemUpOwor ICAgIGhlaWdodDogdmFyKC0tZGlzY2xvc3VyZS1idXR0b24tc2l6ZSk7CiAgICAgdmVydGljYWwt YWxpZ246IHRleHQtYm90dG9tOwogfQogCkBAIC0zOSwyNSArNDMsMTYgQEAKICAgICBkaXNwbGF5 OiBpbml0aWFsOwogfQogCi0uY29tcHV0ZWQtd2l0aC10cmFjZXMgLmNvbXB1dGVkLXN0eWxlLXBy b3BlcnRpZXMgewotICAgIC0tZGlzY2xvc3VyZS1idXR0b24tc2l6ZTogMTVweDsKLX0KLQotLmNv bXB1dGVkLXdpdGgtdHJhY2VzIC5kZXRhaWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUtcHJvcGVy dGllczpub3QoLmNvbGxhcHNlZCkgPiA6bWF0Y2hlcyguaGVhZGVyLCAuY29udGVudCkgeworLmRl dGFpbHMtc2VjdGlvbi5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzOm5vdCguY29sbGFwc2VkKSA+ IDptYXRjaGVzKC5oZWFkZXIsIC5jb250ZW50KSB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNs KDAsIDAlLCA5NyUpOwogfQogCi0uY29tcHV0ZWQtd2l0aC10cmFjZXMgLmRldGFpbHMtc2VjdGlv bi5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzID4gLmNvbnRlbnQgeworLmRldGFpbHMtc2VjdGlv bi5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzID4gLmNvbnRlbnQgewogICAgIGZvbnQ6IDEycHgg LXdlYmtpdC1zeXN0ZW0tZm9udCwgc2Fucy1zZXJpZjsKIH0KIAotLmNvbXB1dGVkLXdpdGgtdHJh Y2VzIC5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzIC5wcm9wZXJ0eSAuZ28tdG8tYXJyb3cgewot ICAgIHdpZHRoOiB2YXIoLS1kaXNjbG9zdXJlLWJ1dHRvbi1zaXplKTsKLSAgICBoZWlnaHQ6IHZh cigtLWRpc2Nsb3N1cmUtYnV0dG9uLXNpemUpOwotfQotCiBAbWVkaWEgKHByZWZlcnMtY29sb3It c2NoZW1lOiBkYXJrKSB7Ci0gICAgLmNvbXB1dGVkLXdpdGgtdHJhY2VzIC5kZXRhaWxzLXNlY3Rp b24uY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllczpub3QoLmNvbGxhcHNlZCkgPiA6bWF0Y2hlcygu aGVhZGVyLCAuY29udGVudCkgeworICAgIC5kZXRhaWxzLXNlY3Rpb24uY29tcHV0ZWQtc3R5bGUt cHJvcGVydGllczpub3QoLmNvbGxhcHNlZCkgPiA6bWF0Y2hlcyguaGVhZGVyLCAuY29udGVudCkg ewogICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9yKTsKICAg ICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbC5qcwppbmRleCBm ZTBjNTIwYTE4Ny4uMWYzMTE2NTZiOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHlsZURl dGFpbHNQYW5lbC5qcwpAQCAtNDUsOSArNDUsNyBAQCBXSS5Db21wdXRlZFN0eWxlRGV0YWlsc1Bh bmVsID0gY2xhc3MgQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbCBleHRlbmRzIFdJLlN0eWxlRAog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKFdJLnNldHRpbmdz LmV4cGVyaW1lbnRhbEVuYWJsZUNvbXB1dGVkU3R5bGVDYXNjYWRlcy52YWx1ZSkKLSAgICAgICAg ICAgIHRoaXMuX2NvbXB1dGVkU3R5bGVTZWN0aW9uLnN0eWxlVHJhY2VzID0gdGhpcy5fY29tcHV0 ZVByb3BlcnR5VHJhY2VzKHRoaXMubm9kZVN0eWxlcy51bmlxdWVPcmRlcmVkU3R5bGVzKTsKLQor ICAgICAgICB0aGlzLl9jb21wdXRlZFN0eWxlU2VjdGlvbi5zdHlsZVRyYWNlcyA9IHRoaXMuX2Nv bXB1dGVQcm9wZXJ0eVRyYWNlcyh0aGlzLm5vZGVTdHlsZXMudW5pcXVlT3JkZXJlZFN0eWxlcyk7 CiAgICAgICAgIHRoaXMuX2NvbXB1dGVkU3R5bGVTZWN0aW9uLnN0eWxlID0gdGhpcy5ub2RlU3R5 bGVzLmNvbXB1dGVkU3R5bGU7CiAKICAgICAgICAgdGhpcy5fdmFyaWFibGVzVGV4dEVkaXRvci5z dHlsZSA9IHRoaXMubm9kZVN0eWxlcy5jb21wdXRlZFN0eWxlOwpAQCAtMTAzLDE3ICsxMDEsOSBA QCBXSS5Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgQ29tcHV0ZWRTdHlsZURldGFp bHNQYW5lbCBleHRlbmRzIFdJLlN0eWxlRAogICAgICAgICB0aGlzLl9jb21wdXRlZFN0eWxlU2hv d0FsbENoZWNrYm94LmFkZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIsIHRoaXMuX2NvbXB1dGVkU3R5 bGVTaG93QWxsQ2hlY2tib3hWYWx1ZUNoYW5nZWQuYmluZCh0aGlzKSk7CiAgICAgICAgIGNvbXB1 dGVkU3R5bGVTaG93QWxsTGFiZWwuYXBwZW5kQ2hpbGQodGhpcy5fY29tcHV0ZWRTdHlsZVNob3dB bGxDaGVja2JveCk7CiAKLSAgICAgICAgaWYgKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJs ZUNvbXB1dGVkU3R5bGVDYXNjYWRlcy52YWx1ZSkgewotICAgICAgICAgICAgdGhpcy5fY29tcHV0 ZWRTdHlsZVNlY3Rpb24gPSBuZXcgV0kuQ29tcHV0ZWRTdHlsZVNlY3Rpb24odGhpcyk7Ci0gICAg ICAgICAgICB0aGlzLl9jb21wdXRlZFN0eWxlU2VjdGlvbi5wcm9wZXJ0eVZpc2liaWxpdHlNb2Rl ID0gV0kuQ29tcHV0ZWRTdHlsZVNlY3Rpb24uUHJvcGVydHlWaXNpYmlsaXR5TW9kZS5IaWRlVmFy aWFibGVzOwotICAgICAgICAgICAgdGhpcy5fY29tcHV0ZWRTdHlsZVNlY3Rpb24uYWRkRXZlbnRM aXN0ZW5lcihXSS5Db21wdXRlZFN0eWxlU2VjdGlvbi5FdmVudC5GaWx0ZXJBcHBsaWVkLCB0aGlz Ll9oYW5kbGVFZGl0b3JGaWx0ZXJBcHBsaWVkLCB0aGlzKTsKLSAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgIHRoaXMuX2NvbXB1dGVkU3R5bGVTZWN0aW9uID0gbmV3IFdJLlNwcmVhZHNoZWV0 Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvcih0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX2NvbXB1 dGVkU3R5bGVTZWN0aW9uLnByb3BlcnR5VmlzaWJpbGl0eU1vZGUgPSBXSS5TcHJlYWRzaGVldENT U1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuUHJvcGVydHlWaXNpYmlsaXR5TW9kZS5IaWRlVmFyaWFi bGVzOwotICAgICAgICAgICAgdGhpcy5fY29tcHV0ZWRTdHlsZVNlY3Rpb24uc29ydFByb3BlcnRp ZXNCeU5hbWUgPSB0cnVlOwotICAgICAgICAgICAgdGhpcy5fY29tcHV0ZWRTdHlsZVNlY3Rpb24u YWRkRXZlbnRMaXN0ZW5lcihXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3Iu RXZlbnQuRmlsdGVyQXBwbGllZCwgdGhpcy5faGFuZGxlRWRpdG9yRmlsdGVyQXBwbGllZCwgdGhp cyk7Ci0gICAgICAgIH0KLQorICAgICAgICB0aGlzLl9jb21wdXRlZFN0eWxlU2VjdGlvbiA9IG5l dyBXSS5Db21wdXRlZFN0eWxlU2VjdGlvbih0aGlzKTsKKyAgICAgICAgdGhpcy5fY29tcHV0ZWRT dHlsZVNlY3Rpb24ucHJvcGVydHlWaXNpYmlsaXR5TW9kZSA9IFdJLkNvbXB1dGVkU3R5bGVTZWN0 aW9uLlByb3BlcnR5VmlzaWJpbGl0eU1vZGUuSGlkZVZhcmlhYmxlczsKKyAgICAgICAgdGhpcy5f Y29tcHV0ZWRTdHlsZVNlY3Rpb24uYWRkRXZlbnRMaXN0ZW5lcihXSS5Db21wdXRlZFN0eWxlU2Vj dGlvbi5FdmVudC5GaWx0ZXJBcHBsaWVkLCB0aGlzLl9oYW5kbGVFZGl0b3JGaWx0ZXJBcHBsaWVk LCB0aGlzKTsKICAgICAgICAgdGhpcy5fY29tcHV0ZWRTdHlsZVNlY3Rpb24uc2hvd3NJbXBsaWNp dFByb3BlcnRpZXMgPSB0aGlzLl9jb21wdXRlZFN0eWxlU2hvd0FsbFNldHRpbmcudmFsdWU7CiAg ICAgICAgIHRoaXMuX2NvbXB1dGVkU3R5bGVTZWN0aW9uLmFsd2F5c1Nob3dQcm9wZXJ0eU5hbWVz ID0gWyJkaXNwbGF5IiwgIndpZHRoIiwgImhlaWdodCJdOwogICAgICAgICB0aGlzLl9jb21wdXRl ZFN0eWxlU2VjdGlvbi5oaWRlRmlsdGVyTm9uTWF0Y2hpbmdQcm9wZXJ0aWVzID0gdHJ1ZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1 dGVkU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHlsZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5k ZXggOTAxMGNlYjhkNjYuLmY1M2ExNjkwZWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1NpZGViYXJQYW5l bC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21w dXRlZFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtMjgsOCArMjgsNSBAQCBXSS5Db21w dXRlZFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIENvbXB1dGVkU3R5bGVEZXRhaWxz U2lkZWJhclBhbmVsIGV4dAogICAgIGNvbnN0cnVjdG9yKCkKICAgICB7CiAgICAgICAgIHN1cGVy KCJzdHlsZS1jb21wdXRlZCIsIFdJLlVJU3RyaW5nKCJDb21wdXRlZCIpLCBXSS5Db21wdXRlZFN0 eWxlRGV0YWlsc1BhbmVsKTsKLQotICAgICAgICBpZiAoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFs RW5hYmxlQ29tcHV0ZWRTdHlsZUNhc2NhZGVzLnZhbHVlKQotICAgICAgICAgICAgdGhpcy5lbGVt ZW50LmNsYXNzTGlzdC5hZGQoImNvbXB1dGVkLXdpdGgtdHJhY2VzIik7CiAgICAgfQogfTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRp bmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IGNkMjNiNGU0ZTk5Li5iNDQw ZDc3YTdhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0yNTUs NyArMjU1LDYgQEAgV0kuU2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFi Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50VmkKIAogICAgICAgICBpZiAod2luZG93 LkNTU0FnZW50KSB7CiAgICAgICAgICAgICBsZXQgZ3JvdXAgPSBleHBlcmltZW50YWxTZXR0aW5n c1ZpZXcuYWRkR3JvdXAoV0kuVUlTdHJpbmcoIlN0eWxlcyBTaWRlYmFyOiIpKTsKLSAgICAgICAg ICAgIGdyb3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlQ29tcHV0 ZWRTdHlsZUNhc2NhZGVzLCBXSS5VSVN0cmluZygiRW5hYmxlIENvbXB1dGVkIFN0eWxlIENhc2Nh ZGVzIikpOwogICAgICAgICAgICAgZ3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5leHBlcmlt ZW50YWxFbmFibGVDaGFuZ2VzUGFuZWwsIFdJLlVJU3RyaW5nKCJFbmFibGUgQ2hhbmdlcyBQYW5l bCIpKTsKICAgICAgICAgICAgIGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRTZXBhcmF0b3Io KTsKICAgICAgICAgfQpAQCAtMjkwLDcgKzI4OSw2IEBAIFdJLlNldHRpbmdzVGFiQ29udGVudFZp ZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZp CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCi0gICAgICAgIGxpc3RlbkZvckNoYW5nZShX SS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVDb21wdXRlZFN0eWxlQ2FzY2FkZXMpOwogICAg ICAgICBsaXN0ZW5Gb3JDaGFuZ2UoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlQ2hhbmdl c1BhbmVsKTsKICAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRh bEVuYWJsZUxheWVyc1RhYik7CiAgICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5l eHBlcmltZW50YWxFbmFibGVOZXdUYWJCYXIpOwo=