217233 2020-10-02 10:20:09 -0700 [Cocoa] Add WKUIDelegate SPI to inform clients when a _WKInspector is about to close 2020-10-04 14:47:17 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg ews-watchlist hi inspector-bugzilla-changes joepeck timothy webkit-bug-importer oldest_to_newest 1694131 0 bburg 2020-10-02 10:20:09 -0700 . 1694157 1 410341 bburg 2020-10-02 11:06:03 -0700 Created attachment 410341 Patch 1694158 2 webkit-bug-importer 2020-10-02 11:06:41 -0700 <rdar://problem/69888193> 1694172 3 410341 hi 2020-10-02 11:52:14 -0700 Comment on attachment 410341 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410341&action=review r=me as well :) > Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp:522 > + // Guard against calls to close() made by the client while already closing. Should we have something similar for `show()` too? Also, can we make an API test for this? > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKInspectorDelegate.mm:122 > +TEST(WKInspectorDelegate, WillCloseLocalInspector) IMO why not just combine these two tests and call it something like "OpenCloseLifecycle"? 1694543 4 410341 bburg 2020-10-04 09:16:04 -0700 Comment on attachment 410341 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410341&action=review >> Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp:522 >> + // Guard against calls to close() made by the client while already closing. > > Should we have something similar for `show()` too? > > Also, can we make an API test for this? OK >> Tools/TestWebKitAPI/Tests/WebKitCocoa/WKInspectorDelegate.mm:122 >> +TEST(WKInspectorDelegate, WillCloseLocalInspector) > > IMO why not just combine these two tests and call it something like "OpenCloseLifecycle"? I want to isolate the Browser domain callbacks as that could break independently of the UIDelegate methods. 1694565 5 410481 bburg 2020-10-04 13:06:30 -0700 Created attachment 410481 Patch 1694583 6 ews-feeder 2020-10-04 14:47:16 -0700 Committed r267950: <https://trac.webkit.org/changeset/267950> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410481. 410341 2020-10-02 11:06:03 -0700 2020-10-04 13:06:29 -0700 Patch bug-217233-20201002110602.patch text/plain 12635 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3Nzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg2MDIyZTFhNTU5ODBhNzY5 NDk1M2M2ZjkyYmI2MTk0MTdmNWRhMTAuLjQ2OWNjMTgzYjc3MGViNDg2OGVlNmNlOGJiODU2Y2Nk NzBmZWFkOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjAtMTAtMDIgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBBZGQgV0tVSURlbGVnYXRl IFNQSSB0byBpbmZvcm0gY2xpZW50cyB3aGVuIGEgX1dLSW5zcGVjdG9yIGlzIGFib3V0IHRvIGNs b3NlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTcy MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGlzIGNvbXBsZW1lbnRhcnkgdG8gX3dlYlZpZXc6ZGlkQXR0YWNoTG9jYWxJbnNwZWN0b3I6IGFu ZCB3b3JrcyBzaW1pbGFybHkuCisgICAgICAgIENsaWVudHMgbmVlZCB0byBiZSBjYXJlZnVsIGlu IGRlcGVuZGluZyBvbiB0aGlzIGR1cmluZyB0ZWFyZG93biwgYmVjYXVzZSBpdCB3b24ndAorICAg ICAgICBjb21lIGlmIHRoZSBVSURlbGVnYXRlIGhhcyBhbHJlYWR5IGJlZW4gY2xlYXJlZCBvdXQg d2hpbGUgdGhlIGluc3BlY3RlZCBwYWdlIGlzIGJlaW5nIGNsb3NlZC4KKworICAgICAgICBBUEkg dGVzdDogV0tJbnNwZWN0b3JEZWxlZ2F0ZS5XaWxsQ2xvc2VMb2NhbEluc3BlY3RvcgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9BUElVSUNsaWVudC5oOgorICAgICAgICAoQVBJOjpVSUNsaWVu dDo6d2lsbENsb3NlTG9jYWxJbnNwZWN0b3IpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29j b2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9VSURl bGVnYXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW06CisgICAg ICAgIChXZWJLaXQ6OlVJRGVsZWdhdGU6OnNldERlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6 VUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OndpbGxDbG9zZUxvY2FsSW5zcGVjdG9yKToKKyAgICAgICAg KiBVSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclByb3h5Lmg6CisgICAgICAgICogVUlQ cm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkluc3BlY3RvclByb3h5OjpjbG9zZUZyb250ZW5kUGFnZUFuZFdpbmRvdyk6CisgICAgICAg IEFkZCBhIGd1YXJkIGZvciByZWVudHJhbnQgY2FsbHMgdG8gY2xvc2UoKS4KKwogMjAyMC0xMC0w MSAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFdlYiBJ bnNwZWN0b3I6IGFkZCBhbiBPYmpDIHByb3RvY29sIGZvciBleHRlbnNpb24gc3VwcG9ydApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVVJQ2xpZW50LmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaAppbmRleCBlY2MxNjJkZTQ0NWIy YjBhMGZiN2RmZWUzZDVlMGQ4ZWRmNjljOGFhLi43YjRmOTNhYTQyNjU0MWZkYjMxZWM4ODE3NzBi MmYzMzZhZWU4ZjhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJ VUlDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQu aApAQCAtMTk1LDYgKzE5NSw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiAgICAgdmlydHVhbCB2b2lk IGRpZEF0dGFjaExvY2FsSW5zcGVjdG9yKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgV2ViS2l0OjpX ZWJJbnNwZWN0b3JQcm94eSYpIHsgfQorICAgIHZpcnR1YWwgdm9pZCB3aWxsQ2xvc2VMb2NhbElu c3BlY3RvcihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYktpdDo6V2ViSW5zcGVjdG9yUHJveHkm KSB7IH0KIH07CiAKIH0gLy8gbmFtZXNwYWNlIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQcml2YXRlLmgKaW5kZXggYjZmNDY5 ZmQzYTkzMzkxNzcyYWNlMjI2NzUyMzg5M2UxMGY1NTNmMi4uN2ZjYzRhOTEzNmYxMDcxZDJiZTI1 NzI3M2NiYzY5MGFmNjNmZDJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oCkBAIC0yNTMsNiArMjUzLDEyIEBA IHN0cnVjdCBVSUVkZ2VJbnNldHM7CiAgKi8KIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAq KXdlYlZpZXcgZGlkQXR0YWNoTG9jYWxJbnNwZWN0b3I6KF9XS0luc3BlY3RvciAqKWluc3BlY3Rv ciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpKTsKIAorLyohIEBhYnN0cmFjdCBD YWxsZWQgYmVmb3JlIGNsb3NpbmcgdGhlIFdlYiBJbnNwZWN0b3IgaW5zdGFuY2UgZm9yIHRoaXMg V0tXZWJWaWV3LiBUaGlzIGlzIG5vdCBjYWxsZWQgaW4gdGhlIGNhc2Ugb2YgcmVtb3RlIGluc3Bl Y3Rpb24uCisgICAgQHBhcmFtIHdlYlZpZXcgVGhlIFdLV2ViVmlldyBpbnN0YW5jZSBiZWluZyBp bnNwZWN0ZWQuCisgICAgQHBhcmFtIGluc3BlY3RvciBUaGUgV2ViIEluc3BlY3RvciBpbnN0YW5j ZSBiZWluZyBjbG9zZWQuCisgKi8KKy0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZp ZXcgd2lsbENsb3NlTG9jYWxJbnNwZWN0b3I6KF9XS0luc3BlY3RvciAqKWluc3BlY3RvciBXS19B UElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpKTsKKwogI2VuZGlmIC8vICFUQVJHRVRfT1Nf SVBIT05FCiAKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29h L1VJRGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUu aAppbmRleCBkZTI5NDRjODRmYTNkMzc3M2NkNGUwZWM3NDczNTcwN2FiNWM5NDczLi5hNDllNjUz OTdmNDc1NzIzNzE4MzNjNWY3NTQ4NGNlZTFkM2NiOGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCkBAIC0xMjUsNiArMTI1LDcgQEAgcHJpdmF0ZToKICAg ICAgICAgdm9pZCBkaWRFeGNlZWRCYWNrZ3JvdW5kUmVzb3VyY2VMaW1pdFdoaWxlSW5Gb3JlZ3Jv dW5kKFdlYlBhZ2VQcm94eSYsIFdLUmVzb3VyY2VMaW1pdCkgZmluYWw7CiAgICAgICAgIHZvaWQg c2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihXZWJQYWdlUHJveHkqLCBjb25zdCBXVEY6 OlN0cmluZyYsIGNvbnN0IFdURjo6U3RyaW5nJiwgY29uc3QgVVJMJiwgQVBJOjpEYXRhJikgZmlu YWw7CiAgICAgICAgIHZvaWQgZGlkQXR0YWNoTG9jYWxJbnNwZWN0b3IoV2ViUGFnZVByb3h5Jiwg V2ViSW5zcGVjdG9yUHJveHkmKSBmaW5hbDsKKyAgICAgICAgdm9pZCB3aWxsQ2xvc2VMb2NhbElu c3BlY3RvcihXZWJQYWdlUHJveHkmLCBXZWJJbnNwZWN0b3JQcm94eSYpIGZpbmFsOwogI2VuZGlm CiAjaWYgRU5BQkxFKERFVklDRV9PUklFTlRBVElPTikKICAgICAgICAgdm9pZCBzaG91bGRBbGxv d0RldmljZU9yaWVudGF0aW9uQW5kTW90aW9uQWNjZXNzKFdlYktpdDo6V2ViUGFnZVByb3h5Jiwg V2ViRnJhbWVQcm94eSYsIEZyYW1lSW5mb0RhdGEmJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChi b29sKT4mJikgZmluYWw7CkBAIC0yMDEsNiArMjAyLDcgQEAgcHJpdmF0ZToKICAgICAgICAgYm9v bCB3ZWJWaWV3UnVuT3BlblBhbmVsV2l0aFBhcmFtZXRlcnNJbml0aWF0ZWRCeUZyYW1lQ29tcGxl dGlvbkhhbmRsZXIgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdSZXF1ZXN0Tm90aWZpY2F0aW9u UGVybWlzc2lvbkZvclNlY3VyaXR5T3JpZ2luRGVjaXNpb25IYW5kbGVyIDogMTsKICAgICAgICAg Ym9vbCB3ZWJWaWV3RGlkQXR0YWNoTG9jYWxJbnNwZWN0b3IgOiAxOworICAgICAgICBib29sIHdl YlZpZXdXaWxsQ2xvc2VMb2NhbEluc3BlY3RvciA6IDE7CiAjZW5kaWYKICNpZiBFTkFCTEUoREVW SUNFX09SSUVOVEFUSU9OKQogICAgICAgICBib29sIHdlYlZpZXdTaG91bGRBbGxvd0RldmljZU9y aWVudGF0aW9uQW5kTW90aW9uQWNjZXNzUmVxdWVzdGVkQnlGcmFtZURlY2lzaW9uSGFuZGxlciA6 IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRl Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQppbmRleCAz Yzg4YWQ2NWNiZWVlYmRkYWI0YTA0NGZkZDVlZDUxNWRlZGEwMWJiLi4xMzlhZmFhZWEzNWVmNTVl YzQ2YWUyNGYxNjEzMjc4MTRhMjdjYWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL1VJRGVsZWdhdGUubW0KQEAgLTEzMSw2ICsxMzEsNyBAQCB2b2lkIFVJRGVsZWdhdGU6OnNl dERlbGVnYXRlKGlkIDxXS1VJRGVsZWdhdGU+IGRlbGVnYXRlKQogICAgIG1fZGVsZWdhdGVNZXRo b2RzLndlYlZpZXdSdW5PcGVuUGFuZWxXaXRoUGFyYW1ldGVyc0luaXRpYXRlZEJ5RnJhbWVDb21w bGV0aW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdl YlZpZXc6cnVuT3BlblBhbmVsV2l0aFBhcmFtZXRlcnM6aW5pdGlhdGVkQnlGcmFtZTpjb21wbGV0 aW9uSGFuZGxlcjopXTsKICAgICBtX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3UmVxdWVzdE5vdGlm aWNhdGlvblBlcm1pc3Npb25Gb3JTZWN1cml0eU9yaWdpbkRlY2lzaW9uSGFuZGxlciA9IFtkZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OnJlcXVlc3ROb3RpZmlj YXRpb25QZXJtaXNzaW9uRm9yU2VjdXJpdHlPcmlnaW46ZGVjaXNpb25IYW5kbGVyOildOwogICAg IG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRBdHRhY2hMb2NhbEluc3BlY3RvciA9IFtkZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRpZEF0dGFjaExvY2Fs SW5zcGVjdG9yOildOworICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdXaWxsQ2xvc2VMb2Nh bEluc3BlY3RvciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJW aWV3OndpbGxDbG9zZUxvY2FsSW5zcGVjdG9yOildOwogI2VuZGlmCiAjaWYgRU5BQkxFKERFVklD RV9PUklFTlRBVElPTikKICAgICBtX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3U2hvdWxkQWxsb3dE ZXZpY2VPcmllbnRhdGlvbkFuZE1vdGlvbkFjY2Vzc1JlcXVlc3RlZEJ5RnJhbWVEZWNpc2lvbkhh bmRsZXIgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpz aG91bGRBbGxvd0RldmljZU9yaWVudGF0aW9uQW5kTW90aW9uQWNjZXNzUmVxdWVzdGVkQnlGcmFt ZTpkZWNpc2lvbkhhbmRsZXI6KV07CkBAIC04MjcsNiArODI4LDE4IEBAIHZvaWQgVUlEZWxlZ2F0 ZTo6VUlDbGllbnQ6OmRpZEF0dGFjaExvY2FsSW5zcGVjdG9yKFdlYlBhZ2VQcm94eSYsIFdlYklu c3BlY3RvclByCiAgICAgWyhpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4pZGVsZWdhdGUgX3dlYlZp ZXc6bV91aURlbGVnYXRlLm1fd2ViVmlldyBkaWRBdHRhY2hMb2NhbEluc3BlY3Rvcjp3cmFwcGVy KGluc3BlY3RvcildOwogfQogCit2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50Ojp3aWxsQ2xvc2VM b2NhbEluc3BlY3RvcihXZWJQYWdlUHJveHkmLCBXZWJJbnNwZWN0b3JQcm94eSYgaW5zcGVjdG9y KQoreworICAgIGlmICghbV91aURlbGVnYXRlLm1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdXaWxs Q2xvc2VMb2NhbEluc3BlY3RvcikKKyAgICAgICAgcmV0dXJuOworCisgICAgYXV0byBkZWxlZ2F0 ZSA9IG1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlLmdldCgpOworICAgIGlmICghZGVsZWdhdGUpCisg ICAgICAgIHJldHVybjsKKworICAgIFsoaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+KWRlbGVnYXRl IF93ZWJWaWV3Om1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcgd2lsbENsb3NlTG9jYWxJbnNwZWN0b3I6 d3JhcHBlcihpbnNwZWN0b3IpXTsKK30KKwogYm9vbCBVSURlbGVnYXRlOjpVSUNsaWVudDo6cnVu T3BlblBhbmVsKFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViRnJhbWVQcm94eSogd2ViRnJhbWVQcm94 eSwgRnJhbWVJbmZvRGF0YSYmIGZyYW1lSW5mbywgQVBJOjpPcGVuUGFuZWxQYXJhbWV0ZXJzKiBv cGVuUGFuZWxQYXJhbWV0ZXJzLCBXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5KiBsaXN0 ZW5lcikKIHsKICAgICBpZiAoIW1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3 UnVuT3BlblBhbmVsV2l0aFBhcmFtZXRlcnNJbml0aWF0ZWRCeUZyYW1lQ29tcGxldGlvbkhhbmRs ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5z cGVjdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYklu c3BlY3RvclByb3h5LmNwcAppbmRleCA5NTg0ZmVkNDZlNGY4OTIyMGUwODk4OGNiNWZkY2I1YWJl MDlkMGIxLi5mMGY3YjJkZjVlNDE5MmFjNDU0OGI4ZjdiY2I5OTdkMWYxMzBkNDYwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JQ cm94eS5jcHAKQEAgLTUxOSw2ICs1MTksMTUgQEAgdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6Y2xv c2VGcm9udGVuZFBhZ2VBbmRXaW5kb3coKQogICAgIGlmICghbV9pbnNwZWN0b3JQYWdlKQogICAg ICAgICByZXR1cm47CiAKKyAgICAvLyBHdWFyZCBhZ2FpbnN0IGNhbGxzIHRvIGNsb3NlKCkgbWFk ZSBieSB0aGUgY2xpZW50IHdoaWxlIGFscmVhZHkgY2xvc2luZy4KKyAgICBpZiAobV9jbG9zaW5n KQorICAgICAgICByZXR1cm47CisgICAgCisgICAgU2V0Rm9yU2NvcGU8Ym9vbD4gcmVlbnRyYW5j eVByb3RlY3RvcihtX2Nsb3NpbmcsIHRydWUpOworICAgIAorICAgIC8vIE5vdGlmeSBXZWJLaXQg Y2xpZW50IHdoZW4gYSBsb2NhbCBpbnNwZWN0b3IgY2xvc2VzIHNvIGl0IGNhbiBjbGVhciBfV0tJ bnNwZWN0b3JEZWxlZ2F0ZSBhbmQgcGVyZm9ybSBvdGhlciBjbGVhbnVwLgorICAgIG1faW5zcGVj dGVkUGFnZS0+dWlDbGllbnQoKS53aWxsQ2xvc2VMb2NhbEluc3BlY3RvcigqbV9pbnNwZWN0ZWRQ YWdlLCAqdGhpcyk7CisKICAgICBtX2lzVmlzaWJsZSA9IGZhbHNlOwogICAgIG1faXNQcm9maWxp bmdQYWdlID0gZmFsc2U7CiAgICAgbV9zaG93TWVzc2FnZVNlbnQgPSBmYWxzZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JQcm94eS5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclByb3h5LmgK aW5kZXggZDg0ZjUwYTk3NWQ3Yzg1NDY1NWMyYzY4Yjg2OWI3MTkxMjFmYzZjNi4uMTRkNDc3ZThk NzlhMWMzOTc5YWM1YTg5NzYwYmMzZGYwZjVlOWM4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclByb3h5LmgKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclByb3h5LmgKQEAgLTI5Niw2ICsy OTYsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9lbGVtZW50U2VsZWN0aW9uQWN0aXZlIHsgZmFs c2UgfTsKICAgICBib29sIG1faWdub3JlRWxlbWVudFNlbGVjdGlvbkNoYW5nZSB7IGZhbHNlIH07 CiAgICAgYm9vbCBtX2lzQWN0aXZlRnJvbnRlbmQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9jbG9z aW5nIHsgZmFsc2UgfTsKIAogICAgIEF0dGFjaG1lbnRTaWRlIG1fYXR0YWNobWVudFNpZGUge0F0 dGFjaG1lbnRTaWRlOjpCb3R0b219OwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggODM2ZDE5M2QxMzQ4YTQwZGY2OGRmMzFlMWJiNTVmMTMzYTI0 ZWRlZS4uMTMzZWU4ZjY3ZmFkOGI3Y2Q1ZTI2YzdmYmU4NjNkNDE0YzA3ZGNiOSAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBA CisyMDIwLTEwLTAyICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFtD b2NvYV0gQWRkIFdLVUlEZWxlZ2F0ZSBTUEkgdG8gaW5mb3JtIGNsaWVudHMgd2hlbiBhIF9XS0lu c3BlY3RvciBpcyBhYm91dCB0byBjbG9zZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MjMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIG5ldyB0ZXN0IGNhc2UgZm9yIC1fd2ViVmlldzp3aWxsQ2xv c2VMb2NhbEluc3BlY3RvcjouCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL1dLSW5zcGVjdG9yRGVsZWdhdGUubW06CisgICAgICAgICgtW0luc3BlY3RvckRlbGVn YXRlIGluc3BlY3RvckRpZEVuYWJsZUJyb3dzZXJEb21haW46XSk6CisgICAgICAgICgtW1VJRGVs ZWdhdGUgX3dlYlZpZXc6ZGlkQXR0YWNoTG9jYWxJbnNwZWN0b3I6XSk6CisgICAgICAgICgtW1VJ RGVsZWdhdGUgX3dlYlZpZXc6d2lsbENsb3NlTG9jYWxJbnNwZWN0b3I6XSk6CisgICAgICAgIChU RVNUKToKKyAgICAgICAgQ2xlYW4gdXAgaG93IHRoZSBvdGhlciB0ZXN0IGNhc2Ugd29ya3Mgc28g d2UgZG9uJ3QgY2FsbCBjbG9zZSBmcm9tCisgICAgICAgIGluc2lkZSBhIGRlbGVnYXRlIGNhbGxi YWNrLiBMZXQncyBrZWVwIG91ciB0ZXN0cyBzdHJ1Y3R1cmVkIHRoZSBzYW1lIHdheS4KKwogMjAy MC0wOS0zMCAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3Zl IGNvZGUgYmVoaW5kIEVOQUJMRShNRURJQV9TRVNTSU9OKSwgbm8gcG9ydHMgZW5hYmxlIGl0CmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLSW5zcGVj dG9yRGVsZWdhdGUubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dL SW5zcGVjdG9yRGVsZWdhdGUubW0KaW5kZXggMTBhNGFjYWExNGNlZmFlN2U5ZmY4NWUyZDJmOWEz MWNmOWE0OGM3Ny4uOTUxZjQzYjcxOGUyNThkZDQ5ODA2MWE4YzI5ZDUxYzRhMWZkNTI3MSAxMDA2 NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0luc3BlY3Rv ckRlbGVnYXRlLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tJbnNwZWN0b3JEZWxlZ2F0ZS5tbQpAQCAtNDAsNiArNDAsNyBAQAogQGNsYXNzIEluc3BlY3Rv ckRlbGVnYXRlOwogCiBzdGF0aWMgYm9vbCBkaWRBdHRhY2hMb2NhbEluc3BlY3RvckNhbGxlZCA9 IGZhbHNlOworc3RhdGljIGJvb2wgd2lsbENsb3NlTG9jYWxJbnNwZWN0b3JDYWxsZWQgPSBmYWxz ZTsKIHN0YXRpYyBib29sIGJyb3dzZXJEb21haW5FbmFibGVkRm9ySW5zcGVjdG9yQ2FsbGVkID0g ZmFsc2U7CiBzdGF0aWMgYm9vbCBicm93c2VyRG9tYWluRGlzYWJsZWRGb3JJbnNwZWN0b3JDYWxs ZWQgPSBmYWxzZTsKIHN0YXRpYyBib29sIG9wZW5VUkxFeHRlcm5hbGx5Q2FsbGVkID0gZmFsc2U7 CkBAIC01NCwxMCArNTUsNiBAQCBAaW1wbGVtZW50YXRpb24gSW5zcGVjdG9yRGVsZWdhdGUKIC0g KHZvaWQpaW5zcGVjdG9yRGlkRW5hYmxlQnJvd3NlckRvbWFpbjooX1dLSW5zcGVjdG9yICopaW5z cGVjdG9yCiB7CiAgICAgYnJvd3NlckRvbWFpbkVuYWJsZWRGb3JJbnNwZWN0b3JDYWxsZWQgPSB0 cnVlOwotCi0gICAgLy8gV2FpdCBmb3IgdGhlIEJyb3dzZXIgZG9tYWluIHRvIGJlIGVuYWJsZWQg YmVmb3JlIGNsb3NpbmcgV2ViIEluc3BlY3Rvciwgd2hpY2ggd2lsbAotICAgIC8vIGF1dG9tYXRp Y2FsbHkgZGlzYWJsZSB0aGUgZG9tYWluLgotICAgIFtpbnNwZWN0b3IgY2xvc2VdOwogfQogCiAt ICh2b2lkKWluc3BlY3RvckRpZERpc2FibGVCcm93c2VyRG9tYWluOihfV0tJbnNwZWN0b3IgKilp bnNwZWN0b3IKQEAgLTgxLDYgKzc4LDcgQEAgQGltcGxlbWVudGF0aW9uIFVJRGVsZWdhdGUKIC0g KHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkQXR0YWNoTG9jYWxJbnNwZWN0 b3I6KF9XS0luc3BlY3RvciAqKWluc3BlY3RvcgogewogICAgIGRpZEF0dGFjaExvY2FsSW5zcGVj dG9yQ2FsbGVkID0gZmFsc2U7CisgICAgd2lsbENsb3NlTG9jYWxJbnNwZWN0b3JDYWxsZWQgPSBm YWxzZTsKICAgICBicm93c2VyRG9tYWluRW5hYmxlZEZvckluc3BlY3RvckNhbGxlZCA9IGZhbHNl OwogICAgIGJyb3dzZXJEb21haW5EaXNhYmxlZEZvckluc3BlY3RvckNhbGxlZCA9IGZhbHNlOwog CkBAIC05Miw5ICs5MCwxNSBAQCAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3 IGRpZEF0dGFjaExvY2FsSW5zcGVjdG9yOihfV0tJbnNwZWN0b3IgKilpbgogICAgIGRpZEF0dGFj aExvY2FsSW5zcGVjdG9yQ2FsbGVkID0gdHJ1ZTsKIH0KIAorLSAodm9pZClfd2ViVmlldzooV0tX ZWJWaWV3ICopd2ViVmlldyB3aWxsQ2xvc2VMb2NhbEluc3BlY3RvcjooX1dLSW5zcGVjdG9yICop aW5zcGVjdG9yCit7CisgICAgRVhQRUNUX0VRKHdlYlZpZXcuX2luc3BlY3RvciwgaW5zcGVjdG9y KTsKKyAgICB3aWxsQ2xvc2VMb2NhbEluc3BlY3RvckNhbGxlZCA9IHRydWU7Cit9CisKIEBlbmQK IAotVEVTVChXS0luc3BlY3RvckRlbGVnYXRlLCBEaWROb3RpZnlGb3JMb2NhbEluc3BlY3RvcikK K1RFU1QoV0tJbnNwZWN0b3JEZWxlZ2F0ZSwgRGlkQXR0YWNoTG9jYWxJbnNwZWN0b3IpCiB7CiAg ICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dLV2ViVmlld0NvbmZpZ3Vy YXRpb24gbmV3XSk7CiAgICAgd2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCkucHJlZmVyZW5jZXMu X2RldmVsb3BlckV4dHJhc0VuYWJsZWQgPSBZRVM7CkBAIC0xMTAsOSArMTE0LDMwIEBAIFRFU1Qo V0tJbnNwZWN0b3JEZWxlZ2F0ZSwgRGlkTm90aWZ5Rm9yTG9jYWxJbnNwZWN0b3IpCiAKICAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRpZEF0dGFjaExvY2FsSW5zcGVjdG9yQ2FsbGVkKTsK ICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmJyb3dzZXJEb21haW5FbmFibGVkRm9ySW5z cGVjdG9yQ2FsbGVkKTsKKworICAgIFtbd2ViVmlldyBfaW5zcGVjdG9yXSBjbG9zZV07CiAgICAg VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZicm93c2VyRG9tYWluRGlzYWJsZWRGb3JJbnNwZWN0 b3JDYWxsZWQpOwogfQogCitURVNUKFdLSW5zcGVjdG9yRGVsZWdhdGUsIFdpbGxDbG9zZUxvY2Fs SW5zcGVjdG9yKQoreworICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtX S1dlYlZpZXdDb25maWd1cmF0aW9uIG5ld10pOworICAgIHdlYlZpZXdDb25maWd1cmF0aW9uLmdl dCgpLnByZWZlcmVuY2VzLl9kZXZlbG9wZXJFeHRyYXNFbmFibGVkID0gWUVTOworICAgIGF1dG8g d2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0 TWFrZSgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5n ZXQoKV0pOworICAgIGF1dG8gdWlEZWxlZ2F0ZSA9IGFkb3B0TlMoW1VJRGVsZWdhdGUgbmV3XSk7 CisKKyAgICBbd2ViVmlldyBzZXRVSURlbGVnYXRlOnVpRGVsZWdhdGUuZ2V0KCldOworICAgIFt3 ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkAiPGhlYWQ+PHRpdGxlPlRlc3QgcGFnZSB0byBiZSBpbnNw ZWN0ZWQ8L3RpdGxlPjwvaGVhZD48Ym9keT48cD5GaWxsZXIgY29udGVudDwvcD48L2JvZHk+IiBi YXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cDovL2V4YW1wbGUuY29tLyJdXTsKKwor ICAgIEVYUEVDVF9GQUxTRSh3ZWJWaWV3LmdldCgpLl9oYXNJbnNwZWN0b3JGcm9udGVuZCk7CisK KyAgICBbW3dlYlZpZXcgX2luc3BlY3Rvcl0gc2hvd107CisgICAgVGVzdFdlYktpdEFQSTo6VXRp bDo6cnVuKCZkaWRBdHRhY2hMb2NhbEluc3BlY3RvckNhbGxlZCk7CisKKyAgICBbW3dlYlZpZXcg X2luc3BlY3Rvcl0gY2xvc2VdOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmd2lsbENs b3NlTG9jYWxJbnNwZWN0b3JDYWxsZWQpOworfQorCiBURVNUKFdLSW5zcGVjdG9yRGVsZWdhdGUs IFNob3dVUkxFeHRlcm5hbGx5KQogewogICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBh ZG9wdE5TKFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIG5ld10pOwo= 410481 2020-10-04 13:06:30 -0700 2020-10-04 14:47:17 -0700 Patch bug-217233-20201004130629.patch text/plain 13236 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAwYzk5NzBlNmJlOWMyMmFi OGIzMGQzNmU1NTVmZGE5YjZkZWJhOGUuLjdkODA5MTQzNDAzYzJkYzIzZTQ0MGVmNTBlODZmOTk1 NjFjY2U5YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjAtMTAtMDIgIEJyaWFuIEJ1 cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBBZGQgV0tVSURlbGVnYXRl IFNQSSB0byBpbmZvcm0gY2xpZW50cyB3aGVuIGEgX1dLSW5zcGVjdG9yIGlzIGFib3V0IHRvIGNs b3NlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTcy MzMKKworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIgYW5kIERldmluIFJvdXNz by4KKworICAgICAgICBUaGlzIGlzIGNvbXBsZW1lbnRhcnkgdG8gX3dlYlZpZXc6ZGlkQXR0YWNo TG9jYWxJbnNwZWN0b3I6IGFuZCB3b3JrcyBzaW1pbGFybHkuCisgICAgICAgIENsaWVudHMgbmVl ZCB0byBiZSBjYXJlZnVsIGluIGRlcGVuZGluZyBvbiB0aGlzIGR1cmluZyB0ZWFyZG93biwgYmVj YXVzZSBpdCB3b24ndAorICAgICAgICBjb21lIGlmIHRoZSBVSURlbGVnYXRlIGhhcyBhbHJlYWR5 IGJlZW4gY2xlYXJlZCBvdXQgd2hpbGUgdGhlIGluc3BlY3RlZCBwYWdlIGlzIGJlaW5nIGNsb3Nl ZC4KKworICAgICAgICBBUEkgdGVzdDogV0tJbnNwZWN0b3JEZWxlZ2F0ZS5XaWxsQ2xvc2VMb2Nh bEluc3BlY3RvcgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElVSUNsaWVudC5oOgorICAg ICAgICAoQVBJOjpVSUNsaWVudDo6d2lsbENsb3NlTG9jYWxJbnNwZWN0b3IpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1VJ RGVsZWdhdGUubW06CisgICAgICAgIChXZWJLaXQ6OlVJRGVsZWdhdGU6OnNldERlbGVnYXRlKToK KyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OndpbGxDbG9zZUxvY2FsSW5z cGVjdG9yKToKKyAgICAgICAgKiBVSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclByb3h5 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0luc3BlY3Rvci9XZWJJbnNwZWN0b3JQcm94eS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclByb3h5OjpjbG9zZUZyb250ZW5kUGFnZUFu ZFdpbmRvdyk6CisgICAgICAgIEFkZCBhIGd1YXJkIGZvciByZWVudHJhbnQgY2FsbHMgdG8gY2xv c2UoKS4KKwogMjAyMC0xMC0wMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgog CiAgICAgICAgIFtKU0NdIEludHJvZHVjZSBKSVRPcGVyYXRpb25MaXN0IHRvIHZhbGlkYXRlIEpJ VC1jYWdlZCBwb2ludGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0FQSVVJQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQu aAppbmRleCBlY2MxNjJkZTQ0NWIyYjBhMGZiN2RmZWUzZDVlMGQ4ZWRmNjljOGFhLi43YjRmOTNh YTQyNjU0MWZkYjMxZWM4ODE3NzBiMmYzMzZhZWU4ZjhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQVBJVUlDbGllbnQuaApAQCAtMTk1LDYgKzE5NSw3IEBAIHB1YmxpYzoKICNlbmRp ZgogCiAgICAgdmlydHVhbCB2b2lkIGRpZEF0dGFjaExvY2FsSW5zcGVjdG9yKFdlYktpdDo6V2Vi UGFnZVByb3h5JiwgV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eSYpIHsgfQorICAgIHZpcnR1YWwg dm9pZCB3aWxsQ2xvc2VMb2NhbEluc3BlY3RvcihXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIFdlYktp dDo6V2ViSW5zcGVjdG9yUHJveHkmKSB7IH0KIH07CiAKIH0gLy8gbmFtZXNwYWNlIEFQSQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVBy aXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQ cml2YXRlLmgKaW5kZXggYjZmNDY5ZmQzYTkzMzkxNzcyYWNlMjI2NzUyMzg5M2UxMGY1NTNmMi4u N2ZjYzRhOTEzNmYxMDcxZDJiZTI1NzI3M2NiYzY5MGFmNjNmZDJiNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZhdGUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5o CkBAIC0yNTMsNiArMjUzLDEyIEBAIHN0cnVjdCBVSUVkZ2VJbnNldHM7CiAgKi8KIC0gKHZvaWQp X3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkQXR0YWNoTG9jYWxJbnNwZWN0b3I6KF9X S0luc3BlY3RvciAqKWluc3BlY3RvciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEp KTsKIAorLyohIEBhYnN0cmFjdCBDYWxsZWQgYmVmb3JlIGNsb3NpbmcgdGhlIFdlYiBJbnNwZWN0 b3IgaW5zdGFuY2UgZm9yIHRoaXMgV0tXZWJWaWV3LiBUaGlzIGlzIG5vdCBjYWxsZWQgaW4gdGhl IGNhc2Ugb2YgcmVtb3RlIGluc3BlY3Rpb24uCisgICAgQHBhcmFtIHdlYlZpZXcgVGhlIFdLV2Vi VmlldyBpbnN0YW5jZSBiZWluZyBpbnNwZWN0ZWQuCisgICAgQHBhcmFtIGluc3BlY3RvciBUaGUg V2ViIEluc3BlY3RvciBpbnN0YW5jZSBiZWluZyBjbG9zZWQuCisgKi8KKy0gKHZvaWQpX3dlYlZp ZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgd2lsbENsb3NlTG9jYWxJbnNwZWN0b3I6KF9XS0luc3Bl Y3RvciAqKWluc3BlY3RvciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpKTsKKwog I2VuZGlmIC8vICFUQVJHRVRfT1NfSVBIT05FCiAKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL1VJRGVsZWdhdGUuaAppbmRleCBkZTI5NDRjODRmYTNkMzc3M2NkNGUwZWM3NDcz NTcwN2FiNWM5NDczLi5hNDllNjUzOTdmNDc1NzIzNzE4MzNjNWY3NTQ4NGNlZTFkM2NiOGQ4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCkBAIC0xMjUsNiAr MTI1LDcgQEAgcHJpdmF0ZToKICAgICAgICAgdm9pZCBkaWRFeGNlZWRCYWNrZ3JvdW5kUmVzb3Vy Y2VMaW1pdFdoaWxlSW5Gb3JlZ3JvdW5kKFdlYlBhZ2VQcm94eSYsIFdLUmVzb3VyY2VMaW1pdCkg ZmluYWw7CiAgICAgICAgIHZvaWQgc2F2ZURhdGFUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihXZWJQ YWdlUHJveHkqLCBjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IFdURjo6U3RyaW5nJiwgY29uc3Qg VVJMJiwgQVBJOjpEYXRhJikgZmluYWw7CiAgICAgICAgIHZvaWQgZGlkQXR0YWNoTG9jYWxJbnNw ZWN0b3IoV2ViUGFnZVByb3h5JiwgV2ViSW5zcGVjdG9yUHJveHkmKSBmaW5hbDsKKyAgICAgICAg dm9pZCB3aWxsQ2xvc2VMb2NhbEluc3BlY3RvcihXZWJQYWdlUHJveHkmLCBXZWJJbnNwZWN0b3JQ cm94eSYpIGZpbmFsOwogI2VuZGlmCiAjaWYgRU5BQkxFKERFVklDRV9PUklFTlRBVElPTikKICAg ICAgICAgdm9pZCBzaG91bGRBbGxvd0RldmljZU9yaWVudGF0aW9uQW5kTW90aW9uQWNjZXNzKFdl YktpdDo6V2ViUGFnZVByb3h5JiwgV2ViRnJhbWVQcm94eSYsIEZyYW1lSW5mb0RhdGEmJiwgQ29t cGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJikgZmluYWw7CkBAIC0yMDEsNiArMjAyLDcgQEAg cHJpdmF0ZToKICAgICAgICAgYm9vbCB3ZWJWaWV3UnVuT3BlblBhbmVsV2l0aFBhcmFtZXRlcnNJ bml0aWF0ZWRCeUZyYW1lQ29tcGxldGlvbkhhbmRsZXIgOiAxOwogICAgICAgICBib29sIHdlYlZp ZXdSZXF1ZXN0Tm90aWZpY2F0aW9uUGVybWlzc2lvbkZvclNlY3VyaXR5T3JpZ2luRGVjaXNpb25I YW5kbGVyIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkQXR0YWNoTG9jYWxJbnNwZWN0b3Ig OiAxOworICAgICAgICBib29sIHdlYlZpZXdXaWxsQ2xvc2VMb2NhbEluc3BlY3RvciA6IDE7CiAj ZW5kaWYKICNpZiBFTkFCTEUoREVWSUNFX09SSUVOVEFUSU9OKQogICAgICAgICBib29sIHdlYlZp ZXdTaG91bGRBbGxvd0RldmljZU9yaWVudGF0aW9uQW5kTW90aW9uQWNjZXNzUmVxdWVzdGVkQnlG cmFtZURlY2lzaW9uSGFuZGxlciA6IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev VUlEZWxlZ2F0ZS5tbQppbmRleCAwZTcyOTQwOGZjMGU4ZjQyMGUyYzFiYTY0NzFhODdlZGNiYmEw OWNiLi43MGZmMGRiYmRmMGU4Zjg4ZmJjZWVjMzBiNzA1NTcxYzk2NDQwOTEwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KQEAgLTEzMiw2ICsxMzIsNyBA QCB2b2lkIFVJRGVsZWdhdGU6OnNldERlbGVnYXRlKGlkIDxXS1VJRGVsZWdhdGU+IGRlbGVnYXRl KQogICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdSdW5PcGVuUGFuZWxXaXRoUGFyYW1ldGVy c0luaXRpYXRlZEJ5RnJhbWVDb21wbGV0aW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6cnVuT3BlblBhbmVsV2l0aFBhcmFtZXRlcnM6aW5p dGlhdGVkQnlGcmFtZTpjb21wbGV0aW9uSGFuZGxlcjopXTsKICAgICBtX2RlbGVnYXRlTWV0aG9k cy53ZWJWaWV3UmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb25Gb3JTZWN1cml0eU9yaWdpbkRl Y2lzaW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93 ZWJWaWV3OnJlcXVlc3ROb3RpZmljYXRpb25QZXJtaXNzaW9uRm9yU2VjdXJpdHlPcmlnaW46ZGVj aXNpb25IYW5kbGVyOildOwogICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRBdHRhY2hM b2NhbEluc3BlY3RvciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93 ZWJWaWV3OmRpZEF0dGFjaExvY2FsSW5zcGVjdG9yOildOworICAgIG1fZGVsZWdhdGVNZXRob2Rz LndlYlZpZXdXaWxsQ2xvc2VMb2NhbEluc3BlY3RvciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OndpbGxDbG9zZUxvY2FsSW5zcGVjdG9yOildOwogI2Vu ZGlmCiAjaWYgRU5BQkxFKERFVklDRV9PUklFTlRBVElPTikKICAgICBtX2RlbGVnYXRlTWV0aG9k cy53ZWJWaWV3U2hvdWxkQWxsb3dEZXZpY2VPcmllbnRhdGlvbkFuZE1vdGlvbkFjY2Vzc1JlcXVl c3RlZEJ5RnJhbWVEZWNpc2lvbkhhbmRsZXIgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3Rvcihfd2ViVmlldzpzaG91bGRBbGxvd0RldmljZU9yaWVudGF0aW9uQW5kTW90aW9u QWNjZXNzUmVxdWVzdGVkQnlGcmFtZTpkZWNpc2lvbkhhbmRsZXI6KV07CkBAIC04MjgsNiArODI5 LDE4IEBAIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OmRpZEF0dGFjaExvY2FsSW5zcGVjdG9y KFdlYlBhZ2VQcm94eSYsIFdlYkluc3BlY3RvclByCiAgICAgWyhpZCA8V0tVSURlbGVnYXRlUHJp dmF0ZT4pZGVsZWdhdGUgX3dlYlZpZXc6bV91aURlbGVnYXRlLm1fd2ViVmlldyBkaWRBdHRhY2hM b2NhbEluc3BlY3Rvcjp3cmFwcGVyKGluc3BlY3RvcildOwogfQogCit2b2lkIFVJRGVsZWdhdGU6 OlVJQ2xpZW50Ojp3aWxsQ2xvc2VMb2NhbEluc3BlY3RvcihXZWJQYWdlUHJveHkmLCBXZWJJbnNw ZWN0b3JQcm94eSYgaW5zcGVjdG9yKQoreworICAgIGlmICghbV91aURlbGVnYXRlLm1fZGVsZWdh dGVNZXRob2RzLndlYlZpZXdXaWxsQ2xvc2VMb2NhbEluc3BlY3RvcikKKyAgICAgICAgcmV0dXJu OworCisgICAgYXV0byBkZWxlZ2F0ZSA9IG1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlLmdldCgpOwor ICAgIGlmICghZGVsZWdhdGUpCisgICAgICAgIHJldHVybjsKKworICAgIFsoaWQgPFdLVUlEZWxl Z2F0ZVByaXZhdGU+KWRlbGVnYXRlIF93ZWJWaWV3Om1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcgd2ls bENsb3NlTG9jYWxJbnNwZWN0b3I6d3JhcHBlcihpbnNwZWN0b3IpXTsKK30KKwogYm9vbCBVSURl bGVnYXRlOjpVSUNsaWVudDo6cnVuT3BlblBhbmVsKFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViRnJh bWVQcm94eSogd2ViRnJhbWVQcm94eSwgRnJhbWVJbmZvRGF0YSYmIGZyYW1lSW5mbywgQVBJOjpP cGVuUGFuZWxQYXJhbWV0ZXJzKiBvcGVuUGFuZWxQYXJhbWV0ZXJzLCBXZWJPcGVuUGFuZWxSZXN1 bHRMaXN0ZW5lclByb3h5KiBsaXN0ZW5lcikKIHsKICAgICBpZiAoIW1fdWlEZWxlZ2F0ZS5tX2Rl bGVnYXRlTWV0aG9kcy53ZWJWaWV3UnVuT3BlblBhbmVsV2l0aFBhcmFtZXRlcnNJbml0aWF0ZWRC eUZyYW1lQ29tcGxldGlvbkhhbmRsZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9JbnNwZWN0b3IvV2ViSW5zcGVjdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclByb3h5LmNwcAppbmRleCA5NTg0ZmVkNDZlNGY4 OTIyMGUwODk4OGNiNWZkY2I1YWJlMDlkMGIxLi5mMGY3YjJkZjVlNDE5MmFjNDU0OGI4ZjdiY2I5 OTdkMWYxMzBkNDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9JbnNwZWN0 b3IvV2ViSW5zcGVjdG9yUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0lu c3BlY3Rvci9XZWJJbnNwZWN0b3JQcm94eS5jcHAKQEAgLTUxOSw2ICs1MTksMTUgQEAgdm9pZCBX ZWJJbnNwZWN0b3JQcm94eTo6Y2xvc2VGcm9udGVuZFBhZ2VBbmRXaW5kb3coKQogICAgIGlmICgh bV9pbnNwZWN0b3JQYWdlKQogICAgICAgICByZXR1cm47CiAKKyAgICAvLyBHdWFyZCBhZ2FpbnN0 IGNhbGxzIHRvIGNsb3NlKCkgbWFkZSBieSB0aGUgY2xpZW50IHdoaWxlIGFscmVhZHkgY2xvc2lu Zy4KKyAgICBpZiAobV9jbG9zaW5nKQorICAgICAgICByZXR1cm47CisgICAgCisgICAgU2V0Rm9y U2NvcGU8Ym9vbD4gcmVlbnRyYW5jeVByb3RlY3RvcihtX2Nsb3NpbmcsIHRydWUpOworICAgIAor ICAgIC8vIE5vdGlmeSBXZWJLaXQgY2xpZW50IHdoZW4gYSBsb2NhbCBpbnNwZWN0b3IgY2xvc2Vz IHNvIGl0IGNhbiBjbGVhciBfV0tJbnNwZWN0b3JEZWxlZ2F0ZSBhbmQgcGVyZm9ybSBvdGhlciBj bGVhbnVwLgorICAgIG1faW5zcGVjdGVkUGFnZS0+dWlDbGllbnQoKS53aWxsQ2xvc2VMb2NhbElu c3BlY3RvcigqbV9pbnNwZWN0ZWRQYWdlLCAqdGhpcyk7CisKICAgICBtX2lzVmlzaWJsZSA9IGZh bHNlOwogICAgIG1faXNQcm9maWxpbmdQYWdlID0gZmFsc2U7CiAgICAgbV9zaG93TWVzc2FnZVNl bnQgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0luc3BlY3Rv ci9XZWJJbnNwZWN0b3JQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9y L1dlYkluc3BlY3RvclByb3h5LmgKaW5kZXggZDg0ZjUwYTk3NWQ3Yzg1NDY1NWMyYzY4Yjg2OWI3 MTkxMjFmYzZjNi4uMTRkNDc3ZThkNzlhMWMzOTc5YWM1YTg5NzYwYmMzZGYwZjVlOWM4NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3RvclBy b3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvSW5zcGVjdG9yL1dlYkluc3BlY3Rv clByb3h5LmgKQEAgLTI5Niw2ICsyOTYsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9lbGVtZW50 U2VsZWN0aW9uQWN0aXZlIHsgZmFsc2UgfTsKICAgICBib29sIG1faWdub3JlRWxlbWVudFNlbGVj dGlvbkNoYW5nZSB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2lzQWN0aXZlRnJvbnRlbmQgeyBmYWxz ZSB9OworICAgIGJvb2wgbV9jbG9zaW5nIHsgZmFsc2UgfTsKIAogICAgIEF0dGFjaG1lbnRTaWRl IG1fYXR0YWNobWVudFNpZGUge0F0dGFjaG1lbnRTaWRlOjpCb3R0b219OwogCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGQyZWFhMGM2MjMxZmZl MjZkNDI2NjYxOTI0MDdmM2M0MGEzNjJkZS4uMDBhNjhjOGY5NjY5MDg1Y2RlMzgxNzgwODIwYTA3 OTIyYjJlMTUwYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTAyICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBw bGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gQWRkIFdLVUlEZWxlZ2F0ZSBTUEkgdG8gaW5mb3Jt IGNsaWVudHMgd2hlbiBhIF9XS0luc3BlY3RvciBpcyBhYm91dCB0byBjbG9zZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MjMzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyIGFuZCBEZXZpbiBSb3Vzc28uCisKKyAgICAgICAg QWRkIG5ldyB0ZXN0IGNhc2UgZm9yIC1fd2ViVmlldzp3aWxsQ2xvc2VMb2NhbEluc3BlY3Rvcjou CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLSW5zcGVjdG9y RGVsZWdhdGUubW06CisgICAgICAgICgtW0luc3BlY3RvckRlbGVnYXRlIGluc3BlY3RvckRpZEVu YWJsZUJyb3dzZXJEb21haW46XSk6CisgICAgICAgICgtW1VJRGVsZWdhdGUgX3dlYlZpZXc6ZGlk QXR0YWNoTG9jYWxJbnNwZWN0b3I6XSk6CisgICAgICAgICgtW1VJRGVsZWdhdGUgX3dlYlZpZXc6 d2lsbENsb3NlTG9jYWxJbnNwZWN0b3I6XSk6CisgICAgICAgIChURVNUKToKKyAgICAgICAgQ2xl YW4gdXAgaG93IHRoZSBvdGhlciB0ZXN0IGNhc2Ugd29ya3Mgc28gd2UgZG9uJ3QgY2FsbCBjbG9z ZSBmcm9tCisgICAgICAgIGluc2lkZSBhIGRlbGVnYXRlIGNhbGxiYWNrLiBMZXQncyBrZWVwIG91 ciB0ZXN0cyBzdHJ1Y3R1cmVkIHRoZSBzYW1lIHdheS4KKwogMjAyMC0xMC0wMyAgQWxleCBDaHJp c3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBleHRyYSBz bGFzaCBhZnRlciBlbXB0eSBob3N0IGNvcGllZCBmcm9tIGJhc2UgVVJMIGlmIHBhdGggaXMgYWxz byBlbXB0eQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XS0luc3BlY3RvckRlbGVnYXRlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9XS0luc3BlY3RvckRlbGVnYXRlLm1tCmluZGV4IDEwYTRhY2FhMTRjZWZhZTdlOWZm ODVlMmQyZjlhMzFjZjlhNDhjNzcuLjU4ZGFjNmFhYWRhYzJmYTZiNTVmOWVkMGUwM2UyZWJjZjll M2FjYTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tJbnNwZWN0b3JEZWxlZ2F0ZS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1dLSW5zcGVjdG9yRGVsZWdhdGUubW0KQEAgLTM0LDE0ICszNCwxNyBAQAogI2lt cG9ydCA8V2ViS2l0L19XS0luc3BlY3RvckRlbGVnYXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvX1dL SW5zcGVjdG9yUHJpdmF0ZUZvclRlc3RpbmcuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4K KyNpbXBvcnQgPHd0Zi9TZXRGb3JTY29wZS5oPgogCiAjaWYgUExBVEZPUk0oTUFDKQogCiBAY2xh c3MgSW5zcGVjdG9yRGVsZWdhdGU7CiAKIHN0YXRpYyBib29sIGRpZEF0dGFjaExvY2FsSW5zcGVj dG9yQ2FsbGVkID0gZmFsc2U7CitzdGF0aWMgYm9vbCB3aWxsQ2xvc2VMb2NhbEluc3BlY3RvckNh bGxlZCA9IGZhbHNlOwogc3RhdGljIGJvb2wgYnJvd3NlckRvbWFpbkVuYWJsZWRGb3JJbnNwZWN0 b3JDYWxsZWQgPSBmYWxzZTsKIHN0YXRpYyBib29sIGJyb3dzZXJEb21haW5EaXNhYmxlZEZvcklu c3BlY3RvckNhbGxlZCA9IGZhbHNlOworc3RhdGljIGJvb2wgc2hvdWxkQ2FsbEluc3BlY3RvckNs b3NlUmVlbnRyYW50bHkgPSBmYWxzZTsKIHN0YXRpYyBib29sIG9wZW5VUkxFeHRlcm5hbGx5Q2Fs bGVkID0gZmFsc2U7CiBzdGF0aWMgUmV0YWluUHRyPGlkIDxfV0tJbnNwZWN0b3JEZWxlZ2F0ZT4+ IHNoYXJlZEluc3BlY3RvckRlbGVnYXRlOwogc3RhdGljIFJldGFpblB0cjxOU1VSTD4gdXJsVG9P cGVuOwpAQCAtNTQsMTAgKzU3LDYgQEAgQGltcGxlbWVudGF0aW9uIEluc3BlY3RvckRlbGVnYXRl CiAtICh2b2lkKWluc3BlY3RvckRpZEVuYWJsZUJyb3dzZXJEb21haW46KF9XS0luc3BlY3RvciAq KWluc3BlY3RvcgogewogICAgIGJyb3dzZXJEb21haW5FbmFibGVkRm9ySW5zcGVjdG9yQ2FsbGVk ID0gdHJ1ZTsKLQotICAgIC8vIFdhaXQgZm9yIHRoZSBCcm93c2VyIGRvbWFpbiB0byBiZSBlbmFi bGVkIGJlZm9yZSBjbG9zaW5nIFdlYiBJbnNwZWN0b3IsIHdoaWNoIHdpbGwKLSAgICAvLyBhdXRv bWF0aWNhbGx5IGRpc2FibGUgdGhlIGRvbWFpbi4KLSAgICBbaW5zcGVjdG9yIGNsb3NlXTsKIH0K IAogLSAodm9pZClpbnNwZWN0b3JEaWREaXNhYmxlQnJvd3NlckRvbWFpbjooX1dLSW5zcGVjdG9y ICopaW5zcGVjdG9yCkBAIC04MSw2ICs4MCw3IEBAIEBpbXBsZW1lbnRhdGlvbiBVSURlbGVnYXRl CiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZEF0dGFjaExvY2FsSW5z cGVjdG9yOihfV0tJbnNwZWN0b3IgKilpbnNwZWN0b3IKIHsKICAgICBkaWRBdHRhY2hMb2NhbElu c3BlY3RvckNhbGxlZCA9IGZhbHNlOworICAgIHdpbGxDbG9zZUxvY2FsSW5zcGVjdG9yQ2FsbGVk ID0gZmFsc2U7CiAgICAgYnJvd3NlckRvbWFpbkVuYWJsZWRGb3JJbnNwZWN0b3JDYWxsZWQgPSBm YWxzZTsKICAgICBicm93c2VyRG9tYWluRGlzYWJsZWRGb3JJbnNwZWN0b3JDYWxsZWQgPSBmYWxz ZTsKIApAQCAtOTIsOSArOTIsMTggQEAgLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBkaWRBdHRhY2hMb2NhbEluc3BlY3RvcjooX1dLSW5zcGVjdG9yICopaW4KICAgICBkaWRB dHRhY2hMb2NhbEluc3BlY3RvckNhbGxlZCA9IHRydWU7CiB9CiAKKy0gKHZvaWQpX3dlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgd2lsbENsb3NlTG9jYWxJbnNwZWN0b3I6KF9XS0luc3BlY3Rv ciAqKWluc3BlY3RvcgoreworICAgIEVYUEVDVF9FUSh3ZWJWaWV3Ll9pbnNwZWN0b3IsIGluc3Bl Y3Rvcik7CisgICAgd2lsbENsb3NlTG9jYWxJbnNwZWN0b3JDYWxsZWQgPSB0cnVlOworCisgICAg aWYgKHNob3VsZENhbGxJbnNwZWN0b3JDbG9zZVJlZW50cmFudGx5KQorICAgICAgICBbaW5zcGVj dG9yIGNsb3NlXTsKK30KKwogQGVuZAogCi1URVNUKFdLSW5zcGVjdG9yRGVsZWdhdGUsIERpZE5v dGlmeUZvckxvY2FsSW5zcGVjdG9yKQorVEVTVChXS0luc3BlY3RvckRlbGVnYXRlLCBJbnNwZWN0 b3JMaWZlY3ljbGVDYWxsYmFja3MpCiB7CiAgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9 IGFkb3B0TlMoW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gbmV3XSk7CiAgICAgd2ViVmlld0NvbmZp Z3VyYXRpb24uZ2V0KCkucHJlZmVyZW5jZXMuX2RldmVsb3BlckV4dHJhc0VuYWJsZWQgPSBZRVM7 CkBAIC0xMTAsNyArMTE5LDMyIEBAIFRFU1QoV0tJbnNwZWN0b3JEZWxlZ2F0ZSwgRGlkTm90aWZ5 Rm9yTG9jYWxJbnNwZWN0b3IpCiAKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRpZEF0 dGFjaExvY2FsSW5zcGVjdG9yQ2FsbGVkKTsKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JmJyb3dzZXJEb21haW5FbmFibGVkRm9ySW5zcGVjdG9yQ2FsbGVkKTsKKworICAgIFtbd2ViVmll dyBfaW5zcGVjdG9yXSBjbG9zZV07CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZicm93 c2VyRG9tYWluRGlzYWJsZWRGb3JJbnNwZWN0b3JDYWxsZWQpOworICAgIFRlc3RXZWJLaXRBUEk6 OlV0aWw6OnJ1bigmd2lsbENsb3NlTG9jYWxJbnNwZWN0b3JDYWxsZWQpOworfQorCitURVNUKFdL SW5zcGVjdG9yRGVsZWdhdGUsIEluc3BlY3RvckNsb3NlQ2FsbGVkUmVlbnRyYW50bHkpCit7Cisg ICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dLV2ViVmlld0NvbmZpZ3Vy YXRpb24gbmV3XSk7CisgICAgd2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCkucHJlZmVyZW5jZXMu X2RldmVsb3BlckV4dHJhc0VuYWJsZWQgPSBZRVM7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHRO UyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDgwMCwg NjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0 byB1aURlbGVnYXRlID0gYWRvcHROUyhbVUlEZWxlZ2F0ZSBuZXddKTsKKworICAgIFt3ZWJWaWV3 IHNldFVJRGVsZWdhdGU6dWlEZWxlZ2F0ZS5nZXQoKV07CisgICAgW3dlYlZpZXcgbG9hZEhUTUxT dHJpbmc6QCI8aGVhZD48dGl0bGU+VGVzdCBwYWdlIHRvIGJlIGluc3BlY3RlZDwvdGl0bGU+PC9o ZWFkPjxib2R5PjxwPkZpbGxlciBjb250ZW50PC9wPjwvYm9keT4iIGJhc2VVUkw6W05TVVJMIFVS TFdpdGhTdHJpbmc6QCJodHRwOi8vZXhhbXBsZS5jb20vIl1dOworCisgICAgRVhQRUNUX0ZBTFNF KHdlYlZpZXcuZ2V0KCkuX2hhc0luc3BlY3RvckZyb250ZW5kKTsKKworICAgIFtbd2ViVmlldyBf aW5zcGVjdG9yXSBzaG93XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRpZEF0dGFj aExvY2FsSW5zcGVjdG9yQ2FsbGVkKTsKKworICAgIHsKKyAgICAgICAgU2V0Rm9yU2NvcGU8Ym9v bD4gY2xvc2VSZWVudHJhbnRseUZyb21EZWxlZ2F0ZShzaG91bGRDYWxsSW5zcGVjdG9yQ2xvc2VS ZWVudHJhbnRseSwgdHJ1ZSk7CisgICAgICAgIFtbd2ViVmlldyBfaW5zcGVjdG9yXSBjbG9zZV07 CisgICAgICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmd2lsbENsb3NlTG9jYWxJbnNwZWN0 b3JDYWxsZWQpOworICAgIH0KIH0KIAogVEVTVChXS0luc3BlY3RvckRlbGVnYXRlLCBTaG93VVJM RXh0ZXJuYWxseSkK