From a17c409b8d60d4d080b63853e8c602241917b742 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Sun, 13 Nov 2016 05:50:32 +0000 Subject: [PATCH] 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 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: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@208665 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 20 ++++++++++++++++++++ .../WebKit2/NetworkProcess/NetworkResourceLoader.cpp | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 27901a2..5afc256 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,23 @@ +2016-11-12 Daniel Bates + + 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 [iOS WK2] Share some code with Mac for post-async-scroll state reconciliation diff --git a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp index a632c26..d2d4700 100644 --- a/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp +++ b/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp @@ -350,11 +350,11 @@ auto NetworkResourceLoader::didReceiveResponse(ResourceResponse&& receivedRespon #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; } -- 1.8.3.1