Attachment 346684 Details for Bug 188373 – Patch

[patch] Patch

bug-188373-20180806213830.patch (text/plain), 5.34 KB, created by Andy Estes on 2018-08-06 21:38:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Estes

Created: 2018-08-06 21:38:31 PDT

Size: 5.34 KB

patch

obsolete

>Subversion Revision: 234581
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f459f8dbc592f665bea3faa5bc64b65cfeedfb45..0eeff25a055f34b725323698ded62b5a4b2d00a7 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-08-06  Andy Estes  <aestes@apple.com>
>+
>+        [Wi-Fi Assertions] suspendWiFiAssertions() should be able to delay sending ProcessReadyToSuspend
>+        https://bugs.webkit.org/show_bug.cgi?id=188373
>+        <rdar://problem/42857398>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::actualPrepareToSuspend):
>+        * NetworkProcess/NetworkProcess.h:
>+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
>+        (WebKit::NetworkProcess::platformPrepareToSuspend):
>+        (WebKit::NetworkProcess::platformProcessDidTransitionToBackground):
>+        * NetworkProcess/curl/NetworkProcessCurl.cpp:
>+        (WebKit::NetworkProcess::platformPrepareToSuspend):
>+        * NetworkProcess/soup/NetworkProcessSoup.cpp:
>+        (WebKit::NetworkProcess::platformPrepareToSuspend):
>+
> 2018-08-03  Ben Richards  <benton_richards@apple.com>
> 
>         We should cache the compiled sandbox profile in a data vault
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 14b4ef5675901a03857a030267d64dd69b65c429..7de800e718a61dc27f47774916b558a977c5705f 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -844,7 +844,6 @@ private:
> 
> void NetworkProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend shouldAcknowledgeWhenReadyToSuspend)
> {
>-    platformPrepareToSuspend();
>     lowMemoryHandler(Critical::Yes);
> 
>     RefPtr<TaskCounter> delayedTaskCounter;
>@@ -856,6 +855,7 @@ void NetworkProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend
>         }));
>     }
> 
>+    platformPrepareToSuspend([delayedTaskCounter] { });
>     platformSyncAllCookies([delayedTaskCounter] { });
> 
>     for (auto& connection : m_webProcessConnections)
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
>index cc9ef7b0a4110c0259e5a2201401ff27b1b6a322..ad27839c36f028e62d259f45bd13668ed6c1de58 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
>@@ -181,7 +181,7 @@ private:
> 
>     enum class ShouldAcknowledgeWhenReadyToSuspend { No, Yes };
>     void actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend);
>-    void platformPrepareToSuspend();
>+    void platformPrepareToSuspend(CompletionHandler<void()>&&);
>     void platformProcessDidResume();
> 
>     // ChildProcess
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>index b693ba2d737fda1207879a1a1957d0da487d086e..84e7d7de2797ae1056eb0aeeb0d1d93494c0dcc1 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>@@ -243,10 +243,12 @@ void NetworkProcess::platformSyncAllCookies(CompletionHandler<void()>&& completi
> #pragma clang diagnostic pop
> }
> 
>-void NetworkProcess::platformPrepareToSuspend()
>+void NetworkProcess::platformPrepareToSuspend(CompletionHandler<void()>&& completionHandler)
> {
> #if ENABLE(WIFI_ASSERTIONS)
>-    suspendWiFiAssertions(SuspensionReason::ProcessSuspending);
>+    suspendWiFiAssertions(SuspensionReason::ProcessSuspending, WTFMove(completionHandler));
>+#else
>+    completionHandler();
> #endif
> }
> 
>@@ -260,10 +262,10 @@ void NetworkProcess::platformProcessDidResume()
> void NetworkProcess::platformProcessDidTransitionToBackground()
> {
> #if ENABLE(WIFI_ASSERTIONS)
>-    suspendWiFiAssertions(SuspensionReason::ProcessBackgrounding);
>+    suspendWiFiAssertions(SuspensionReason::ProcessBackgrounding, [] { });
> #endif
> }
>-    
>+
> void NetworkProcess::platformProcessDidTransitionToForeground()
> {
> #if ENABLE(WIFI_ASSERTIONS)
>diff --git a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>index 3960a2b0bc40eafe96cbc1f0e3dbf03c5a4d4820..b046a9b0ae173054b6f178a9ab70d56b2e427045 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>@@ -69,9 +69,10 @@ void NetworkProcess::platformTerminate()
>     notImplemented();
> }
> 
>-void NetworkProcess::platformPrepareToSuspend()
>+void NetworkProcess::platformPrepareToSuspend(CompletionHandler<void()>&& completionHandler)
> {
>     notImplemented();
>+    completionHandler();
> }
> 
> void NetworkProcess::platformProcessDidResume()
>diff --git a/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp
>index e39b3d84b65b22a36b0d95bc51db9fcc71defa4f..a4e98564b77ac6812f7d8abccd0e8c2e6959fce5 100644
>--- a/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp
>+++ b/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp
>@@ -172,9 +172,10 @@ void NetworkProcess::setNetworkProxySettings(const SoupNetworkProxySettings& set
>     });
> }
> 
>-void NetworkProcess::platformPrepareToSuspend()
>+void NetworkProcess::platformPrepareToSuspend(CompletionHandler<void()>&& completionHandler)
> {
>     notImplemented();
>+    completionHandler();
> }
> 
> void NetworkProcess::platformProcessDidResume()

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188373: 346684