[webkit-changes] [234651] trunk/Source/WebKit

Tue, 07 Aug 2018 09:09:03 -0700

Title: [234651] trunk/Source/WebKit
Revision
234651
Author
[email protected]
Date
2018-08-07 09:08:48 -0700 (Tue, 07 Aug 2018)

Log Message

[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 Tim Horton.

* 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (234650 => 234651)


--- trunk/Source/WebKit/ChangeLog	2018-08-07 14:36:34 UTC (rev 234650)
+++ trunk/Source/WebKit/ChangeLog	2018-08-07 16:08:48 UTC (rev 234651)
@@ -1,3 +1,22 @@
+2018-08-06  Andy Estes  <[email protected]>
+
+        [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 Tim Horton.
+
+        * 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-06  Alex Christensen  <[email protected]>
 
         Check with SafeBrowsing during navigation in WKWebView

Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (234650 => 234651)


--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp	2018-08-07 14:36:34 UTC (rev 234650)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp	2018-08-07 16:08:48 UTC (rev 234651)
@@ -844,7 +844,6 @@
 
 void NetworkProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend shouldAcknowledgeWhenReadyToSuspend)
 {
-    platformPrepareToSuspend();
     lowMemoryHandler(Critical::Yes);
 
     RefPtr<TaskCounter> delayedTaskCounter;
@@ -856,6 +855,7 @@
         }));
     }
 
+    platformPrepareToSuspend([delayedTaskCounter] { });
     platformSyncAllCookies([delayedTaskCounter] { });
 
     for (auto& connection : m_webProcessConnections)

Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (234650 => 234651)


--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h	2018-08-07 14:36:34 UTC (rev 234650)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h	2018-08-07 16:08:48 UTC (rev 234651)
@@ -180,7 +180,7 @@
 
     enum class ShouldAcknowledgeWhenReadyToSuspend { No, Yes };
     void actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend);
-    void platformPrepareToSuspend();
+    void platformPrepareToSuspend(CompletionHandler<void()>&&);
     void platformProcessDidResume();
 
     // ChildProcess

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (234650 => 234651)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2018-08-07 14:36:34 UTC (rev 234650)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2018-08-07 16:08:48 UTC (rev 234651)
@@ -243,10 +243,12 @@
 #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::platformProcessDidTransitionToBackground()
 {
 #if ENABLE(WIFI_ASSERTIONS)
-    suspendWiFiAssertions(SuspensionReason::ProcessBackgrounding);
+    suspendWiFiAssertions(SuspensionReason::ProcessBackgrounding, [] { });
 #endif
 }
-    
+
 void NetworkProcess::platformProcessDidTransitionToForeground()
 {
 #if ENABLE(WIFI_ASSERTIONS)

Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp (234650 => 234651)


--- trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp	2018-08-07 14:36:34 UTC (rev 234650)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp	2018-08-07 16:08:48 UTC (rev 234651)
@@ -69,9 +69,10 @@
     notImplemented();
 }
 
-void NetworkProcess::platformPrepareToSuspend()
+void NetworkProcess::platformPrepareToSuspend(CompletionHandler<void()>&& completionHandler)
 {
     notImplemented();
+    completionHandler();
 }
 
 void NetworkProcess::platformProcessDidResume()

Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp (234650 => 234651)


--- trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp	2018-08-07 14:36:34 UTC (rev 234650)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp	2018-08-07 16:08:48 UTC (rev 234651)
@@ -172,9 +172,10 @@
     });
 }
 
-void NetworkProcess::platformPrepareToSuspend()
+void NetworkProcess::platformPrepareToSuspend(CompletionHandler<void()>&& completionHandler)
 {
     notImplemented();
+    completionHandler();
 }
 
 void NetworkProcess::platformProcessDidResume()

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to