Title: [257346] releases/WebKitGTK/webkit-2.28/Source/WebCore
- Revision
- 257346
- Author
- carlo...@webkit.org
- Date
- 2020-02-25 08:03:15 -0800 (Tue, 25 Feb 2020)
Log Message
Merge r256569 - Add missing call to completionHandler
https://bugs.webkit.org/show_bug.cgi?id=207720
<rdar://problem/59436915>
Reviewed by Chris Dumez.
Bug 179641 (r225702) updated
SubresourceLoader::willSendRequestInternal with a return call without
first calling the completionHandler. Address this by adding the call
to the completionHandler.
No new tests -- it's not possible to control execution into the
affected code path.
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::willSendRequestInternal):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (257345 => 257346)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-02-25 16:03:12 UTC (rev 257345)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-02-25 16:03:15 UTC (rev 257346)
@@ -1,3 +1,22 @@
+2020-02-13 Keith Rollin <krol...@apple.com>
+
+ Add missing call to completionHandler
+ https://bugs.webkit.org/show_bug.cgi?id=207720
+ <rdar://problem/59436915>
+
+ Reviewed by Chris Dumez.
+
+ Bug 179641 (r225702) updated
+ SubresourceLoader::willSendRequestInternal with a return call without
+ first calling the completionHandler. Address this by adding the call
+ to the completionHandler.
+
+ No new tests -- it's not possible to control execution into the
+ affected code path.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::willSendRequestInternal):
+
2020-02-13 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r254557.
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/loader/SubresourceLoader.cpp (257345 => 257346)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/loader/SubresourceLoader.cpp 2020-02-25 16:03:12 UTC (rev 257345)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/loader/SubresourceLoader.cpp 2020-02-25 16:03:15 UTC (rev 257346)
@@ -239,7 +239,7 @@
m_resource->responseReceived(opaqueRedirectedResponse);
if (reachedTerminalState()) {
RELEASE_LOG_IF_ALLOWED("willSendRequestinternal: reached terminal state (frame = %p, frameLoader = %p, resourceID = %lu)", frame(), frameLoader(), identifier());
- return;
+ return completionHandler(WTFMove(newRequest));
}
RELEASE_LOG_IF_ALLOWED("willSendRequestinternal: resource load completed (frame = %p, frameLoader = %p, resourceID = %lu)", frame(), frameLoader(), identifier());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
