Title: [292738] trunk/Source/WebKit
- Revision
- 292738
- Author
- [email protected]
- Date
- 2022-04-11 16:45:00 -0700 (Mon, 11 Apr 2022)
Log Message
Use WebKit::blockedError instead of ResourceLoader::blockedError in WebLoaderStrategy::scheduleLoadFromNetworkProcess
https://bugs.webkit.org/show_bug.cgi?id=239089
<rdar://91295875>
Patch by Alex Christensen <[email protected]> on 2022-04-11
Reviewed by Chris Dumez.
The latter dereferences the frame loader which can be null.
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (292737 => 292738)
--- trunk/Source/WebKit/ChangeLog 2022-04-11 23:39:27 UTC (rev 292737)
+++ trunk/Source/WebKit/ChangeLog 2022-04-11 23:45:00 UTC (rev 292738)
@@ -1,3 +1,16 @@
+2022-04-11 Alex Christensen <[email protected]>
+
+ Use WebKit::blockedError instead of ResourceLoader::blockedError in WebLoaderStrategy::scheduleLoadFromNetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=239089
+ <rdar://91295875>
+
+ Reviewed by Chris Dumez.
+
+ The latter dereferences the frame loader which can be null.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
+
2022-04-11 Simon Fraser <[email protected]>
Crash under ShareableBitmap::makeCGImageCopy()
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (292737 => 292738)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2022-04-11 23:39:27 UTC (rev 292737)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2022-04-11 23:45:00 UTC (rev 292738)
@@ -326,8 +326,8 @@
&& resourceLoader.frameLoader()->notifier().isInitialRequestIdentifier(identifier)
? MainFrameMainResource::Yes : MainFrameMainResource::No;
if (!page->allowsLoadFromURL(request.url(), mainFrameMainResource)) {
- RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }] {
- resourceLoader->didFail(resourceLoader->blockedError());
+ RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }, error = blockedError(request)] {
+ resourceLoader->didFail(error);
});
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
