239089 2022-04-11 14:37:01 -0700 Use WebKit::blockedError instead of ResourceLoader::blockedError in WebLoaderStrategy::scheduleLoadFromNetworkProcess 2022-04-11 16:46:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez darin webkit-bug-importer oldest_to_newest 1860413 0 achristensen 2022-04-11 14:37:01 -0700 Use WebKit::blockedError instead of ResourceLoader::blockedError in WebLoaderStrategy::scheduleLoadFromNetworkProcess 1860414 1 457288 achristensen 2022-04-11 14:38:42 -0700 Created attachment 457288 Patch 1860415 2 achristensen 2022-04-11 14:38:46 -0700 <rdar://problem/91295875> 1860418 3 457288 cdumez 2022-04-11 14:45:13 -0700 Comment on attachment 457288 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457288&action=review > Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp:329 > + RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }, request] { May have been easier to capture `resourceLoader->blockedError()` in the lambda and it would have been more obvious that the new code is identical in behavior to the previous one. 1860419 4 457288 darin 2022-04-11 14:46:30 -0700 Comment on attachment 457288 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457288&action=review >> Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp:329 >> + RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }, request] { > > May have been easier to capture `resourceLoader->blockedError()` in the lambda and it would have been more obvious that the new code is identical in behavior to the previous one. This copies the ResourceRequest. Is that necessary? 1860422 5 457288 cdumez 2022-04-11 14:47:47 -0700 Comment on attachment 457288 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457288&action=review >>> Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp:329 >>> + RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }, request] { >> >> May have been easier to capture `resourceLoader->blockedError()` in the lambda and it would have been more obvious that the new code is identical in behavior to the previous one. > > This copies the ResourceRequest. Is that necessary? With my proposal, we would effectively just "move" a ResourceError in, which seems better. 1860433 6 achristensen 2022-04-11 15:24:36 -0700 I like just capturing the error. This is the same behavior without the possibility of null dereferencing because WebFrameLoaderClient::blockedError just calls WebKit::blockedError. 1860435 7 457293 achristensen 2022-04-11 15:26:04 -0700 Created attachment 457293 Patch 1860477 8 ews-feeder 2022-04-11 16:46:15 -0700 Committed r292738 (249522@main): <https://commits.webkit.org/249522@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457293. 457288 2022-04-11 14:38:42 -0700 2022-04-11 15:26:02 -0700 Patch bug-239089-20220411143842.patch text/plain 1972 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA5NzY4NTlmMjkzMGEyNmMw ZDUxMWY1YmRmNzlmNjEzYTdhMDRiOTMuLjRiMjA4MmFlNWZhYzBmMDhhODBiNDdiMDNmMDUyMTU0 MTZhYWE2ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDQtMTEgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2UgV2ViS2l0 OjpibG9ja2VkRXJyb3IgaW5zdGVhZCBvZiBSZXNvdXJjZUxvYWRlcjo6YmxvY2tlZEVycm9yIGlu IFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTA4OQorICAgICAg ICA8cmRhcjovLzkxMjk1ODc1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBsYXR0ZXIgZGVyZWZlcmVuY2VzIHRoZSBmcmFtZSBsb2FkZXIgd2hp Y2ggY2FuIGJlIG51bGwuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVy U3RyYXRlZ3kuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1 bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNzKToKKwogMjAyMi0wNC0xMSAgV2Vuc29uIEhzaWVoICA8 d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjg5Nzg1KTog W2lPU10gVW5hYmxlIHRvIGRvdWJsZS1jbGljayB0byBzZWxlY3QgYSB3b3JkIGluIGEgcmVjZWl2 ZWQgZW1haWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dl YkxvYWRlclN0cmF0ZWd5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dl YkxvYWRlclN0cmF0ZWd5LmNwcAppbmRleCBiMTFjNThmZWVjMDJlMGMyNzYxMDIyYjc0MzczYTI4 N2FmODk5YmQ3Li5mMzc1NWZjM2I2MDVjNWNjYTlkNzMzOTNhOGRhZWJkZmY2ZWI5MzRkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVn eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3Ry YXRlZ3kuY3BwCkBAIC0zMjYsOCArMzI2LDggQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c2No ZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNzKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUwKICAg ICAgICAgICAgICYmIHJlc291cmNlTG9hZGVyLmZyYW1lTG9hZGVyKCktPm5vdGlmaWVyKCkuaXNJ bml0aWFsUmVxdWVzdElkZW50aWZpZXIoaWRlbnRpZmllcikKICAgICAgICAgICAgID8gTWFpbkZy YW1lTWFpblJlc291cmNlOjpZZXMgOiBNYWluRnJhbWVNYWluUmVzb3VyY2U6Ok5vOwogICAgICAg ICBpZiAoIXBhZ2UtPmFsbG93c0xvYWRGcm9tVVJMKHJlcXVlc3QudXJsKCksIG1haW5GcmFtZU1h aW5SZXNvdXJjZSkpIHsKLSAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcmVz b3VyY2VMb2FkZXIgPSBSZWYgeyByZXNvdXJjZUxvYWRlciB9XSB7Ci0gICAgICAgICAgICAgICAg cmVzb3VyY2VMb2FkZXItPmRpZEZhaWwocmVzb3VyY2VMb2FkZXItPmJsb2NrZWRFcnJvcigpKTsK KyAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcmVzb3VyY2VMb2FkZXIgPSBS ZWYgeyByZXNvdXJjZUxvYWRlciB9LCByZXF1ZXN0XSB7CisgICAgICAgICAgICAgICAgcmVzb3Vy Y2VMb2FkZXItPmRpZEZhaWwoYmxvY2tlZEVycm9yKHJlcXVlc3QpKTsKICAgICAgICAgICAgIH0p OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Cg== 457293 2022-04-11 15:26:04 -0700 2022-04-11 16:46:18 -0700 Patch bug-239089-20220411152603.patch text/plain 1975 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA5NzY4NTlmMjkzMGEyNmMw ZDUxMWY1YmRmNzlmNjEzYTdhMDRiOTMuLjVhZGViODAyMzRkN2I1ZDVjYjBlOTUzNjQyODljZjUw ZjE5NmVhMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDQtMTEgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2UgV2ViS2l0 OjpibG9ja2VkRXJyb3IgaW5zdGVhZCBvZiBSZXNvdXJjZUxvYWRlcjo6YmxvY2tlZEVycm9yIGlu IFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzOTA4OQorICAgICAg ICA8cmRhcjovLzkxMjk1ODc1PgorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6Lgor CisgICAgICAgIFRoZSBsYXR0ZXIgZGVyZWZlcmVuY2VzIHRoZSBmcmFtZSBsb2FkZXIgd2hpY2gg Y2FuIGJlIG51bGwuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3Ry YXRlZ3kuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVM b2FkRnJvbU5ldHdvcmtQcm9jZXNzKToKKwogMjAyMi0wNC0xMSAgV2Vuc29uIEhzaWVoICA8d2Vu c29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjg5Nzg1KTogW2lP U10gVW5hYmxlIHRvIGRvdWJsZS1jbGljayB0byBzZWxlY3QgYSB3b3JkIGluIGEgcmVjZWl2ZWQg ZW1haWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxv YWRlclN0cmF0ZWd5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxv YWRlclN0cmF0ZWd5LmNwcAppbmRleCBiMTFjNThmZWVjMDJlMGMyNzYxMDIyYjc0MzczYTI4N2Fm ODk5YmQ3Li4wY2JmZThlNjU5NmMwOTNhMDNmYWI3NjgzNTcyOTNiZDgwMDJiNGU0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRl Z3kuY3BwCkBAIC0zMjYsOCArMzI2LDggQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1 bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNzKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUwKICAgICAg ICAgICAgICYmIHJlc291cmNlTG9hZGVyLmZyYW1lTG9hZGVyKCktPm5vdGlmaWVyKCkuaXNJbml0 aWFsUmVxdWVzdElkZW50aWZpZXIoaWRlbnRpZmllcikKICAgICAgICAgICAgID8gTWFpbkZyYW1l TWFpblJlc291cmNlOjpZZXMgOiBNYWluRnJhbWVNYWluUmVzb3VyY2U6Ok5vOwogICAgICAgICBp ZiAoIXBhZ2UtPmFsbG93c0xvYWRGcm9tVVJMKHJlcXVlc3QudXJsKCksIG1haW5GcmFtZU1haW5S ZXNvdXJjZSkpIHsKLSAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcmVzb3Vy Y2VMb2FkZXIgPSBSZWYgeyByZXNvdXJjZUxvYWRlciB9XSB7Ci0gICAgICAgICAgICAgICAgcmVz b3VyY2VMb2FkZXItPmRpZEZhaWwocmVzb3VyY2VMb2FkZXItPmJsb2NrZWRFcnJvcigpKTsKKyAg ICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbcmVzb3VyY2VMb2FkZXIgPSBSZWYg eyByZXNvdXJjZUxvYWRlciB9LCBlcnJvciA9IGJsb2NrZWRFcnJvcihyZXF1ZXN0KV0geworICAg ICAgICAgICAgICAgIHJlc291cmNlTG9hZGVyLT5kaWRGYWlsKGVycm9yKTsKICAgICAgICAgICAg IH0pOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Cg==