234581 2021-12-21 16:27:53 -0800 Web Inspector: Collapse blackboxed call frames by default 2022-01-25 16:25:43 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 219806 234614 234615 234648 1 nvasilyev nvasilyev ews-watchlist hi inspector-bugzilla-changes pangle webkit-bug-importer oldest_to_newest 1826159 0 nvasilyev 2021-12-21 16:27:53 -0800 Currently, "Collapse blackboxed call frames" is an experimental feature. Enable it by default. 1826168 1 447767 nvasilyev 2021-12-21 17:19:00 -0800 Created attachment 447767 Patch cq- for now because I'd like to hold on landing this just before the holidays. 1826375 2 447767 hi 2021-12-22 12:58:21 -0800 Comment on attachment 447767 Patch r-, I just tried using this after a while and ran across a couple things I think should be addressed before enabling this by default 1827138 3 webkit-bug-importer 2021-12-28 16:28:18 -0800 <rdar://problem/86967088> 1833803 4 449948 nvasilyev 2022-01-25 12:00:25 -0800 Created attachment 449948 Patch 1833808 5 449948 hi 2022-01-25 12:19:43 -0800 Comment on attachment 449948 Patch r=me, 🎉 1833833 6 ews-feeder 2022-01-25 13:37:11 -0800 Committed r288580 (246402@main): <https://commits.webkit.org/246402@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449948. 447767 2021-12-21 17:19:00 -0800 2022-01-25 12:00:25 -0800 Patch patch.txt text/plain 11565 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDljNDg2NzRmNzdlMy4uNjVlMWVkNjJkNDc0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAyMS0xMi0yMSAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBDb2xsYXBzZSBibGFja2JveGVkIGNhbGwgZnJhbWVzIGJ5IGRlZmF1bHQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDU4MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgIkNvbGxhcHNlIGJs YWNrYm94ZWQgY2FsbCBmcmFtZXMiIGNoZWNrYm94IGZyb20gRXhwZXJpbWVudGFsIHNldHRpbmdz IHRvCisgICAgICAgIFNvdXJjZXMgLSBEZWJ1Z2dlciBzZXR0aW5nIHNlY3Rpb24sIGFuZCBlbmFi bGUgaXQgYnkgZGVmYXVsdC4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5q czoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcu anM6CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY3JlYXRl U291cmNlc1NldHRpbmdzVmlldyk6CisgICAgICAgIChXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3 LnByb3RvdHlwZS5fY3JlYXRlRXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3KToKKworICAgICAgICAo V0kuU2V0dGluZ3NUYWJDb250ZW50Vmlldy5wcm90b3R5cGUuX2NyZWF0ZVJlbG9hZEluc3BlY3Rv ckNvbnRhaW5lcik6CisgICAgICAgIE1vdmUgdGhlIHJlbG9hZCBidXR0b24gbG9naWMgaW50byBh IHNlcGFyYXRlIG1ldGhvZCBzaW5jZSBub3cgaXQncyB1c2VkIGluIHR3byBkaWZmZXJlbnQgcGxh Y2VzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaHJlYWRUcmVlRWxlbWVudC5q czoKKyAgICAgICAgKFdJLlRocmVhZFRyZWVFbGVtZW50LnByb3RvdHlwZS5yZWZyZXNoKToKKwog MjAyMS0xMi0xMCAgUmF6dmFuIENhbGltYW4gIDxyY2FsaW1hbkBhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogQ29tcHV0ZWQgUGFuZWw6IEdyb3VwIENTUyB2YXJpYWJsZXMgYnkg dmFsdWUgdHlwZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlv bnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9M b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggODUxODcxNmVj Y2U1Li45NDExYmIwNjhiYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2Nh bGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwpAQCAt MzM5LDcgKzMzOSw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIkNsb3N1cmUgVmFyaWFibGVzICglcyki XSA9ICJDbG9zdXJlIFZhcmlhYmxlcyAoJXMpIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNvZGUiXSA9 ICJDb2RlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNvbGxhcHNlIEFsbCJdID0gIkNvbGxhcHNlIEFs bCI7CiAvKiBTZXR0aW5nIHRvIGNvbGxhcHNlIGJsYWNrYm94ZWQgY2FsbCBmcmFtZXMgaW4gdGhl IGRlYnVnZ2VyLiAqLwotbG9jYWxpemVkU3RyaW5nc1siQ29sbGFwc2UgYmxhY2tib3hlZCBjYWxs IGZyYW1lcyBAIEV4cGVyaW1lbnRhbCBTZXR0aW5ncyJdID0gIkNvbGxhcHNlIGJsYWNrYm94ZWQg Y2FsbCBmcmFtZXMiOworbG9jYWxpemVkU3RyaW5nc1siQ29sbGFwc2UgYmxhY2tib3hlZCBjYWxs IGZyYW1lcyBAIFNldHRpbmdzIFNvdXJjZXMgUGFuZSJdID0gIkNvbGxhcHNlIGJsYWNrYm94ZWQg Y2FsbCBmcmFtZXMiOwogbG9jYWxpemVkU3RyaW5nc1siQ29sbGFwc2UgY29sdW1ucyJdID0gIkNv bGxhcHNlIGNvbHVtbnMiOwogbG9jYWxpemVkU3RyaW5nc1siQ29sbGVjdCBnYXJiYWdlIl0gPSAi Q29sbGVjdCBnYXJiYWdlIjsKIC8qIFNlY3Rpb24gaGVhZGVyIGZvciB0aGUgZ3JvdXAgb2YgQ1NT IHZhcmlhYmxlcyB3aXRoIGNvbG9ycyBhcyB2YWx1ZXMgKi8KQEAgLTQzOCw4ICs0MzgsNiBAQCBs b2NhbGl6ZWRTdHJpbmdzWyJEZWJ1Z2dlciBTdGF0ZW1lbnRzIEAgSmF2YVNjcmlwdCBCcmVha3Bv aW50Il0gPSAiRGVidWdnZXIgU3RhdAogbG9jYWxpemVkU3RyaW5nc1siRGVidWdnZXIgZGlzYWJs ZWQgZHVyaW5nIEF1ZGl0Il0gPSAiRGVidWdnZXIgZGlzYWJsZWQgZHVyaW5nIEF1ZGl0IjsKIGxv Y2FsaXplZFN0cmluZ3NbIkRlYnVnZ2VyIGRpc2FibGVkIGR1cmluZyBUaW1lbGluZSByZWNvcmRp bmciXSA9ICJEZWJ1Z2dlciBkaXNhYmxlZCBkdXJpbmcgVGltZWxpbmUgcmVjb3JkaW5nIjsKIGxv Y2FsaXplZFN0cmluZ3NbIkRlYnVnZ2luZzoiXSA9ICJEZWJ1Z2dpbmc6IjsKLS8qIENhdGVnb3J5 IGxhYmVsIGZvciBleHBlcmltZW50YWwgc2V0dGluZ3MgcmVsYXRlZCB0byBkZWJ1Z2dpbmcuICov Ci1sb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1Z2dpbmc6IEAgRXhwZXJpbWVudGFsIFNldHRpbmdzIl0g PSAiRGVidWdnaW5nOiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWJ1Z3MiXSA9ICJEZWJ1Z3MiOwog bG9jYWxpemVkU3RyaW5nc1siRGVjb2RlZCJdID0gIkRlY29kZWQiOwogbG9jYWxpemVkU3RyaW5n c1siRGVmYXVsdCJdID0gIkRlZmF1bHQiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCmluZGV4IDg1M2Y3ZmMwNjAxNy4uNmMwMzE0 YjU5ODA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL1NldHRpbmcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv QmFzZS9TZXR0aW5nLmpzCkBAIC0xODYsNiArMTg2LDcgQEAgV0kuRGVidWdTZXR0aW5nID0gY2xh c3MgRGVidWdTZXR0aW5nIGV4dGVuZHMgV0kuU2V0dGluZwogV0kuc2V0dGluZ3MgPSB7CiAgICAg Y2FudmFzUmVjb3JkaW5nQXV0b0NhcHR1cmVFbmFibGVkOiBuZXcgV0kuU2V0dGluZygiY2FudmFz LXJlY29yZGluZy1hdXRvLWNhcHR1cmUtZW5hYmxlZCIsIGZhbHNlKSwKICAgICBjYW52YXNSZWNv cmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnQ6IG5ldyBXSS5TZXR0aW5nKCJjYW52YXMtcmVjb3Jk aW5nLWF1dG8tY2FwdHVyZS1mcmFtZS1jb3VudCIsIDEpLAorICAgIGNvbGxhcHNlQmxhY2tib3hl ZENhbGxGcmFtZXM6IG5ldyBXSS5TZXR0aW5nKCJjb2xsYXBzZS1ibGFja2JveGVkLWNhbGwtZnJh bWVzIiwgdHJ1ZSksCiAgICAgY29uc29sZUF1dG9FeHBhbmRUcmFjZTogbmV3IFdJLlNldHRpbmco ImNvbnNvbGUtYXV0by1leHBhbmQtdHJhY2UiLCB0cnVlKSwKICAgICBjb25zb2xlU2F2ZWRSZXN1 bHRBbGlhczogbmV3IFdJLlNldHRpbmcoImNvbnNvbGUtc2F2ZWQtcmVzdWx0LWFsaWFzIiwgIiIp LAogICAgIGNzc0NoYW5nZXNQZXJOb2RlOiBuZXcgV0kuU2V0dGluZygiY3NzLWNoYW5nZXMtcGVy LW5vZGUiLCBmYWxzZSksCkBAIC0yMjksNyArMjMwLDYgQEAgV0kuc2V0dGluZ3MgPSB7CiAgICAg ZXhwZXJpbWVudGFsRW5hYmxlUHJldmlld0ZlYXR1cmVzOiBuZXcgV0kuU2V0dGluZygiZXhwZXJp bWVudGFsLWVuYWJsZS1wcmV2aWV3LWZlYXR1cmVzIiwgdHJ1ZSksCiAgICAgZXhwZXJpbWVudGFs RW5hYmxlU3R5bGVzSnVtcFRvRWZmZWN0aXZlOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVudGFs LXN0eWxlcy1qdW1wLXRvLWVmZmVjdGl2ZSIsIGZhbHNlKSwKICAgICBleHBlcmltZW50YWxFbmFi bGVTdHlsZXNKdW1wVG9WYXJpYWJsZURlY2xhcmF0aW9uOiBuZXcgV0kuU2V0dGluZygiZXhwZXJp bWVudGFsLXN0eWxlcy1qdW1wLXRvLXZhcmlhYmxlLWRlY2xhcmF0aW9uIiwgZmFsc2UpLAotICAg IGV4cGVyaW1lbnRhbENvbGxhcHNlQmxhY2tib3hlZENhbGxGcmFtZXM6IG5ldyBXSS5TZXR0aW5n KCJleHBlcmltZW50YWwtY29sbGFwc2UtYmxhY2tib3hlZC1jYWxsLWZyYW1lcyIsIGZhbHNlKSwK ICAgICBleHBlcmltZW50YWxBbGxvd0luc3BlY3RpbmdJbnNwZWN0b3I6IG5ldyBXSS5TZXR0aW5n KCJleHBlcmltZW50YWwtYWxsb3ctaW5zcGVjdGluZy1pbnNwZWN0b3IiLCBmYWxzZSksCiAgICAg ZXhwZXJpbWVudGFsQ1NTQ29tcGxldGlvbkZ1enp5TWF0Y2hpbmc6IG5ldyBXSS5TZXR0aW5nKCJl eHBlcmltZW50YWwtY3NzLWNvbXBsZXRpb24tZnV6enktbWF0Y2hpbmciLCB0cnVlKSwKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGlu Z3NUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKaW5kZXggZGFhOTk0OTBmN2Y2Li5kNGVj ZDAyMGY3NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMzAx LDcgKzMwMSwxNSBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NU YWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogICAgIHsKICAgICAgICAgbGV0 IHNvdXJjZXNTZXR0aW5nc1ZpZXcgPSBuZXcgV0kuU2V0dGluZ3NWaWV3KCJzb3VyY2VzIiwgV0ku VUlTdHJpbmcoIlNvdXJjZXMiKSk7CiAKLSAgICAgICAgc291cmNlc1NldHRpbmdzVmlldy5hZGRT ZXR0aW5nKFdJLlVJU3RyaW5nKCJEZWJ1Z2dpbmc6IiksIFdJLnNldHRpbmdzLnNob3dTY29wZUNo YWluT25QYXVzZSwgV0kuVUlTdHJpbmcoIlNob3cgU2NvcGUgQ2hhaW4gb24gcGF1c2UiKSk7Cisg ICAgICAgIGxldCBkZWJ1Z2dpbmdHcm91cCA9IHNvdXJjZXNTZXR0aW5nc1ZpZXcuYWRkR3JvdXAo V0kuVUlTdHJpbmcoIkRlYnVnZ2luZzoiKSk7CisgICAgICAgIGRlYnVnZ2luZ0dyb3VwLmFkZFNl dHRpbmcoV0kuc2V0dGluZ3Muc2hvd1Njb3BlQ2hhaW5PblBhdXNlLCBXSS5VSVN0cmluZygiU2hv dyBTY29wZSBDaGFpbiBvbiBwYXVzZSIpKTsKKworICAgICAgICBsZXQgc3VwcG9ydHNCbGFja2Jv eGluZ1NjcmlwdHMgPSBXSS5EZWJ1Z2dlck1hbmFnZXIuc3VwcG9ydHNCbGFja2JveGluZ1Njcmlw dHMoKTsKKyAgICAgICAgbGV0IHNldHRpbmdzUmVxdWlyZVJlbG9hZCA9IFtdOworICAgICAgICBp ZiAoc3VwcG9ydHNCbGFja2JveGluZ1NjcmlwdHMpIHsKKyAgICAgICAgICAgIGRlYnVnZ2luZ0dy b3VwLmFkZFNldHRpbmcoV0kuc2V0dGluZ3MuY29sbGFwc2VCbGFja2JveGVkQ2FsbEZyYW1lcywg V0kuVUlTdHJpbmcoIkNvbGxhcHNlIGJsYWNrYm94ZWQgY2FsbCBmcmFtZXMiLCAiQ29sbGFwc2Ug YmxhY2tib3hlZCBjYWxsIGZyYW1lcyBAIFNldHRpbmdzIFNvdXJjZXMgUGFuZSIsICJTZXR0aW5n IHRvIGNvbGxhcHNlIGJsYWNrYm94ZWQgY2FsbCBmcmFtZXMgaW4gdGhlIGRlYnVnZ2VyLiIpKTsK KyAgICAgICAgICAgIHNldHRpbmdzUmVxdWlyZVJlbG9hZC5wdXNoKFdJLnNldHRpbmdzLmNvbGxh cHNlQmxhY2tib3hlZENhbGxGcmFtZXMpOworICAgICAgICB9CiAKICAgICAgICAgc291cmNlc1Nl dHRpbmdzVmlldy5hZGRTZXBhcmF0b3IoKTsKIApAQCAtMzE0LDYgKzMyMiw4IEBAIFdJLlNldHRp bmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMg V0kuVGFiQ29udGVudFZpCiAgICAgICAgIHRoaXMuX2NyZWF0ZVJlZmVyZW5jZUxpbmsoc291cmNl c1NldHRpbmdzVmlldyk7CiAKICAgICAgICAgdGhpcy5hZGRTZXR0aW5nc1ZpZXcoc291cmNlc1Nl dHRpbmdzVmlldyk7CisKKyAgICAgICAgdGhpcy5fY3JlYXRlUmVsb2FkSW5zcGVjdG9yQ29udGFp bmVyKHNvdXJjZXNTZXR0aW5nc1ZpZXcsIHNldHRpbmdzUmVxdWlyZVJlbG9hZCk7CiAgICAgfQog CiAgICAgX2NyZWF0ZUNvbnNvbGVTZXR0aW5nc1ZpZXcoKQpAQCAtMzg0LDggKzM5NCw2IEBAIFdJ LlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4 dGVuZHMgV0kuVGFiQ29udGVudFZpCiAgICAgewogICAgICAgICBsZXQgZXhwZXJpbWVudGFsU2V0 dGluZ3NWaWV3ID0gbmV3IFdJLlNldHRpbmdzVmlldygiZXhwZXJpbWVudGFsIiwgV0kuVUlTdHJp bmcoIkV4cGVyaW1lbnRhbCIpKTsKIAotICAgICAgICBsZXQgaW5pdGlhbFZhbHVlcyA9IG5ldyBN YXA7Ci0KICAgICAgICAgbGV0IGNhblNob3dQcmV2aWV3RmVhdHVyZXMgPSBXSS5jYW5TaG93UHJl dmlld0ZlYXR1cmVzKCk7CiAgICAgICAgIGlmIChjYW5TaG93UHJldmlld0ZlYXR1cmVzKSB7CiAg ICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2V0dGluZyhXSS5VSVN0cmlu ZygiU3RhZ2luZzoiKSwgV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsRW5hYmxlUHJldmlld0ZlYXR1 cmVzLCBXSS5VSVN0cmluZygiRW5hYmxlIFByZXZpZXcgRmVhdHVyZXMiKSk7CkBAIC00MDIsNDYg KzQxMCw0OCBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NUYWJD b250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogICAgICAgICAgICAgZXhwZXJpbWVu dGFsU2V0dGluZ3NWaWV3LmFkZFNlcGFyYXRvcigpOwogICAgICAgICB9CiAKLSAgICAgICAgbGV0 IHN1cHBvcnRzQmxhY2tib3hpbmdTY3JpcHRzID0gV0kuRGVidWdnZXJNYW5hZ2VyLnN1cHBvcnRz QmxhY2tib3hpbmdTY3JpcHRzKCk7Ci0gICAgICAgIGlmIChzdXBwb3J0c0JsYWNrYm94aW5nU2Ny aXB0cykgewotICAgICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNldHRpbmco V0kuVUlTdHJpbmcoIkRlYnVnZ2luZzoiLCAiRGVidWdnaW5nOiBAIEV4cGVyaW1lbnRhbCBTZXR0 aW5ncyIsICJDYXRlZ29yeSBsYWJlbCBmb3IgZXhwZXJpbWVudGFsIHNldHRpbmdzIHJlbGF0ZWQg dG8gZGVidWdnaW5nLiIpLCBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxDb2xsYXBzZUJsYWNrYm94 ZWRDYWxsRnJhbWVzLCBXSS5VSVN0cmluZygiQ29sbGFwc2UgYmxhY2tib3hlZCBjYWxsIGZyYW1l cyIsICJDb2xsYXBzZSBibGFja2JveGVkIGNhbGwgZnJhbWVzIEAgRXhwZXJpbWVudGFsIFNldHRp bmdzIiwgIlNldHRpbmcgdG8gY29sbGFwc2UgYmxhY2tib3hlZCBjYWxsIGZyYW1lcyBpbiB0aGUg ZGVidWdnZXIuIikpOwotICAgICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNl cGFyYXRvcigpOwotICAgICAgICB9Ci0KICAgICAgICAgbGV0IGRpYWdub3N0aWNzR3JvdXAgPSBl eHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkR3JvdXAoV0kuVUlTdHJpbmcoIkRpYWdub3N0aWNz OiIsICJEaWFnbm9zdGljczogQCBFeHBlcmltZW50YWwgU2V0dGluZ3MiLCAiQ2F0ZWdvcnkgbGFi ZWwgZm9yIGV4cGVyaW1lbnRhbCBzZXR0aW5ncyByZWxhdGVkIHRvIFdlYiBJbnNwZWN0b3IgZGlh Z25vc3RpY3MuIikpOwogICAgICAgICBkaWFnbm9zdGljc0dyb3VwLmFkZFNldHRpbmcoV0kuc2V0 dGluZ3MuZXhwZXJpbWVudGFsQWxsb3dJbnNwZWN0aW5nSW5zcGVjdG9yLCBXSS5VSVN0cmluZygi QWxsb3cgSW5zcGVjdGluZyBXZWIgSW5zcGVjdG9yIiwgIkFsbG93IEluc3BlY3RpbmcgV2ViIElu c3BlY3RvciBAIEV4cGVyaW1lbnRhbCBTZXR0aW5ncyIsICJMYWJlbCBmb3Igc2V0dGluZyB0aGF0 IGFsbG93cyB0aGUgdXNlciB0byBpbnNwZWN0IHRoZSBXZWIgSW5zcGVjdG9yIHVzZXIgaW50ZXJm YWNlLiIpKTsKICAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNlcGFyYXRvcigp OwogCisgICAgICAgIGxldCBzZXR0aW5nc1JlcXVpcmVSZWxvYWQgPSBbXTsKKyAgICAgICAgaWYg KGNhblNob3dQcmV2aWV3RmVhdHVyZXMpCisgICAgICAgICAgICBzZXR0aW5nc1JlcXVpcmVSZWxv YWQucHVzaChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVQcmV2aWV3RmVhdHVyZXMpOwor CisgICAgICAgIGlmIChoYXNDU1NEb21haW4pIHsKKyAgICAgICAgICAgIHNldHRpbmdzUmVxdWly ZVJlbG9hZC5wdXNoKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0p1bXBUb0Vm ZmVjdGl2ZSk7CisgICAgICAgICAgICBzZXR0aW5nc1JlcXVpcmVSZWxvYWQucHVzaChXSS5zZXR0 aW5ncy5leHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9WYXJpYWJsZURlY2xhcmF0aW9uKTsK KyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX2NyZWF0ZVJlbG9hZEluc3BlY3RvckNvbnRhaW5l cihleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcsIHNldHRpbmdzUmVxdWlyZVJlbG9hZCk7CisKKyAg ICAgICAgdGhpcy5fY3JlYXRlUmVmZXJlbmNlTGluayhleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcp OworCisgICAgICAgIHRoaXMuYWRkU2V0dGluZ3NWaWV3KGV4cGVyaW1lbnRhbFNldHRpbmdzVmll dyk7CisgICAgfQorCisgICAgX2NyZWF0ZVJlbG9hZEluc3BlY3RvckNvbnRhaW5lcihzZXR0aW5n c1ZpZXcsIHNldHRpbmdzKQorICAgIHsKKyAgICAgICAgaWYgKCFzZXR0aW5ncy5sZW5ndGgpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgbGV0IGluaXRpYWxWYWx1ZXMgPSBuZXcgTWFw OworCiAgICAgICAgIGxldCByZWxvYWRJbnNwZWN0b3JCdXR0b24gPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJidXR0b24iKTsKICAgICAgICAgcmVsb2FkSW5zcGVjdG9yQnV0dG9uLnRleHRDb250 ZW50ID0gV0kuVUlTdHJpbmcoIlJlbG9hZCBXZWIgSW5zcGVjdG9yIik7CiAgICAgICAgIHJlbG9h ZEluc3BlY3RvckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIChldmVudCkgPT4gewog ICAgICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnJlb3BlbigpOwogICAgICAgICB9KTsK IAotICAgICAgICBsZXQgcmVsb2FkSW5zcGVjdG9yQ29udGFpbmVyRWxlbWVudCA9IGV4cGVyaW1l bnRhbFNldHRpbmdzVmlldy5hZGRDZW50ZXJlZENvbnRhaW5lcihyZWxvYWRJbnNwZWN0b3JCdXR0 b24sIFdJLlVJU3RyaW5nKCJmb3IgY2hhbmdlcyB0byB0YWtlIGVmZmVjdCIpKTsKKyAgICAgICAg bGV0IHJlbG9hZEluc3BlY3RvckNvbnRhaW5lckVsZW1lbnQgPSBzZXR0aW5nc1ZpZXcuYWRkQ2Vu dGVyZWRDb250YWluZXIocmVsb2FkSW5zcGVjdG9yQnV0dG9uLCBXSS5VSVN0cmluZygiZm9yIGNo YW5nZXMgdG8gdGFrZSBlZmZlY3QiKSk7CiAgICAgICAgIHJlbG9hZEluc3BlY3RvckNvbnRhaW5l ckVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaGlkZGVuIik7CiAKLSAgICAgICAgZnVuY3Rpb24gbGlz dGVuRm9yQ2hhbmdlKHNldHRpbmcpIHsKKyAgICAgICAgZm9yIChsZXQgc2V0dGluZyBvZiBzZXR0 aW5ncykgewogICAgICAgICAgICAgaW5pdGlhbFZhbHVlcy5zZXQoc2V0dGluZywgc2V0dGluZy52 YWx1ZSk7CiAgICAgICAgICAgICBzZXR0aW5nLmFkZEV2ZW50TGlzdGVuZXIoV0kuU2V0dGluZy5F dmVudC5DaGFuZ2VkLCBmdW5jdGlvbihldmVudCkgewogICAgICAgICAgICAgICAgIHRoaXMuY2xh c3NMaXN0LnRvZ2dsZSgiaGlkZGVuIiwgQXJyYXkuZnJvbShpbml0aWFsVmFsdWVzKS5ldmVyeSgo W3NldHRpbmcsIGluaXRpYWxWYWx1ZV0pID0+IHNldHRpbmcudmFsdWUgPT09IGluaXRpYWxWYWx1 ZSkpOwogICAgICAgICAgICAgfSwgcmVsb2FkSW5zcGVjdG9yQ29udGFpbmVyRWxlbWVudCk7CiAg ICAgICAgIH0KLQotICAgICAgICBpZiAoY2FuU2hvd1ByZXZpZXdGZWF0dXJlcykKLSAgICAgICAg ICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVQcmV2aWV3 RmVhdHVyZXMpOwotCi0gICAgICAgIGlmIChoYXNDU1NEb21haW4pIHsKLSAgICAgICAgICAgIGxp c3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9F ZmZlY3RpdmUpOwotICAgICAgICAgICAgbGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVy aW1lbnRhbEVuYWJsZVN0eWxlc0p1bXBUb1ZhcmlhYmxlRGVjbGFyYXRpb24pOwotICAgICAgICB9 Ci0KLSAgICAgICAgaWYgKHN1cHBvcnRzQmxhY2tib3hpbmdTY3JpcHRzKQotICAgICAgICAgICAg bGlzdGVuRm9yQ2hhbmdlKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbENvbGxhcHNlQmxhY2tib3hl ZENhbGxGcmFtZXMpOwotCi0gICAgICAgIHRoaXMuX2NyZWF0ZVJlZmVyZW5jZUxpbmsoZXhwZXJp bWVudGFsU2V0dGluZ3NWaWV3KTsKLQotICAgICAgICB0aGlzLmFkZFNldHRpbmdzVmlldyhleHBl cmltZW50YWxTZXR0aW5nc1ZpZXcpOwogICAgIH0KIAogICAgIF9jcmVhdGVFbmdpbmVlcmluZ1Nl dHRpbmdzVmlldygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UaHJlYWRUcmVlRWxlbWVudC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RocmVhZFRyZWVFbGVtZW50LmpzCmluZGV4IDU1YzFiY2EzMmMx ZC4uNzU2NWQzNGYxMjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaHJlYWRUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaHJlYWRUcmVlRWxlbWVudC5qcwpAQCAtNTcsNyAr NTcsNyBAQCBXSS5UaHJlYWRUcmVlRWxlbWVudCA9IGNsYXNzIFRocmVhZFRyZWVFbGVtZW50IGV4 dGVuZHMgV0kuR2VuZXJhbFRyZWVFbGVtZW50CiAgICAgICAgIGxldCBhY3RpdmVDYWxsRnJhbWVU cmVlRWxlbWVudCA9IG51bGw7CiAKICAgICAgICAgbGV0IHJlbmRlckNhbGxGcmFtZXMgPSAoY2Fs bEZyYW1lcywgc2hvdWxkU2VsZWN0QWN0aXZlRnJhbWUpID0+IHsKLSAgICAgICAgICAgIGlmIChX SS5zZXR0aW5ncy5leHBlcmltZW50YWxDb2xsYXBzZUJsYWNrYm94ZWRDYWxsRnJhbWVzLnZhbHVl KQorICAgICAgICAgICAgaWYgKFdJLnNldHRpbmdzLmNvbGxhcHNlQmxhY2tib3hlZENhbGxGcmFt ZXMudmFsdWUpCiAgICAgICAgICAgICAgICAgY2FsbEZyYW1lcyA9IGNhbGxGcmFtZXMuZ3JvdXBC eSgoY2FsbEZyYW1lKSA9PiBjYWxsRnJhbWUuYmxhY2tib3hlZCk7CiAKICAgICAgICAgICAgIGZv ciAobGV0IGNhbGxGcmFtZU9yQmxhY2tib3hlZEdyb3VwIG9mIGNhbGxGcmFtZXMpIHsK 449948 2022-01-25 12:00:25 -0800 2022-01-25 16:25:43 -0800 Patch patch.txt text/plain 7686 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDIxZDM4YWIwOWM4OC4uZTdlNjNmZjY0NWQ4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAyMi0wMS0yNSAgTmlr aXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBDb2xsYXBzZSBibGFja2JveGVkIGNhbGwgZnJhbWVzIGJ5IGRlZmF1bHQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDU4MQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vODY5NjcwODg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlICJDb2xsYXBzZSBibGFja2JveGVkIGNhbGwgZnJhbWVz IiBjaGVja2JveCBmcm9tIHRoZSBleHBlcmltZW50YWwgc2V0dGluZ3MKKyAgICAgICAgYW5kIGVu YWJsZSB0aGUgZmVhdHVyZSBieSBkZWZhdWx0LgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9l bi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFz ZS9TZXR0aW5nLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FsbEZy YW1lVHJlZUNvbnRyb2xsZXIuanM6CisgICAgICAgIChXSS5DYWxsRnJhbWVUcmVlQ29udHJvbGxl ci5wcm90b3R5cGUuZ3JvdXBCbGFja2JveGVkQ2FsbEZyYW1lcyk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9EZWJ1Z2dlck1hbmFnZXIuanM6CisgICAgICAgIChXSS5EZWJ1 Z2dlck1hbmFnZXIucHJvdG90eXBlLnNob3VsZEF1dG9FeHBhbmRCbGFja2JveGVkQ2FsbEZyYW1l R3JvdXApOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50 Vmlldy5qczoKKyAgICAgICAgKFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcucHJvdG90eXBlLl9j cmVhdGVFeHBlcmltZW50YWxTZXR0aW5nc1ZpZXcpOgorCiAyMDIyLTAxLTI1ICBEZXZpbiBSb3Vz c28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZXBsYWNl IGdlYXItd2l0aC1jb250ZXh0bWVudSBpY29ucyB1c2VkIGZvciBmaWx0ZXJpbmcgd2l0aCBmaWx0 ZXItd2l0aC1jb250ZXh0bWVudSBpY29ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMK aW5kZXggZGQyNGMzMDczYzgzLi4xYTJjZTQ2MjFkYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qcwpAQCAtMzQ0LDggKzM0NCw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIkNsb3N1cmUg VmFyaWFibGVzIl0gPSAiQ2xvc3VyZSBWYXJpYWJsZXMiOwogbG9jYWxpemVkU3RyaW5nc1siQ2xv c3VyZSBWYXJpYWJsZXMgKCVzKSJdID0gIkNsb3N1cmUgVmFyaWFibGVzICglcykiOwogbG9jYWxp emVkU3RyaW5nc1siQ29kZSJdID0gIkNvZGUiOwogbG9jYWxpemVkU3RyaW5nc1siQ29sbGFwc2Ug QWxsIl0gPSAiQ29sbGFwc2UgQWxsIjsKLS8qIFNldHRpbmcgdG8gY29sbGFwc2UgYmxhY2tib3hl ZCBjYWxsIGZyYW1lcyBpbiB0aGUgZGVidWdnZXIuICovCi1sb2NhbGl6ZWRTdHJpbmdzWyJDb2xs YXBzZSBibGFja2JveGVkIGNhbGwgZnJhbWVzIEAgRXhwZXJpbWVudGFsIFNldHRpbmdzIl0gPSAi Q29sbGFwc2UgYmxhY2tib3hlZCBjYWxsIGZyYW1lcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb2xs YXBzZSBjb2x1bW5zIl0gPSAiQ29sbGFwc2UgY29sdW1ucyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJD b2xsZWN0IGdhcmJhZ2UiXSA9ICJDb2xsZWN0IGdhcmJhZ2UiOwogLyogU2VjdGlvbiBoZWFkZXIg Zm9yIHRoZSBncm91cCBvZiBDU1MgdmFyaWFibGVzIHdpdGggY29sb3JzIGFzIHZhbHVlcyAqLwpA QCAtNDQ1LDggKzQ0Myw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIkRlYnVnZ2VyIFN0YXRlbWVudHMg QCBKYXZhU2NyaXB0IEJyZWFrcG9pbnQiXSA9ICJEZWJ1Z2dlciBTdGF0CiBsb2NhbGl6ZWRTdHJp bmdzWyJEZWJ1Z2dlciBkaXNhYmxlZCBkdXJpbmcgQXVkaXQiXSA9ICJEZWJ1Z2dlciBkaXNhYmxl ZCBkdXJpbmcgQXVkaXQiOwogbG9jYWxpemVkU3RyaW5nc1siRGVidWdnZXIgZGlzYWJsZWQgZHVy aW5nIFRpbWVsaW5lIHJlY29yZGluZyJdID0gIkRlYnVnZ2VyIGRpc2FibGVkIGR1cmluZyBUaW1l bGluZSByZWNvcmRpbmciOwogbG9jYWxpemVkU3RyaW5nc1siRGVidWdnaW5nOiJdID0gIkRlYnVn Z2luZzoiOwotLyogQ2F0ZWdvcnkgbGFiZWwgZm9yIGV4cGVyaW1lbnRhbCBzZXR0aW5ncyByZWxh dGVkIHRvIGRlYnVnZ2luZy4gKi8KLWxvY2FsaXplZFN0cmluZ3NbIkRlYnVnZ2luZzogQCBFeHBl cmltZW50YWwgU2V0dGluZ3MiXSA9ICJEZWJ1Z2dpbmc6IjsKIGxvY2FsaXplZFN0cmluZ3NbIkRl YnVncyJdID0gIkRlYnVncyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWNvZGVkIl0gPSAiRGVjb2Rl ZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZWZhdWx0Il0gPSAiRGVmYXVsdCI7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKaW5kZXgg ODUzZjdmYzA2MDE3Li4wYWNkZDFhMTM1ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRpbmcuanMKQEAgLTIyOSw3ICsyMjksNiBAQCBX SS5zZXR0aW5ncyA9IHsKICAgICBleHBlcmltZW50YWxFbmFibGVQcmV2aWV3RmVhdHVyZXM6IG5l dyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtZW5hYmxlLXByZXZpZXctZmVhdHVyZXMiLCB0cnVl KSwKICAgICBleHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9FZmZlY3RpdmU6IG5ldyBXSS5T ZXR0aW5nKCJleHBlcmltZW50YWwtc3R5bGVzLWp1bXAtdG8tZWZmZWN0aXZlIiwgZmFsc2UpLAog ICAgIGV4cGVyaW1lbnRhbEVuYWJsZVN0eWxlc0p1bXBUb1ZhcmlhYmxlRGVjbGFyYXRpb246IG5l dyBXSS5TZXR0aW5nKCJleHBlcmltZW50YWwtc3R5bGVzLWp1bXAtdG8tdmFyaWFibGUtZGVjbGFy YXRpb24iLCBmYWxzZSksCi0gICAgZXhwZXJpbWVudGFsQ29sbGFwc2VCbGFja2JveGVkQ2FsbEZy YW1lczogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1jb2xsYXBzZS1ibGFja2JveGVkLWNh bGwtZnJhbWVzIiwgZmFsc2UpLAogICAgIGV4cGVyaW1lbnRhbEFsbG93SW5zcGVjdGluZ0luc3Bl Y3RvcjogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1hbGxvdy1pbnNwZWN0aW5nLWluc3Bl Y3RvciIsIGZhbHNlKSwKICAgICBleHBlcmltZW50YWxDU1NDb21wbGV0aW9uRnV6enlNYXRjaGlu ZzogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1jc3MtY29tcGxldGlvbi1mdXp6eS1tYXRj aGluZyIsIHRydWUpLAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9DYWxsRnJhbWVUcmVlQ29udHJvbGxlci5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbGxGcmFtZVRyZWVDb250 cm9sbGVyLmpzCmluZGV4IDVhZTRjZTI4ODdmYi4uNWUwZDUxNGIxMGVhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYWxsRnJhbWVU cmVlQ29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9DYWxsRnJhbWVUcmVlQ29udHJvbGxlci5qcwpAQCAtNzgsNyArNzgsNyBA QCBXSS5DYWxsRnJhbWVUcmVlQ29udHJvbGxlciA9IGNsYXNzIENhbGxGcmFtZVRyZWVDb250cm9s bGVyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICAgICAgaWYgKCFkaXNwbGF5YWJsZShj YWxsRnJhbWUpKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAgICAg ICAgIGlmIChjYWxsRnJhbWUuYmxhY2tib3hlZCAmJiBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxD b2xsYXBzZUJsYWNrYm94ZWRDYWxsRnJhbWVzLnZhbHVlKSB7CisgICAgICAgICAgICAgICAgaWYg KGNhbGxGcmFtZS5ibGFja2JveGVkKSB7CiAgICAgICAgICAgICAgICAgICAgIGJsYWNrYm94ZWRD YWxsRnJhbWVHcm91cFN0YXJ0SW5kZXggPz89IGk7CiAgICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RlYnVnZ2VyTWFuYWdlci5q cwppbmRleCA2MjgyOGE3ZWQ0YWMuLjA0ZjA2YWFiNTE2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRGVidWdnZXJNYW5hZ2VyLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0Rl YnVnZ2VyTWFuYWdlci5qcwpAQCAtNTQwLDcgKzU0MCw2IEBAIFdJLkRlYnVnZ2VyTWFuYWdlciA9 IGNsYXNzIERlYnVnZ2VyTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgc2hvdWxkQXV0 b0V4cGFuZEJsYWNrYm94ZWRDYWxsRnJhbWVHcm91cChibGFja2JveGVkQ2FsbEZyYW1lR3JvdXAp CiAgICAgewotICAgICAgICBjb25zb2xlLmFzc2VydChXSS5zZXR0aW5ncy5leHBlcmltZW50YWxD b2xsYXBzZUJsYWNrYm94ZWRDYWxsRnJhbWVzLnZhbHVlKTsKICAgICAgICAgY29uc29sZS5hc3Nl cnQoQXJyYXkuaXNBcnJheShibGFja2JveGVkQ2FsbEZyYW1lR3JvdXApICYmIGJsYWNrYm94ZWRD YWxsRnJhbWVHcm91cC5sZW5ndGggJiYgYmxhY2tib3hlZENhbGxGcmFtZUdyb3VwLmV2ZXJ5KChj YWxsRnJhbWUpID0+IGNhbGxGcmFtZSBpbnN0YW5jZW9mIFdJLkNhbGxGcmFtZSAmJiBjYWxsRnJh bWUuYmxhY2tib3hlZCksIGJsYWNrYm94ZWRDYWxsRnJhbWVHcm91cCk7CiAKICAgICAgICAgcmV0 dXJuIHRoaXMuX2JsYWNrYm94ZWRDYWxsRnJhbWVHcm91cHNUb0F1dG9FeHBhbmQuc29tZSgoYmxh Y2tib3hlZENhbGxGcmFtZUdyb3VwVG9BdXRvRXhwYW5kKSA9PiB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRW aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGlu Z3NUYWJDb250ZW50Vmlldy5qcwppbmRleCBkYWE5OTQ5MGY3ZjYuLjYxZGI3NjY2ZWJlYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGlu Z3NUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCkBAIC00MDIsMTIgKzQwMiw2IEBA IFdJLlNldHRpbmdzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3 IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpCiAgICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5n c1ZpZXcuYWRkU2VwYXJhdG9yKCk7CiAgICAgICAgIH0KIAotICAgICAgICBsZXQgc3VwcG9ydHNC bGFja2JveGluZ1NjcmlwdHMgPSBXSS5EZWJ1Z2dlck1hbmFnZXIuc3VwcG9ydHNCbGFja2JveGlu Z1NjcmlwdHMoKTsKLSAgICAgICAgaWYgKHN1cHBvcnRzQmxhY2tib3hpbmdTY3JpcHRzKSB7Ci0g ICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2V0dGluZyhXSS5VSVN0cmlu ZygiRGVidWdnaW5nOiIsICJEZWJ1Z2dpbmc6IEAgRXhwZXJpbWVudGFsIFNldHRpbmdzIiwgIkNh dGVnb3J5IGxhYmVsIGZvciBleHBlcmltZW50YWwgc2V0dGluZ3MgcmVsYXRlZCB0byBkZWJ1Z2dp bmcuIiksIFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbENvbGxhcHNlQmxhY2tib3hlZENhbGxGcmFt ZXMsIFdJLlVJU3RyaW5nKCJDb2xsYXBzZSBibGFja2JveGVkIGNhbGwgZnJhbWVzIiwgIkNvbGxh cHNlIGJsYWNrYm94ZWQgY2FsbCBmcmFtZXMgQCBFeHBlcmltZW50YWwgU2V0dGluZ3MiLCAiU2V0 dGluZyB0byBjb2xsYXBzZSBibGFja2JveGVkIGNhbGwgZnJhbWVzIGluIHRoZSBkZWJ1Z2dlci4i KSk7Ci0gICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2VwYXJhdG9yKCk7 Ci0gICAgICAgIH0KLQogICAgICAgICBsZXQgZGlhZ25vc3RpY3NHcm91cCA9IGV4cGVyaW1lbnRh bFNldHRpbmdzVmlldy5hZGRHcm91cChXSS5VSVN0cmluZygiRGlhZ25vc3RpY3M6IiwgIkRpYWdu b3N0aWNzOiBAIEV4cGVyaW1lbnRhbCBTZXR0aW5ncyIsICJDYXRlZ29yeSBsYWJlbCBmb3IgZXhw ZXJpbWVudGFsIHNldHRpbmdzIHJlbGF0ZWQgdG8gV2ViIEluc3BlY3RvciBkaWFnbm9zdGljcy4i KSk7CiAgICAgICAgIGRpYWdub3N0aWNzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0aW5ncy5leHBl cmltZW50YWxBbGxvd0luc3BlY3RpbmdJbnNwZWN0b3IsIFdJLlVJU3RyaW5nKCJBbGxvdyBJbnNw ZWN0aW5nIFdlYiBJbnNwZWN0b3IiLCAiQWxsb3cgSW5zcGVjdGluZyBXZWIgSW5zcGVjdG9yIEAg RXhwZXJpbWVudGFsIFNldHRpbmdzIiwgIkxhYmVsIGZvciBzZXR0aW5nIHRoYXQgYWxsb3dzIHRo ZSB1c2VyIHRvIGluc3BlY3QgdGhlIFdlYiBJbnNwZWN0b3IgdXNlciBpbnRlcmZhY2UuIikpOwog ICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2VwYXJhdG9yKCk7CkBAIC00MzYs OSArNDMwLDYgQEAgV0kuU2V0dGluZ3NUYWJDb250ZW50VmlldyA9IGNsYXNzIFNldHRpbmdzVGFi Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50VmkKICAgICAgICAgICAgIGxpc3RlbkZv ckNoYW5nZShXSS5zZXR0aW5ncy5leHBlcmltZW50YWxFbmFibGVTdHlsZXNKdW1wVG9WYXJpYWJs ZURlY2xhcmF0aW9uKTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChzdXBwb3J0c0JsYWNrYm94 aW5nU2NyaXB0cykKLSAgICAgICAgICAgIGxpc3RlbkZvckNoYW5nZShXSS5zZXR0aW5ncy5leHBl cmltZW50YWxDb2xsYXBzZUJsYWNrYm94ZWRDYWxsRnJhbWVzKTsKLQogICAgICAgICB0aGlzLl9j cmVhdGVSZWZlcmVuY2VMaW5rKGV4cGVyaW1lbnRhbFNldHRpbmdzVmlldyk7CiAKICAgICAgICAg dGhpcy5hZGRTZXR0aW5nc1ZpZXcoZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3KTsK