From 323ba0d8ee9f6144da45e621c8dd119e43f1dded Mon Sep 17 00:00:00 2001 From: "aestes@apple.com" Date: Mon, 4 Jun 2018 04:02:20 +0000 Subject: [PATCH] [Wi-Fi Assertions] Resume assertions when NetworkProcess::cancelPrepareToSuspend is called https://bugs.webkit.org/show_bug.cgi?id=186247 Reviewed by Tim Horton. Since we suspended assertions in prepareToSuspend, we need to resume them if cancelPrepareToSuspend is called. * NetworkProcess/NetworkProcess.cpp: (WebKit::NetworkProcess::cancelPrepareToSuspend): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232460 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/ChangeLog | 13 +++++++++++++ Source/WebKit/NetworkProcess/NetworkProcess.cpp | 1 + 2 files changed, 14 insertions(+) diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog index 1edaa62..b0c7839 100644 --- a/Source/WebKit/ChangeLog +++ b/Source/WebKit/ChangeLog @@ -1,5 +1,18 @@ 2018-06-03 Andy Estes + [Wi-Fi Assertions] Resume assertions when NetworkProcess::cancelPrepareToSuspend is called + https://bugs.webkit.org/show_bug.cgi?id=186247 + + Reviewed by Tim Horton. + + Since we suspended assertions in prepareToSuspend, we need to resume them if + cancelPrepareToSuspend is called. + + * NetworkProcess/NetworkProcess.cpp: + (WebKit::NetworkProcess::cancelPrepareToSuspend): + +2018-06-03 Andy Estes + [iOS] Add a needed networking process entitlement https://bugs.webkit.org/show_bug.cgi?id=186246 diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp index db13dbc..91d30b6 100644 --- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp @@ -832,6 +832,7 @@ void NetworkProcess::cancelPrepareToSuspend() // message. And NetworkProcessProxy expects to receive either a NetworkProcessProxy::ProcessReadyToSuspend- // or NetworkProcessProxy::DidCancelProcessSuspension- message, but not both. RELEASE_LOG(ProcessSuspension, "%p - NetworkProcess::cancelPrepareToSuspend()", this); + platformProcessDidResume(); for (auto& connection : m_webProcessConnections) connection->endSuspension(); } -- 1.8.3.1