230555 2021-09-21 08:27:11 -0700 Launch the new process a bit earlier when doing a COOP process-swap 2021-09-21 17:33:17 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson ggaren kkinnunen webkit-bug-importer oldest_to_newest 1795563 0 cdumez 2021-09-21 08:27:11 -0700 Launch the new process a bit earlier when doing a COOP process-swap for better performance. Also use the leverage the prewarmed WebProcess when available. 1795571 1 438825 cdumez 2021-09-21 08:36:51 -0700 Created attachment 438825 Patch 1795739 2 438853 cdumez 2021-09-21 13:50:46 -0700 Created attachment 438853 Patch 1795881 3 ews-feeder 2021-09-21 17:32:15 -0700 Committed r282854 (241985@main): <https://commits.webkit.org/241985@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438853. 1795883 4 webkit-bug-importer 2021-09-21 17:33:17 -0700 <rdar://problem/83377174> 438825 2021-09-21 08:36:51 -0700 2021-09-21 13:50:44 -0700 Patch bug-230555-20210921083650.patch text/plain 10053 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFiODk4ZmQ3NDFmYWQwZmQ4 NzIxMGQxNGQ2MzdmZWE0NzJmOTBlMDAuLjVhNTc1NjA4NjdlZjE5NjY4NWMzNjdjYWZjNTk2ZGM0 MmMxNDEwYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjEtMDktMjEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBMYXVuY2ggdGhlIG5ldyBwcm9jZXNz IGEgYml0IGVhcmxpZXIgd2hlbiBkb2luZyBhIENPT1AgcHJvY2Vzcy1zd2FwCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA1NTUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYXVuY2ggdGhlIG5ldyBwcm9j ZXNzIGEgYml0IGVhcmxpZXIgd2hlbiBkb2luZyBhIENPT1AgcHJvY2Vzcy1zd2FwIGZvciBiZXR0 ZXIgcGVyZm9ybWFuY2UuIEFsc28gdXNlCisgICAgICAgIHRoZSBsZXZlcmFnZSB0aGUgcHJld2Fy bWVkIFdlYlByb2Nlc3Mgd2hlbiBhdmFpbGFibGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpsYXVuY2hQcm9j ZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JSZXNw b25zZVNoYXJlZCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JSZWdpc3RyYWJsZURvbWFp bik6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpjcmVhdGVXZWJQYWdlKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JOYXZpZ2F0aW9uSW50ZXJu YWwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1By b3h5OjpzZXRDcm9zc09yaWdpbk1vZGUpOgorCiAyMDIxLTA5LTIxICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBFbnN1cmUgdGhhdCBjYXB0dXJlIGF0dHJpYnV0 aW9uIHdvcmtzIGV2ZW4gZm9yIFVSTFMgd2l0aG91dCBob3N0bmFtZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGI3N2JjYjJmYzUwN2ZhMjcwYWRlZjY2NWUy ZWY1NTE0OGZmYWU2N2QuLmM3MDViOTE1YWE3NDIwMGM5ZjdiZjFmMmRkYjRiZmUzYzgzNzdlNjAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtODQ5LDcgKzg0 OSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpsYXVuY2hQcm9jZXNzKGNvbnN0IFJlZ2lzdHJhYmxl RG9tYWluJiByZWdpc3RyYWJsZURvbWFpbiwgUHJvCiAgICAgaWYgKHJlbGF0ZWRQYWdlICYmICFy ZWxhdGVkUGFnZS0+aXNDbG9zZWQoKSkKICAgICAgICAgbV9wcm9jZXNzID0gcmVsYXRlZFBhZ2Ut PmVuc3VyZVJ1bm5pbmdQcm9jZXNzKCk7CiAgICAgZWxzZQotICAgICAgICBtX3Byb2Nlc3MgPSBw cm9jZXNzUG9vbC5wcm9jZXNzRm9yUmVnaXN0cmFibGVEb21haW4obV93ZWJzaXRlRGF0YVN0b3Jl LmdldCgpLCB0aGlzLCByZWdpc3RyYWJsZURvbWFpbik7CisgICAgICAgIG1fcHJvY2VzcyA9IHBy b2Nlc3NQb29sLnByb2Nlc3NGb3JSZWdpc3RyYWJsZURvbWFpbihtX3dlYnNpdGVEYXRhU3RvcmUu Z2V0KCksIHJlZ2lzdHJhYmxlRG9tYWluKTsKICAgICBtX2hhc1J1bm5pbmdQcm9jZXNzID0gdHJ1 ZTsKIAogICAgIG1fcHJvY2Vzcy0+YWRkRXhpc3RpbmdXZWJQYWdlKCp0aGlzLCBXZWJQcm9jZXNz UHJveHk6OkJlZ2luc1VzaW5nRGF0YVN0b3JlOjpZZXMpOwpAQCAtNTY2MiwxNiArNTY2MiwxMSBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VTaGFyZWQoUmVmPFdl YlByb2Nlc3NQcm94eT4mJiBwcm9jZXNzLAogICAgICAgICBhdXRvIHdpbGxDb250aW51ZUxvYWRJ bk5ld1Byb2Nlc3MgPSBXaWxsQ29udGludWVMb2FkSW5OZXdQcm9jZXNzOjpObzsKICAgICAgICAg aWYgKHBvbGljeUFjdGlvbiA9PSBQb2xpY3lBY3Rpb246OlVzZSAmJiBicm93c2luZ0NvbnRleHRH cm91cFN3aXRjaERlY2lzaW9uICE9IEJyb3dzaW5nQ29udGV4dEdyb3VwU3dpdGNoRGVjaXNpb246 OlN0YXlJbkdyb3VwICYmIG5hdmlnYXRpb24pIHsKICAgICAgICAgICAgIFdFQlBBR0VQUk9YWV9S RUxFQVNFX0xPRyhQcm9jZXNzU3dhcHBpbmcsICJkZWNpZGVQb2xpY3lGb3JSZXNwb25zZVNoYXJl ZDogUHJvY2Vzcy1zd2FwcGluZyBkdWUgdG8gQ3Jvc3MtT3JpZ2luLU9wZW5lci1Qb2xpY3ksIG5l d1Byb2Nlc3NJc0Nyb3NzT3JpZ2luSXNvbGF0ZWQ9JWQiLCBicm93c2luZ0NvbnRleHRHcm91cFN3 aXRjaERlY2lzaW9uID09IEJyb3dzaW5nQ29udGV4dEdyb3VwU3dpdGNoRGVjaXNpb246Ok5ld0lz b2xhdGVkR3JvdXApOwotICAgICAgICAgICAgd2Vic2l0ZURhdGFTdG9yZSgpLm5ldHdvcmtQcm9j ZXNzKCkucHJlcGFyZUxvYWRGb3JXZWJQcm9jZXNzVHJhbnNmZXIocHJvY2Vzcy0+Y29yZVByb2Nl c3NJZGVudGlmaWVyKCksIG1haW5SZXNvdXJjZUxvYWRJZGVudGlmaWVyLCBbdGhpcywgcHJvdGVj dGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyksIG5hdmlnYXRpb24sIG5hdmlnYXRpb25S ZXNwb25zZSA9IFdURk1vdmUobmF2aWdhdGlvblJlc3BvbnNlKSwgc2VuZGVyID0gV1RGTW92ZShz ZW5kZXIpLCBicm93c2luZ0NvbnRleHRHcm91cFN3aXRjaERlY2lzaW9uXShhdXRvIGV4aXN0aW5n TmV0d29ya1Jlc291cmNlTG9hZElkZW50aWZpZXJUb1Jlc3VtZSkgbXV0YWJsZSB7Ci0gICAgICAg ICAgICAgICAgUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0Zvck5hdmlnYXRpb247Ci0g ICAgICAgICAgICAgICAgaWYgKGJyb3dzaW5nQ29udGV4dEdyb3VwU3dpdGNoRGVjaXNpb24gPT0g QnJvd3NpbmdDb250ZXh0R3JvdXBTd2l0Y2hEZWNpc2lvbjo6TmV3SXNvbGF0ZWRHcm91cCkKLSAg ICAgICAgICAgICAgICAgICAgcHJvY2Vzc0Zvck5hdmlnYXRpb24gPSBtX3Byb2Nlc3MtPnByb2Nl c3NQb29sKCkuY3JlYXRlTmV3V2ViUHJvY2Vzcygmd2Vic2l0ZURhdGFTdG9yZSgpLCBXZWJQcm9j ZXNzUHJveHk6OklzUHJld2FybWVkOjpObywgQ3Jvc3NPcmlnaW5Nb2RlOjpJc29sYXRlZCk7Ci0g ICAgICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIEFTU0VSVChicm93c2lu Z0NvbnRleHRHcm91cFN3aXRjaERlY2lzaW9uID09IEJyb3dzaW5nQ29udGV4dEdyb3VwU3dpdGNo RGVjaXNpb246Ok5ld1NoYXJlZEdyb3VwKTsKLSAgICAgICAgICAgICAgICAgICAgUmVnaXN0cmFi bGVEb21haW4gcmVzcG9uc2VEb21haW4geyBuYXZpZ2F0aW9uUmVzcG9uc2UtPnJlc3BvbnNlKCku dXJsKCkgfTsKLSAgICAgICAgICAgICAgICAgICAgcHJvY2Vzc0Zvck5hdmlnYXRpb24gPSBtX3By b2Nlc3MtPnByb2Nlc3NQb29sKCkucHJvY2Vzc0ZvclJlZ2lzdHJhYmxlRG9tYWluKHdlYnNpdGVE YXRhU3RvcmUoKSwgdGhpcywgcmVzcG9uc2VEb21haW4pOwotICAgICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgICAgICBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoKm5hdmlnYXRpb24s IG51bGxwdHIsIHByb2Nlc3NGb3JOYXZpZ2F0aW9uLnJlbGVhc2VOb25OdWxsKCksIFByb2Nlc3NT d2FwUmVxdWVzdGVkQnlDbGllbnQ6Ok5vLCBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQ6Olll c0FmdGVyUmVzcG9uc2VQb2xpY3lEZWNpc2lvbiwgbnVsbHB0ciwgZXhpc3RpbmdOZXR3b3JrUmVz b3VyY2VMb2FkSWRlbnRpZmllclRvUmVzdW1lKTsKKworICAgICAgICAgICAgUmVnaXN0cmFibGVE b21haW4gcmVzcG9uc2VEb21haW4geyBuYXZpZ2F0aW9uUmVzcG9uc2UtPnJlc3BvbnNlKCkudXJs KCkgfTsKKyAgICAgICAgICAgIGF1dG8gcHJvY2Vzc0Zvck5hdmlnYXRpb24gPSBtX3Byb2Nlc3Mt PnByb2Nlc3NQb29sKCkucHJvY2Vzc0ZvclJlZ2lzdHJhYmxlRG9tYWluKHdlYnNpdGVEYXRhU3Rv cmUoKSwgcmVzcG9uc2VEb21haW4sIGJyb3dzaW5nQ29udGV4dEdyb3VwU3dpdGNoRGVjaXNpb24g PT0gQnJvd3NpbmdDb250ZXh0R3JvdXBTd2l0Y2hEZWNpc2lvbjo6TmV3SXNvbGF0ZWRHcm91cCA/ IENyb3NzT3JpZ2luTW9kZTo6SXNvbGF0ZWQgOiBDcm9zc09yaWdpbk1vZGU6OlNoYXJlZCk7Cisg ICAgICAgICAgICB3ZWJzaXRlRGF0YVN0b3JlKCkubmV0d29ya1Byb2Nlc3MoKS5wcmVwYXJlTG9h ZEZvcldlYlByb2Nlc3NUcmFuc2Zlcihwcm9jZXNzLT5jb3JlUHJvY2Vzc0lkZW50aWZpZXIoKSwg bWFpblJlc291cmNlTG9hZElkZW50aWZpZXIsIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gV1RGTW92 ZShwcm90ZWN0ZWRUaGlzKSwgbmF2aWdhdGlvbiwgbmF2aWdhdGlvblJlc3BvbnNlID0gV1RGTW92 ZShuYXZpZ2F0aW9uUmVzcG9uc2UpLCBzZW5kZXIgPSBXVEZNb3ZlKHNlbmRlciksIHByb2Nlc3NG b3JOYXZpZ2F0aW9uID0gV1RGTW92ZShwcm9jZXNzRm9yTmF2aWdhdGlvbildKGF1dG8gZXhpc3Rp bmdOZXR3b3JrUmVzb3VyY2VMb2FkSWRlbnRpZmllclRvUmVzdW1lKSBtdXRhYmxlIHsKKyAgICAg ICAgICAgICAgICBjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoKm5hdmlnYXRpb24sIG51 bGxwdHIsIFdURk1vdmUocHJvY2Vzc0Zvck5hdmlnYXRpb24pLCBQcm9jZXNzU3dhcFJlcXVlc3Rl ZEJ5Q2xpZW50OjpObywgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXNBZnRlclJlc3Bv bnNlUG9saWN5RGVjaXNpb24sIG51bGxwdHIsIGV4aXN0aW5nTmV0d29ya1Jlc291cmNlTG9hZElk ZW50aWZpZXJUb1Jlc3VtZSk7CiAKICAgICAgICAgICAgICAgICByZWNlaXZlZFBvbGljeURlY2lz aW9uKFBvbGljeUFjdGlvbjo6SWdub3JlLCBuYXZpZ2F0aW9uLmdldCgpLCBudWxscHRyLCBXVEZN b3ZlKG5hdmlnYXRpb25SZXNwb25zZSksIFdURk1vdmUoc2VuZGVyKSwgeyB9LCBXaWxsQ29udGlu dWVMb2FkSW5OZXdQcm9jZXNzOjpZZXMpOwogICAgICAgICAgICAgfSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKaW5kZXggYmUyMTJmNGZhYTc3NzEzZjFmMzVl Y2QwMDFlZGI3Yjc2ZjcwOWFlMi4uMTFkZTM1OWRlZTQzYzlkYTIzZjU2MzQyZGM0YjEzZmYxYmY4 OGE5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAt OTcwLDkgKzk3MCw5IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmRpc2Nvbm5lY3RQcm9jZXNzKFdl YlByb2Nlc3NQcm94eSYgcHJvY2VzcykKICAgICByZW1vdmVQcm9jZXNzRnJvbU9yaWdpbkNhY2hl U2V0KHByb2Nlc3MpOwogfQogCi1SZWY8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzUG9vbDo6 cHJvY2Vzc0ZvclJlZ2lzdHJhYmxlRG9tYWluKFdlYnNpdGVEYXRhU3RvcmUmIHdlYnNpdGVEYXRh U3RvcmUsIFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgUmVnaXN0cmFibGVEb21haW4mIHJlZ2lz dHJhYmxlRG9tYWluKQorUmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OnByb2Nl c3NGb3JSZWdpc3RyYWJsZURvbWFpbihXZWJzaXRlRGF0YVN0b3JlJiB3ZWJzaXRlRGF0YVN0b3Jl LCBjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgcmVnaXN0cmFibGVEb21haW4sIENyb3NzT3JpZ2lu TW9kZSBjcm9zc09yaWdpbk1vZGUpCiB7Ci0gICAgaWYgKCFyZWdpc3RyYWJsZURvbWFpbi5pc0Vt cHR5KCkpIHsKKyAgICBpZiAoIXJlZ2lzdHJhYmxlRG9tYWluLmlzRW1wdHkoKSAmJiBjcm9zc09y aWdpbk1vZGUgIT0gQ3Jvc3NPcmlnaW5Nb2RlOjpJc29sYXRlZCkgewogICAgICAgICBpZiAoYXV0 byBwcm9jZXNzID0gd2ViUHJvY2Vzc0NhY2hlKCkudGFrZVByb2Nlc3MocmVnaXN0cmFibGVEb21h aW4sIHdlYnNpdGVEYXRhU3RvcmUpKSB7CiAgICAgICAgICAgICBBU1NFUlQobV9wcm9jZXNzZXMu Y29udGFpbnMoKnByb2Nlc3MpKTsKICAgICAgICAgICAgIHJldHVybiBwcm9jZXNzLnJlbGVhc2VO b25OdWxsKCk7CkBAIC05OTAsNiArOTkwLDcgQEAgUmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJv Y2Vzc1Bvb2w6OnByb2Nlc3NGb3JSZWdpc3RyYWJsZURvbWFpbihXZWJzaXRlRGF0YVN0b3IKICAg ICAgICAgV0VCUFJPQ0VTU1BPT0xfUkVMRUFTRV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAicHJvY2Vz c0ZvclJlZ2lzdHJhYmxlRG9tYWluOiBVc2luZyBwcmV3YXJtZWQgcHJvY2VzcyAocHJvY2Vzcz0l cCwgUElEPSVpKSIsIHByb2Nlc3MuZ2V0KCksIHByb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkp OwogICAgICAgICBpZiAoIXJlZ2lzdHJhYmxlRG9tYWluLmlzRW1wdHkoKSkKICAgICAgICAgICAg IHRyeVByZXdhcm1XaXRoRG9tYWluSW5mb3JtYXRpb24oKnByb2Nlc3MsIHJlZ2lzdHJhYmxlRG9t YWluKTsKKyAgICAgICAgcHJvY2Vzcy0+c2V0Q3Jvc3NPcmlnaW5Nb2RlKGNyb3NzT3JpZ2luTW9k ZSk7CiAgICAgICAgIEFTU0VSVChtX3Byb2Nlc3Nlcy5jb250YWlucygqcHJvY2VzcykpOwogICAg ICAgICByZXR1cm4gcHJvY2Vzcy5yZWxlYXNlTm9uTnVsbCgpOwogICAgIH0KQEAgLTEwMTMsNyAr MTAxNCw3IEBAIFJlZjxXZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9y UmVnaXN0cmFibGVEb21haW4oV2Vic2l0ZURhdGFTdG9yCiAgICAgICAgICAgICByZXR1cm4gcHJv Y2VzczsKICAgICAgICAgfQogICAgIH0KLSAgICByZXR1cm4gY3JlYXRlTmV3V2ViUHJvY2Vzcygm d2Vic2l0ZURhdGFTdG9yZSk7CisgICAgcmV0dXJuIGNyZWF0ZU5ld1dlYlByb2Nlc3MoJndlYnNp dGVEYXRhU3RvcmUsIFdlYlByb2Nlc3NQcm94eTo6SXNQcmV3YXJtZWQ6Ok5vLCBjcm9zc09yaWdp bk1vZGUpOwogfQogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQpAQCAtMTA2MCw3ICsxMDYx LDcgQEAgUmVmPFdlYlBhZ2VQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZVdlYlBhZ2UoUGFn ZUNsaWVudCYgcGFnZUNsaWVudCwgUmVmPEFQSToKICAgICAgICAgICAgIG1fcHJvY2Vzc2VzLmFw cGVuZCgqcHJvY2Vzcyk7CiAgICAgICAgIH0KICAgICB9IGVsc2UKLSAgICAgICAgcHJvY2VzcyA9 IHByb2Nlc3NGb3JSZWdpc3RyYWJsZURvbWFpbigqcGFnZUNvbmZpZ3VyYXRpb24tPndlYnNpdGVE YXRhU3RvcmUoKSwgbnVsbHB0ciwgeyB9KTsKKyAgICAgICAgcHJvY2VzcyA9IHByb2Nlc3NGb3JS ZWdpc3RyYWJsZURvbWFpbigqcGFnZUNvbmZpZ3VyYXRpb24tPndlYnNpdGVEYXRhU3RvcmUoKSwg eyB9KTsKIAogICAgIFJlZlB0cjxXZWJVc2VyQ29udGVudENvbnRyb2xsZXJQcm94eT4gdXNlckNv bnRlbnRDb250cm9sbGVyID0gcGFnZUNvbmZpZ3VyYXRpb24tPnVzZXJDb250ZW50Q29udHJvbGxl cigpOwogICAgIApAQCAtMTgzMyw4ICsxODM0LDggQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cHJv Y2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbChXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IEFQSToK ICAgICBhdXRvJiB0YXJnZXRVUkwgPSBuYXZpZ2F0aW9uLmN1cnJlbnRSZXF1ZXN0KCkudXJsKCk7 CiAgICAgYXV0byB0YXJnZXRSZWdpc3RyYWJsZURvbWFpbiA9IFdlYkNvcmU6OlJlZ2lzdHJhYmxl RG9tYWluIHsgdGFyZ2V0VVJMIH07CiAKLSAgICBhdXRvIGNyZWF0ZU5ld1Byb2Nlc3MgPSBbdGhp cywgcHJvdGVjdGVkVGhpcyA9IFJlZiB7ICp0aGlzIH0sIHBhZ2UgPSBtYWtlUmVmKHBhZ2UpLCB0 YXJnZXRSZWdpc3RyYWJsZURvbWFpbiwgZGF0YVN0b3JlXSAoKSAtPiBSZWY8V2ViUHJvY2Vzc1By b3h5PiB7Ci0gICAgICAgIHJldHVybiBwcm9jZXNzRm9yUmVnaXN0cmFibGVEb21haW4oZGF0YVN0 b3JlLCBwYWdlLnB0cigpLCB0YXJnZXRSZWdpc3RyYWJsZURvbWFpbik7CisgICAgYXV0byBjcmVh dGVOZXdQcm9jZXNzID0gW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBSZWYgeyAqdGhpcyB9LCB0YXJn ZXRSZWdpc3RyYWJsZURvbWFpbiwgZGF0YVN0b3JlXSAoKSAtPiBSZWY8V2ViUHJvY2Vzc1Byb3h5 PiB7CisgICAgICAgIHJldHVybiBwcm9jZXNzRm9yUmVnaXN0cmFibGVEb21haW4oZGF0YVN0b3Jl LCB0YXJnZXRSZWdpc3RyYWJsZURvbWFpbik7CiAgICAgfTsKIAogICAgIGlmICh1c2VzU2luZ2xl V2ViUHJvY2VzcygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKaW5k ZXggMTY3MDc2YTQyNjM3ZDM1YWUxN2YzOTc2NTliODAzOGQyMWU4YTgxNy4uMTUxYjgxNDMyYTE2 MjEwNDgyMzYyYmU5YmYxODQzNTk2NTlkMzA4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUG9vbC5oCkBAIC0zMTEsNyArMzExLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBy ZXBvcnRXZWJDb250ZW50Q1BVVGltZShTZWNvbmRzIGNwdVRpbWUsIHVpbnQ2NF90IGFjdGl2aXR5 U3RhdGUpOwogCi0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0ZvclJlZ2lzdHJhYmxl RG9tYWluKFdlYnNpdGVEYXRhU3RvcmUmLCBXZWJQYWdlUHJveHkqLCBjb25zdCBXZWJDb3JlOjpS ZWdpc3RyYWJsZURvbWFpbiYpOyAvLyBXaWxsIHJldHVybiBhbiBleGlzdGluZyBvbmUgaWYgbGlt aXQgaXMgbWV0IG9yIGR1ZSB0byBjYWNoaW5nLgorICAgIFJlZjxXZWJQcm9jZXNzUHJveHk+IHBy b2Nlc3NGb3JSZWdpc3RyYWJsZURvbWFpbihXZWJzaXRlRGF0YVN0b3JlJiwgY29uc3QgV2ViQ29y ZTo6UmVnaXN0cmFibGVEb21haW4mLCBXZWJDb3JlOjpDcm9zc09yaWdpbk1vZGUgPSBXZWJDb3Jl OjpDcm9zc09yaWdpbk1vZGU6OlNoYXJlZCk7IC8vIFdpbGwgcmV0dXJuIGFuIGV4aXN0aW5nIG9u ZSBpZiBsaW1pdCBpcyBtZXQgb3IgZHVlIHRvIGNhY2hpbmcuCiAKICAgICB2b2lkIHByZXdhcm1Q cm9jZXNzKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl c3NQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKaW5k ZXggNmRjZTQyZTgyYWQyMzgxMzIwNmRjN2ZlMjUwOTg1YWZlODE4YTQ1NS4uNTU0NjA1NjA1YTYw ZjdhNjVlY2MzNmFiMjliOWE4ZTg5MDAxZjE5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmgKQEAgLTQyNiw2ICs0MjYsNyBAQCBwdWJsaWM6CiAjZW5kaWYKIAog ICAgIFdlYkNvcmU6OkNyb3NzT3JpZ2luTW9kZSBjcm9zc09yaWdpbk1vZGUoKSBjb25zdCB7IHJl dHVybiBtX2Nyb3NzT3JpZ2luTW9kZTsgfQorICAgIHZvaWQgc2V0Q3Jvc3NPcmlnaW5Nb2RlKFdl YkNvcmU6OkNyb3NzT3JpZ2luTW9kZSBjcm9zc09yaWdpbk1vZGUpIHsgbV9jcm9zc09yaWdpbk1v ZGUgPSBjcm9zc09yaWdpbk1vZGU7IH0KIAogcHJvdGVjdGVkOgogICAgIFdlYlByb2Nlc3NQcm94 eShXZWJQcm9jZXNzUG9vbCYsIFdlYnNpdGVEYXRhU3RvcmUqLCBJc1ByZXdhcm1lZCwgV2ViQ29y ZTo6Q3Jvc3NPcmlnaW5Nb2RlKTsK 438853 2021-09-21 13:50:46 -0700 2021-09-21 17:32:16 -0700 Patch bug-230555-20210921135045.patch text/plain 4610 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYwMGVhNmFjOWQ5OWU2NmRl YTVmMTMyZjQ5NzdlOTJhMDZhZTg2YjkuLjg3NDc0YmExNzRmYjk3Yjg0Zjk5YTI2ZTJlODEwM2Q5 ODZkNmIxNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMDktMjEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBMYXVuY2ggdGhlIG5ldyBwcm9jZXNz IGEgYml0IGVhcmxpZXIgd2hlbiBkb2luZyBhIENPT1AgcHJvY2Vzcy1zd2FwCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA1NTUKKworICAgICAgICBS ZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIExhdW5jaCB0aGUgbmV3IHBy b2Nlc3MgYSBiaXQgZWFybGllciB3aGVuIGRvaW5nIGEgQ09PUCBwcm9jZXNzLXN3YXAgZm9yIGJl dHRlciBwZXJmb3JtYW5jZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNl U2hhcmVkKToKKwogMjAyMS0wOS0yMSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dIGpxdWVyeS9vZmZzZXQuaHRtbCBpcyByYW5k b21seSBmYWlsaW5nIGFuIGFzc2VydGlvbiBpbiBEcmF3aW5nQXJlYUNvb3JkaW5hdGVkR3JhcGhp Y3M6OmxheWVySG9zdERpZEZsdXNoTGF5ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcAppbmRleCBiNzdiY2IyZmM1MDdmYTI3MGFkZWY2NjVlMmVmNTUxNDhmZmFlNjdk Li5lMWVjYzJiMjcyMTZhN2ZiMWQ0N2QyNTY5OGM3MGY1YTBkM2I1NDQ0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTU2NjIsMTYgKzU2NjIsMTUgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvclJlc3BvbnNlU2hhcmVkKFJlZjxXZWJQcm9j ZXNzUHJveHk+JiYgcHJvY2VzcywKICAgICAgICAgYXV0byB3aWxsQ29udGludWVMb2FkSW5OZXdQ cm9jZXNzID0gV2lsbENvbnRpbnVlTG9hZEluTmV3UHJvY2Vzczo6Tm87CiAgICAgICAgIGlmIChw b2xpY3lBY3Rpb24gPT0gUG9saWN5QWN0aW9uOjpVc2UgJiYgYnJvd3NpbmdDb250ZXh0R3JvdXBT d2l0Y2hEZWNpc2lvbiAhPSBCcm93c2luZ0NvbnRleHRHcm91cFN3aXRjaERlY2lzaW9uOjpTdGF5 SW5Hcm91cCAmJiBuYXZpZ2F0aW9uKSB7CiAgICAgICAgICAgICBXRUJQQUdFUFJPWFlfUkVMRUFT RV9MT0coUHJvY2Vzc1N3YXBwaW5nLCAiZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2VTaGFyZWQ6IFBy b2Nlc3Mtc3dhcHBpbmcgZHVlIHRvIENyb3NzLU9yaWdpbi1PcGVuZXItUG9saWN5LCBuZXdQcm9j ZXNzSXNDcm9zc09yaWdpbklzb2xhdGVkPSVkIiwgYnJvd3NpbmdDb250ZXh0R3JvdXBTd2l0Y2hE ZWNpc2lvbiA9PSBCcm93c2luZ0NvbnRleHRHcm91cFN3aXRjaERlY2lzaW9uOjpOZXdJc29sYXRl ZEdyb3VwKTsKLSAgICAgICAgICAgIHdlYnNpdGVEYXRhU3RvcmUoKS5uZXR3b3JrUHJvY2Vzcygp LnByZXBhcmVMb2FkRm9yV2ViUHJvY2Vzc1RyYW5zZmVyKHByb2Nlc3MtPmNvcmVQcm9jZXNzSWRl bnRpZmllcigpLCBtYWluUmVzb3VyY2VMb2FkSWRlbnRpZmllciwgW3RoaXMsIHByb3RlY3RlZFRo aXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBuYXZpZ2F0aW9uLCBuYXZpZ2F0aW9uUmVzcG9u c2UgPSBXVEZNb3ZlKG5hdmlnYXRpb25SZXNwb25zZSksIHNlbmRlciA9IFdURk1vdmUoc2VuZGVy KSwgYnJvd3NpbmdDb250ZXh0R3JvdXBTd2l0Y2hEZWNpc2lvbl0oYXV0byBleGlzdGluZ05ldHdv cmtSZXNvdXJjZUxvYWRJZGVudGlmaWVyVG9SZXN1bWUpIG11dGFibGUgewotICAgICAgICAgICAg ICAgIFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+IHByb2Nlc3NGb3JOYXZpZ2F0aW9uOwotICAgICAg ICAgICAgICAgIGlmIChicm93c2luZ0NvbnRleHRHcm91cFN3aXRjaERlY2lzaW9uID09IEJyb3dz aW5nQ29udGV4dEdyb3VwU3dpdGNoRGVjaXNpb246Ok5ld0lzb2xhdGVkR3JvdXApCi0gICAgICAg ICAgICAgICAgICAgIHByb2Nlc3NGb3JOYXZpZ2F0aW9uID0gbV9wcm9jZXNzLT5wcm9jZXNzUG9v bCgpLmNyZWF0ZU5ld1dlYlByb2Nlc3MoJndlYnNpdGVEYXRhU3RvcmUoKSwgV2ViUHJvY2Vzc1By b3h5OjpJc1ByZXdhcm1lZDo6Tm8sIENyb3NzT3JpZ2luTW9kZTo6SXNvbGF0ZWQpOwotICAgICAg ICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgICAgICBBU1NFUlQoYnJvd3NpbmdDb250 ZXh0R3JvdXBTd2l0Y2hEZWNpc2lvbiA9PSBCcm93c2luZ0NvbnRleHRHcm91cFN3aXRjaERlY2lz aW9uOjpOZXdTaGFyZWRHcm91cCk7Ci0gICAgICAgICAgICAgICAgICAgIFJlZ2lzdHJhYmxlRG9t YWluIHJlc3BvbnNlRG9tYWluIHsgbmF2aWdhdGlvblJlc3BvbnNlLT5yZXNwb25zZSgpLnVybCgp IH07Ci0gICAgICAgICAgICAgICAgICAgIHByb2Nlc3NGb3JOYXZpZ2F0aW9uID0gbV9wcm9jZXNz LT5wcm9jZXNzUG9vbCgpLnByb2Nlc3NGb3JSZWdpc3RyYWJsZURvbWFpbih3ZWJzaXRlRGF0YVN0 b3JlKCksIHRoaXMsIHJlc3BvbnNlRG9tYWluKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICAgICAgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKCpuYXZpZ2F0aW9uLCBudWxs cHRyLCBwcm9jZXNzRm9yTmF2aWdhdGlvbi5yZWxlYXNlTm9uTnVsbCgpLCBQcm9jZXNzU3dhcFJl cXVlc3RlZEJ5Q2xpZW50OjpObywgU2hvdWxkVHJlYXRBc0NvbnRpbnVpbmdMb2FkOjpZZXNBZnRl clJlc3BvbnNlUG9saWN5RGVjaXNpb24sIG51bGxwdHIsIGV4aXN0aW5nTmV0d29ya1Jlc291cmNl TG9hZElkZW50aWZpZXJUb1Jlc3VtZSk7CisgICAgICAgICAgICBSZWZQdHI8V2ViUHJvY2Vzc1By b3h5PiBwcm9jZXNzRm9yTmF2aWdhdGlvbjsKKyAgICAgICAgICAgIGlmIChicm93c2luZ0NvbnRl eHRHcm91cFN3aXRjaERlY2lzaW9uID09IEJyb3dzaW5nQ29udGV4dEdyb3VwU3dpdGNoRGVjaXNp b246Ok5ld0lzb2xhdGVkR3JvdXApCisgICAgICAgICAgICAgICAgcHJvY2Vzc0Zvck5hdmlnYXRp b24gPSBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuY3JlYXRlTmV3V2ViUHJvY2Vzcygmd2Vic2l0 ZURhdGFTdG9yZSgpLCBXZWJQcm9jZXNzUHJveHk6OklzUHJld2FybWVkOjpObywgQ3Jvc3NPcmln aW5Nb2RlOjpJc29sYXRlZCk7CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBS ZWdpc3RyYWJsZURvbWFpbiByZXNwb25zZURvbWFpbiB7IG5hdmlnYXRpb25SZXNwb25zZS0+cmVz cG9uc2UoKS51cmwoKSB9OworICAgICAgICAgICAgICAgIHByb2Nlc3NGb3JOYXZpZ2F0aW9uID0g bV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLnByb2Nlc3NGb3JSZWdpc3RyYWJsZURvbWFpbih3ZWJz aXRlRGF0YVN0b3JlKCksIHRoaXMsIHJlc3BvbnNlRG9tYWluKTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIHdlYnNpdGVEYXRhU3RvcmUoKS5uZXR3b3JrUHJvY2VzcygpLnByZXBhcmVMb2Fk Rm9yV2ViUHJvY2Vzc1RyYW5zZmVyKHByb2Nlc3MtPmNvcmVQcm9jZXNzSWRlbnRpZmllcigpLCBt YWluUmVzb3VyY2VMb2FkSWRlbnRpZmllciwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBXVEZNb3Zl KHByb3RlY3RlZFRoaXMpLCBuYXZpZ2F0aW9uLCBuYXZpZ2F0aW9uUmVzcG9uc2UgPSBXVEZNb3Zl KG5hdmlnYXRpb25SZXNwb25zZSksIHNlbmRlciA9IFdURk1vdmUoc2VuZGVyKSwgcHJvY2Vzc0Zv ck5hdmlnYXRpb24gPSBwcm9jZXNzRm9yTmF2aWdhdGlvbi5yZWxlYXNlTm9uTnVsbCgpXShhdXRv IGV4aXN0aW5nTmV0d29ya1Jlc291cmNlTG9hZElkZW50aWZpZXJUb1Jlc3VtZSkgbXV0YWJsZSB7 CisgICAgICAgICAgICAgICAgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKCpuYXZpZ2F0 aW9uLCBudWxscHRyLCBXVEZNb3ZlKHByb2Nlc3NGb3JOYXZpZ2F0aW9uKSwgUHJvY2Vzc1N3YXBS ZXF1ZXN0ZWRCeUNsaWVudDo6Tm8sIFNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzQWZ0 ZXJSZXNwb25zZVBvbGljeURlY2lzaW9uLCBudWxscHRyLCBleGlzdGluZ05ldHdvcmtSZXNvdXJj ZUxvYWRJZGVudGlmaWVyVG9SZXN1bWUpOwogCiAgICAgICAgICAgICAgICAgcmVjZWl2ZWRQb2xp Y3lEZWNpc2lvbihQb2xpY3lBY3Rpb246Oklnbm9yZSwgbmF2aWdhdGlvbi5nZXQoKSwgbnVsbHB0 ciwgV1RGTW92ZShuYXZpZ2F0aW9uUmVzcG9uc2UpLCBXVEZNb3ZlKHNlbmRlciksIHsgfSwgV2ls bENvbnRpbnVlTG9hZEluTmV3UHJvY2Vzczo6WWVzKTsKICAgICAgICAgICAgIH0pOwo=