234002 2021-12-08 06:20:49 -0800 Copy ServiceWorkerNavigationPreloader error when failing its ServiceWorkerFetchTask 2021-12-09 03:44:27 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen cdumez webkit-bug-importer oldest_to_newest 1821527 0 youennf 2021-12-08 06:20:49 -0800 Copy ServiceWorkerNavigationPreloader error when failing its ServiceWorkerFetchTask 1821528 1 446356 youennf 2021-12-08 06:25:11 -0800 Created attachment 446356 Patch 1821550 2 446356 cdumez 2021-12-08 07:34:37 -0800 Comment on attachment 446356 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446356&action=review > Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp:370 > if (!m_preloader->error().isNull()) { Maybe this would look better? ``` if (auto error = m_preloader->error(); !error.isNull()) { didFail(error); return; } ``` > Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp:397 > + didFail(ResourceError { m_preloader->error() }); ditto. 1821559 3 446356 youennf 2021-12-08 08:07:36 -0800 Comment on attachment 446356 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446356&action=review >> Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp:370 >> if (!m_preloader->error().isNull()) { > > Maybe this would look better? > ``` > if (auto error = m_preloader->error(); !error.isNull()) { > didFail(error); > return; > } > ``` I am not sure, I would tend to leave the comment in any case. With your proposal, we would always copy the error, though a null error copy y is probably very cheap. Another approach is to return a ResourceError and not a const ResourceError&, or a std::optional<ResourceError>. 1822060 4 ews-feeder 2021-12-09 03:43:51 -0800 Committed r286774 (245015@main): <https://commits.webkit.org/245015@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446356. 1822061 5 webkit-bug-importer 2021-12-09 03:44:27 -0800 <rdar://problem/86263771> 446356 2021-12-08 06:25:11 -0800 2021-12-09 03:43:53 -0800 Patch bug-234002-20211208152510.patch text/plain 2044 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYyNjRhZWQyZDE3Y2U1ZTQz NzFkMjFjODU5MTQ2MzNiYTE2NTI5ZTUuLmEzZDcxMGU5MWFmMTFmYjhkNmFmYjhiNzA2NzU1NzBi NWMyOGZlODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTItMDggIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIENvcHkgU2VydmljZVdvcmtlck5h dmlnYXRpb25QcmVsb2FkZXIgZXJyb3Igd2hlbiBmYWlsaW5nIGl0cyBTZXJ2aWNlV29ya2VyRmV0 Y2hUYXNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzQwMDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD b3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvU2Vy dmljZVdvcmtlci9TZXJ2aWNlV29ya2VyRmV0Y2hUYXNrLmNwcDoKKyAgICAgICAgV2hlbiBmYWls aW5nIGEgU2VydmljZVdvcmtlck5hdmlnYXRpb25QcmVsb2FkZXIsIHdlIG1pZ2h0IGRlbGV0ZSBp dCwgc28gaXQgaXMgbm90IHNhZmUgdG8gbWFuYWdlIGEgcmVmZXJlbmNlIHRvIGl0cyBlcnJvci4K KyAgICAgICAgSW5zdGVhZCBjb3B5IHRoZSBlcnJvci4KKwogMjAyMS0xMi0wNyAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IFNlcnZpY2VXb3JrZXIgZG93 bmxvYWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VX b3JrZXIvU2VydmljZVdvcmtlckZldGNoVGFzay5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL1NlcnZpY2VXb3JrZXIvU2VydmljZVdvcmtlckZldGNoVGFzay5jcHAKaW5kZXggNDc3 ZTg4MjUxYmM5MDkxZGExNGJhMmEyYzMzYjM3NDNhOWUzMjUzZS4uNGU3OTE5YjNkZGMwMmFlMTRk MGVkOTY4NGI4YzY4YmI2ZjI4YTQzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1NlcnZpY2VXb3JrZXJGZXRjaFRhc2suY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9TZXJ2aWNlV29ya2VyRmV0 Y2hUYXNrLmNwcApAQCAtMzY4LDcgKzM2OCw4IEBAIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFz azo6bG9hZFJlc3BvbnNlRnJvbVByZWxvYWRlcigpCiAgICAgICAgICAgICByZXR1cm47CiAKICAg ICAgICAgaWYgKCFtX3ByZWxvYWRlci0+ZXJyb3IoKS5pc051bGwoKSkgewotICAgICAgICAgICAg ZGlkRmFpbChtX3ByZWxvYWRlci0+ZXJyb3IoKSk7CisgICAgICAgICAgICAvLyBMZXQncyBjb3B5 IHRoZSBlcnJvciBhcyBjYWxsaW5nIGRpZEZhaWwgbWlnaHQgZGVzdHJveSBtX3ByZWxvYWRlci4K KyAgICAgICAgICAgIGRpZEZhaWwoUmVzb3VyY2VFcnJvciB7IG1fcHJlbG9hZGVyLT5lcnJvcigp IH0pOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAgLTM5Miw3ICszOTMsOCBA QCB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmxvYWRCb2R5RnJvbVByZWxvYWRlcigpCiAg ICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGlmICgh bV9wcmVsb2FkZXItPmVycm9yKCkuaXNOdWxsKCkpIHsKLSAgICAgICAgICAgIGRpZEZhaWwobV9w cmVsb2FkZXItPmVycm9yKCkpOworICAgICAgICAgICAgLy8gTGV0J3MgY29weSB0aGUgZXJyb3Ig YXMgY2FsbGluZyBkaWRGYWlsIG1pZ2h0IGRlc3Ryb3kgbV9wcmVsb2FkZXIuCisgICAgICAgICAg ICBkaWRGYWlsKFJlc291cmNlRXJyb3IgeyBtX3ByZWxvYWRlci0+ZXJyb3IoKSB9KTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBpZiAoIWNodW5rKSB7Cg==