222577 2021-03-01 14:51:17 -0800 Have WebProcessProxy::requestTermination() call processDidTerminateOrFailedToLaunch() 2021-03-01 17:45:24 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 222574 1 cdumez cdumez achristensen beidson ggaren webkit-bug-importer oldest_to_newest 1734621 0 cdumez 2021-03-01 14:51:17 -0800 Have WebProcessProxy::requestTermination() call processDidTerminateOrFailedToLaunch() instead of duplicating the code. It was error-prone to have 2 separate code paths whether the process exited due to a crash or a termination request. It led to Bug 222574 for example because we added some logic to remove the process from the cache in processDidTerminateOrFailedToLaunch() but had failed to do so in requestTermination(). 1734623 1 421870 cdumez 2021-03-01 14:54:18 -0800 Created attachment 421870 Patch 1734677 2 421870 ggaren 2021-03-01 16:27:54 -0800 Comment on attachment 421870 Patch r=me 1734708 3 ews-feeder 2021-03-01 17:45:00 -0800 Committed r273713: <https://commits.webkit.org/r273713> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421870. 1734709 4 webkit-bug-importer 2021-03-01 17:45:24 -0800 <rdar://problem/74901873> 421870 2021-03-01 14:54:18 -0800 2021-03-01 17:45:01 -0800 Patch bug-222577-20210301145417.patch text/plain 6199 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDliYjhiZDhlMDExODhjNjZj NjUwMTc5MTU5M2Y4ODdmMjUxY2VkNzAuLjVmM2NmMjEyODk0MmZkY2QzNTgwNWM4MWJhODMyZmE4 NDVkYjcyMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDMtMDEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBIYXZlIFdlYlByb2Nlc3NQcm94eTo6 cmVxdWVzdFRlcm1pbmF0aW9uKCkgY2FsbCBwcm9jZXNzRGlkVGVybWluYXRlT3JGYWlsZWRUb0xh dW5jaCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjI1NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBI YXZlIFdlYlByb2Nlc3NQcm94eTo6cmVxdWVzdFRlcm1pbmF0aW9uKCkgY2FsbCBwcm9jZXNzRGlk VGVybWluYXRlT3JGYWlsZWRUb0xhdW5jaCgpIGluc3RlYWQgb2YgZHVwbGljYXRpbmcKKyAgICAg ICAgdGhlIGNvZGUuIEl0IHdhcyBlcnJvci1wcm9uZSB0byBoYXZlIDIgc2VwYXJhdGUgY29kZSBw YXRocyB3aGV0aGVyIHRoZSBwcm9jZXNzIGV4aXRlZCBkdWUgdG8gYSBjcmFzaCBvciBhCisgICAg ICAgIHRlcm1pbmF0aW9uIHJlcXVlc3QuIEl0IGxlZCB0byBCdWcgMjIyNTc0IGZvciBleGFtcGxl IGJlY2F1c2Ugd2UgYWRkZWQgc29tZSBsb2dpYyB0byByZW1vdmUgdGhlIHByb2Nlc3MgZnJvbQor ICAgICAgICB0aGUgY2FjaGUgaW4gcHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFpbGVkVG9MYXVuY2go KSBidXQgaGFkIGZhaWxlZCB0byBkbyBzbyBpbiByZXF1ZXN0VGVybWluYXRpb24oKS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzUHJveHk6OmRpZENsb3NlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1By b3h5Ojpwcm9jZXNzRGlkVGVybWluYXRlT3JGYWlsZWRUb0xhdW5jaCk6CisgICAgICAgIChXZWJL aXQ6OldlYlByb2Nlc3NQcm94eTo6ZGlkRmluaXNoTGF1bmNoaW5nKToKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzc1Byb3h5OjpyZXF1ZXN0VGVybWluYXRpb24pOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoKKwogMjAyMS0wMy0wMSAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEhhdmUgV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JS ZWdpc3RyYWJsZURvbWFpbigpIHJldHVybiBhIFJlZjxXZWJQcm9jZXNzUHJveHk+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBiNjUwMzdkMDM3OWIw NGExNzQ4ZThiNzdkMWZjOGEyM2E0ZTA4Y2M4Li5mNDYwMzVhMGM2YjcyYjZiODZiODM5MjFiNDYx NDJiYjMzZTRmNWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5jcHAKQEAgLTg0OSwxNCArODQ5LDE0IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNl aXZlU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBJUEM6OkRlCiB2b2lk IFdlYlByb2Nlc3NQcm94eTo6ZGlkQ2xvc2UoSVBDOjpDb25uZWN0aW9uJikKIHsKICAgICBSRUxF QVNFX0xPR19JRihpc1JlbGVhc2VMb2dnaW5nQWxsb3dlZCgpLCBQcm9jZXNzLCAiJXAgLSBXZWJQ cm9jZXNzUHJveHkgZGlkQ2xvc2UgKHdlYiBwcm9jZXNzIGNyYXNoKSIsIHRoaXMpOwotICAgIHBy b2Nlc3NEaWRUZXJtaW5hdGVPckZhaWxlZFRvTGF1bmNoKCk7CisgICAgcHJvY2Vzc0RpZFRlcm1p bmF0ZU9yRmFpbGVkVG9MYXVuY2goUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpDcmFzaCk7CiB9 CiAKLXZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpwcm9jZXNzRGlkVGVybWluYXRlT3JGYWlsZWRUb0xh dW5jaCgpCit2b2lkIFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFpbGVk VG9MYXVuY2goUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uIHJlYXNvbikKIHsKLSAgICAvLyBQcm90 ZWN0IG91cnNlbHZlcywgYXMgdGhlIGNhbGwgdG8gZGlzY29ubmVjdCgpIGJlbG93IG1heSBvdGhl cndpc2UgY2F1c2UgdXMKKyAgICAvLyBQcm90ZWN0IG91cnNlbHZlcywgYXMgdGhlIGNhbGwgdG8g c2h1dERvd24oKSBiZWxvdyBtYXkgb3RoZXJ3aXNlIGNhdXNlIHVzCiAgICAgLy8gdG8gYmUgZGVs ZXRlZCBiZWZvcmUgd2UgY2FuIGZpbmlzaCBvdXIgd29yay4KLSAgICBSZWY8V2ViUHJvY2Vzc1By b3h5PiBwcm90ZWN0KCp0aGlzKTsKKyAgICBhdXRvIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0 aGlzKTsKIAogI2lmIFBMQVRGT1JNKENPQ09BKSAmJiBFTkFCTEUoTUVESUFfU1RSRUFNKQogICAg IG1fdXNlck1lZGlhQ2FwdHVyZU1hbmFnZXJQcm94eS0+Y2xlYXIoKTsKQEAgLTg2OCw3ICs4Njgs NyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFpbGVkVG9M YXVuY2goKQogICAgIGF1dG8gcGFnZXMgPSBjb3B5VG9WZWN0b3JPZjxSZWZQdHI8V2ViUGFnZVBy b3h5Pj4obV9wYWdlTWFwLnZhbHVlcygpKTsKICAgICBhdXRvIHByb3Zpc2lvbmFsUGFnZXMgPSBX VEY6Om1hcChtX3Byb3Zpc2lvbmFsUGFnZXMsIFtdKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSkgeyBy ZXR1cm4gbWFrZVdlYWtQdHIocHJvdmlzaW9uYWxQYWdlKTsgfSk7CiAKLSAgICBhdXRvIGlzUmVz cG9uc2l2ZUNhbGxiYWNrcyA9IFdURk1vdmUobV9pc1Jlc3BvbnNpdmVDYWxsYmFja3MpOworICAg IGF1dG8gaXNSZXNwb25zaXZlQ2FsbGJhY2tzID0gc3RkOjpleGNoYW5nZShtX2lzUmVzcG9uc2l2 ZUNhbGxiYWNrcywgeyB9KTsKICAgICBmb3IgKGF1dG8mIGNhbGxiYWNrIDogaXNSZXNwb25zaXZl Q2FsbGJhY2tzKQogICAgICAgICBjYWxsYmFjayhmYWxzZSk7CiAKQEAgLTg3OCw3ICs4NzgsNyBA QCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFpbGVkVG9MYXVu Y2goKQogICAgIHNodXREb3duKCk7CiAKICNpZiBFTkFCTEUoUFVCTElDX1NVRkZJWF9MSVNUKQot ICAgIGlmIChwYWdlcy5zaXplKCkgPT0gMSkgeworICAgIGlmIChwYWdlcy5zaXplKCkgPT0gMSAm JiByZWFzb24gPT0gUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpDcmFzaCkgewogICAgICAgICBh dXRvJiBwYWdlID0gKnBhZ2VzWzBdOwogICAgICAgICBTdHJpbmcgZG9tYWluID0gdG9wUHJpdmF0 ZWx5Q29udHJvbGxlZERvbWFpbihVUkwoeyB9LCBwYWdlLmN1cnJlbnRVUkwoKSkuaG9zdCgpLnRv U3RyaW5nKCkpOwogICAgICAgICBpZiAoIWRvbWFpbi5pc0VtcHR5KCkpCkBAIC04OTEsNyArODkx LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OnByb2Nlc3NEaWRUZXJtaW5hdGVPckZhaWxlZFRv TGF1bmNoKCkKICNlbmRpZgogCiAgICAgZm9yIChhdXRvJiBwYWdlIDogcGFnZXMpCi0gICAgICAg IHBhZ2UtPnJlc2V0U3RhdGVBZnRlclByb2Nlc3NUZXJtaW5hdGlvbihQcm9jZXNzVGVybWluYXRp b25SZWFzb246OkNyYXNoKTsKKyAgICAgICAgcGFnZS0+cmVzZXRTdGF0ZUFmdGVyUHJvY2Vzc1Rl cm1pbmF0aW9uKHJlYXNvbik7CiAKICAgICBmb3IgKGF1dG8mIHByb3Zpc2lvbmFsUGFnZSA6IHBy b3Zpc2lvbmFsUGFnZXMpIHsKICAgICAgICAgaWYgKHByb3Zpc2lvbmFsUGFnZSkKQEAgLTg5OSw3 ICs4OTksNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFp bGVkVG9MYXVuY2goKQogICAgIH0KIAogICAgIGZvciAoYXV0byYgcGFnZSA6IHBhZ2VzKQotICAg ICAgICBwYWdlLT5kaXNwYXRjaFByb2Nlc3NEaWRUZXJtaW5hdGUoUHJvY2Vzc1Rlcm1pbmF0aW9u UmVhc29uOjpDcmFzaCk7CisgICAgICAgIHBhZ2UtPmRpc3BhdGNoUHJvY2Vzc0RpZFRlcm1pbmF0 ZShyZWFzb24pOwogCiAgICAgbV9zbGVlcERpc2FibGVycy5jbGVhcigpOwogfQpAQCAtMTAwOCw3 ICsxMDA4LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyhQcm9j ZXNzTGF1bmNoZXIqIGxhdW5jaGVyLCBJUEM6OkNvbm5lY3QKIAogICAgIGlmICghSVBDOjpDb25u ZWN0aW9uOjppZGVudGlmaWVySXNWYWxpZChjb25uZWN0aW9uSWRlbnRpZmllcikpIHsKICAgICAg ICAgUkVMRUFTRV9MT0dfSUYoaXNSZWxlYXNlTG9nZ2luZ0FsbG93ZWQoKSwgUHJvY2VzcywgIiVw IC0gV2ViUHJvY2Vzc1Byb3h5IGRpZEZpbmlzaExhdW5jaGluZyAtIGludmFsaWQgY29ubmVjdGlv biBpZGVudGlmaWVyICh3ZWIgcHJvY2VzcyBmYWlsZWQgdG8gbGF1bmNoKSIsIHRoaXMpOwotICAg ICAgICBwcm9jZXNzRGlkVGVybWluYXRlT3JGYWlsZWRUb0xhdW5jaCgpOworICAgICAgICBwcm9j ZXNzRGlkVGVybWluYXRlT3JGYWlsZWRUb0xhdW5jaChQcm9jZXNzVGVybWluYXRpb25SZWFzb246 OkNyYXNoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTI1NCwyNCArMTI1NCw3IEBA IHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpyZXF1ZXN0VGVybWluYXRpb24oUHJvY2Vzc1Rlcm1pbmF0 aW9uUmVhc29uIHJlYXNvbikKIAogICAgIEF1eGlsaWFyeVByb2Nlc3NQcm94eTo6dGVybWluYXRl KCk7CiAKLSAgICBpZiAod2ViQ29ubmVjdGlvbigpKQotICAgICAgICB3ZWJDb25uZWN0aW9uKCkt PmRpZENsb3NlKCk7Ci0KLSAgICBhdXRvIHByb3Zpc2lvbmFsUGFnZXMgPSBXVEY6Om1hcChtX3By b3Zpc2lvbmFsUGFnZXMsIFtdKGF1dG8qIHByb3Zpc2lvbmFsUGFnZSkgeyByZXR1cm4gbWFrZVdl YWtQdHIocHJvdmlzaW9uYWxQYWdlKTsgfSk7Ci0gICAgYXV0byBwYWdlcyA9IGNvcHlUb1ZlY3Rv ck9mPFJlZlB0cjxXZWJQYWdlUHJveHk+PihtX3BhZ2VNYXAudmFsdWVzKCkpOwotCi0gICAgc2h1 dERvd24oKTsKLQotICAgIGZvciAoYXV0byYgcGFnZSA6IHBhZ2VzKQotICAgICAgICBwYWdlLT5y ZXNldFN0YXRlQWZ0ZXJQcm9jZXNzVGVybWluYXRpb24ocmVhc29uKTsKLSAgICAgICAgCi0gICAg Zm9yIChhdXRvJiBwcm92aXNpb25hbFBhZ2UgOiBwcm92aXNpb25hbFBhZ2VzKSB7Ci0gICAgICAg IGlmIChwcm92aXNpb25hbFBhZ2UpCi0gICAgICAgICAgICBwcm92aXNpb25hbFBhZ2UtPnByb2Nl c3NEaWRUZXJtaW5hdGUoKTsKLSAgICB9Ci0KLSAgICBmb3IgKGF1dG8mIHBhZ2UgOiBwYWdlcykK LSAgICAgICAgcGFnZS0+ZGlzcGF0Y2hQcm9jZXNzRGlkVGVybWluYXRlKHJlYXNvbik7CisgICAg cHJvY2Vzc0RpZFRlcm1pbmF0ZU9yRmFpbGVkVG9MYXVuY2gocmVhc29uKTsKIH0KIAogYm9vbCBX ZWJQcm9jZXNzUHJveHk6OmlzUmVsZWFzZUxvZ2dpbmdBbGxvd2VkKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKaW5kZXggMjI2OGI3Nzk1OWVlYmE0OTc3 YWUwMGYzZDI3Y2E4YzY0YWZlNDY2ZS4uOWY0M2MxNTJhMDYxZjY4MWNmN2RhNTcxNWRmY2UxNjAy YTJjMjQ3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1By b3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKQEAg LTQ3OSw3ICs0NzksNyBAQCBwcml2YXRlOgogICAgIFJlc3BvbnNpdmVuZXNzVGltZXImIHJlc3Bv bnNpdmVuZXNzVGltZXIoKSB7IHJldHVybiBtX3Jlc3BvbnNpdmVuZXNzVGltZXI7IH0KICAgICB2 b2lkIHVwZGF0ZUJhY2tncm91bmRSZXNwb25zaXZlbmVzc1RpbWVyKCk7CiAKLSAgICB2b2lkIHBy b2Nlc3NEaWRUZXJtaW5hdGVPckZhaWxlZFRvTGF1bmNoKCk7CisgICAgdm9pZCBwcm9jZXNzRGlk VGVybWluYXRlT3JGYWlsZWRUb0xhdW5jaChQcm9jZXNzVGVybWluYXRpb25SZWFzb24pOwogCiAg ICAgYm9vbCBpc1JlbGVhc2VMb2dnaW5nQWxsb3dlZCgpIGNvbnN0OwogCg==