Title: [208665] trunk/Source/WebKit2
- Revision
- 208665
- Author
- [email protected]
- Date
- 2016-11-12 21:50:32 -0800 (Sat, 12 Nov 2016)
Log Message
Incorrect release log message emitted when waiting/not waiting for the WebProcess continue a load
https://bugs.webkit.org/show_bug.cgi?id=164605
Patch by Daniel Bates <[email protected]> on 2016-11-12
Reviewed by Darin Adler.
Currently we emit a release log message of the form "didReceiveResponse: Should wait for
message from WebContent process ..." when we are not waiting for the WebProcess and emit
a message of the form "didReceiveResponse: Should not wait for message from WebContent
process" when we are waiting on the WebProcess. Invert these messages to reflect whether
we are waiting for the WebProcess to send message NetworkResourceLoader::ContinueDidReceiveResponsewhether.
For the main resource NetworkResourceLoader::didReceiveResponse() returns ShouldContinueDidReceiveResponse::No
because we are waiting for the WebProcess to send message NetworkResourceLoader::ContinueDidReceiveResponse
to continue the load. For a subresource we do not need to wait for the WebProcess to allow the load to continue
and hence NetworkResourceLoader::didReceiveResponse() returns ShouldContinueDidReceiveResponse::Yes.
* NetworkProcess/NetworkResourceLoader.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (208664 => 208665)
--- trunk/Source/WebKit2/ChangeLog 2016-11-13 05:38:58 UTC (rev 208664)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-13 05:50:32 UTC (rev 208665)
@@ -1,3 +1,23 @@
+2016-11-12 Daniel Bates <[email protected]>
+
+ Incorrect release log message emitted when waiting/not waiting for the WebProcess continue a load
+ https://bugs.webkit.org/show_bug.cgi?id=164605
+
+ Reviewed by Darin Adler.
+
+ Currently we emit a release log message of the form "didReceiveResponse: Should wait for
+ message from WebContent process ..." when we are not waiting for the WebProcess and emit
+ a message of the form "didReceiveResponse: Should not wait for message from WebContent
+ process" when we are waiting on the WebProcess. Invert these messages to reflect whether
+ we are waiting for the WebProcess to send message NetworkResourceLoader::ContinueDidReceiveResponsewhether.
+
+ For the main resource NetworkResourceLoader::didReceiveResponse() returns ShouldContinueDidReceiveResponse::No
+ because we are waiting for the WebProcess to send message NetworkResourceLoader::ContinueDidReceiveResponse
+ to continue the load. For a subresource we do not need to wait for the WebProcess to allow the load to continue
+ and hence NetworkResourceLoader::didReceiveResponse() returns ShouldContinueDidReceiveResponse::Yes.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+
2016-11-12 Simon Fraser <[email protected]>
[iOS WK2] Share some code with Mac for post-async-scroll state reconciliation
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (208664 => 208665)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-11-13 05:38:58 UTC (rev 208664)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-11-13 05:50:32 UTC (rev 208665)
@@ -350,11 +350,11 @@
#endif
if (shouldContinueDidReceiveResponse) {
- RELEASE_LOG_IF_ALLOWED("didReceiveResponse: Should wait for message from WebContent process before continuing resource load (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
+ RELEASE_LOG_IF_ALLOWED("didReceiveResponse: Should not wait for message from WebContent process before continuing resource load (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
return ShouldContinueDidReceiveResponse::Yes;
}
- RELEASE_LOG_IF_ALLOWED("didReceiveResponse: Should not wait for message from WebContent process before continuing resource load (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
+ RELEASE_LOG_IF_ALLOWED("didReceiveResponse: Should wait for message from WebContent process before continuing resource load (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
return ShouldContinueDidReceiveResponse::No;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
