Title: [231026] trunk/Source/WebKit
- Revision
- 231026
- Author
- [email protected]
- Date
- 2018-04-25 15:27:49 -0700 (Wed, 25 Apr 2018)
Log Message
WebLoaderStrategy::networkMetricsFromResourceLoadIdentifier should use DoNotProcessIncomingMessagesWhenWaitingForSyncReply
https://bugs.webkit.org/show_bug.cgi?id=184978
<rdar://problem/39667094>
Reviewed by Simon Fraser.
Use DoNotProcessIncomingMessagesWhenWaitingForSyncReply to keep a consistent state after the sync IPC call.
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::responseFromResourceLoadIdentifier):
(WebKit::WebLoaderStrategy::networkMetricsFromResourceLoadIdentifier):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (231025 => 231026)
--- trunk/Source/WebKit/ChangeLog 2018-04-25 22:25:13 UTC (rev 231025)
+++ trunk/Source/WebKit/ChangeLog 2018-04-25 22:27:49 UTC (rev 231026)
@@ -1,3 +1,17 @@
+2018-04-25 Youenn Fablet <[email protected]>
+
+ WebLoaderStrategy::networkMetricsFromResourceLoadIdentifier should use DoNotProcessIncomingMessagesWhenWaitingForSyncReply
+ https://bugs.webkit.org/show_bug.cgi?id=184978
+ <rdar://problem/39667094>
+
+ Reviewed by Simon Fraser.
+
+ Use DoNotProcessIncomingMessagesWhenWaitingForSyncReply to keep a consistent state after the sync IPC call.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::responseFromResourceLoadIdentifier):
+ (WebKit::WebLoaderStrategy::networkMetricsFromResourceLoadIdentifier):
+
2018-04-25 Jiewen Tan <[email protected]>
Remove access to keychain from the WebContent process
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (231025 => 231026)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2018-04-25 22:25:13 UTC (rev 231025)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2018-04-25 22:27:49 UTC (rev 231026)
@@ -652,7 +652,7 @@
ResourceResponse WebLoaderStrategy::responseFromResourceLoadIdentifier(uint64_t resourceLoadIdentifier)
{
ResourceResponse response;
- WebProcess::singleton().ensureNetworkProcessConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::TakeNetworkLoadInformationResponse { resourceLoadIdentifier }, Messages::NetworkConnectionToWebProcess::TakeNetworkLoadInformationResponse::Reply { response }, 0);
+ WebProcess::singleton().ensureNetworkProcessConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::TakeNetworkLoadInformationResponse { resourceLoadIdentifier }, Messages::NetworkConnectionToWebProcess::TakeNetworkLoadInformationResponse::Reply { response }, 0, Seconds::infinity(), IPC::SendSyncOption::DoNotProcessIncomingMessagesWhenWaitingForSyncReply);
return response;
}
@@ -659,7 +659,7 @@
NetworkLoadMetrics WebLoaderStrategy::networkMetricsFromResourceLoadIdentifier(uint64_t resourceLoadIdentifier)
{
NetworkLoadMetrics networkMetrics;
- WebProcess::singleton().ensureNetworkProcessConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::TakeNetworkLoadInformationMetrics { resourceLoadIdentifier }, Messages::NetworkConnectionToWebProcess::TakeNetworkLoadInformationMetrics::Reply { networkMetrics }, 0);
+ WebProcess::singleton().ensureNetworkProcessConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::TakeNetworkLoadInformationMetrics { resourceLoadIdentifier }, Messages::NetworkConnectionToWebProcess::TakeNetworkLoadInformationMetrics::Reply { networkMetrics }, 0, Seconds::infinity(), IPC::SendSyncOption::DoNotProcessIncomingMessagesWhenWaitingForSyncReply);
return networkMetrics;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
