[webkit-changes] [234665] branches/safari-606.1.36.2-branch/Source/WebKit

Tue, 07 Aug 2018 12:23:44 -0700

Title: [234665] branches/safari-606.1.36.2-branch/Source/WebKit
Revision
234665
Author
[email protected]
Date
2018-08-07 12:23:30 -0700 (Tue, 07 Aug 2018)

Log Message

Cherry-pick r234651. rdar://problem/43009909

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

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234651 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-606.1.36.2-branch/Source/WebKit/ChangeLog (234664 => 234665)


--- branches/safari-606.1.36.2-branch/Source/WebKit/ChangeLog	2018-08-07 19:09:16 UTC (rev 234664)
+++ branches/safari-606.1.36.2-branch/Source/WebKit/ChangeLog	2018-08-07 19:23:30 UTC (rev 234665)
@@ -1,3 +1,45 @@
+2018-08-07  Kocsen Chung  <[email protected]>
+
+        Cherry-pick r234651. rdar://problem/43009909
+
+    [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):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234651 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-01  Babak Shafiei  <[email protected]>
 
         Cherry-pick r234486. rdar://problem/42844004

Modified: branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp (234664 => 234665)


--- branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp	2018-08-07 19:09:16 UTC (rev 234664)
+++ branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/NetworkProcess.cpp	2018-08-07 19:23:30 UTC (rev 234665)
@@ -830,7 +830,6 @@
 
 void NetworkProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend shouldAcknowledgeWhenReadyToSuspend)
 {
-    platformPrepareToSuspend();
     lowMemoryHandler(Critical::Yes);
 
     RefPtr<TaskCounter> delayedTaskCounter;
@@ -842,6 +841,7 @@
         }));
     }
 
+    platformPrepareToSuspend([delayedTaskCounter] { });
     platformSyncAllCookies([delayedTaskCounter] { });
 
     for (auto& connection : m_webProcessConnections)

Modified: branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/NetworkProcess.h (234664 => 234665)


--- branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/NetworkProcess.h	2018-08-07 19:09:16 UTC (rev 234664)
+++ branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/NetworkProcess.h	2018-08-07 19:23:30 UTC (rev 234665)
@@ -178,7 +178,7 @@
 
     enum class ShouldAcknowledgeWhenReadyToSuspend { No, Yes };
     void actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend);
-    void platformPrepareToSuspend();
+    void platformPrepareToSuspend(CompletionHandler<void()>&&);
     void platformProcessDidResume();
 
     // ChildProcess

Modified: branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (234664 => 234665)


--- branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2018-08-07 19:09:16 UTC (rev 234664)
+++ branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2018-08-07 19:23:30 UTC (rev 234665)
@@ -216,10 +216,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
 }
 
@@ -233,10 +235,10 @@
 void NetworkProcess::platformProcessDidTransitionToBackground()
 {
 #if ENABLE(WIFI_ASSERTIONS)
-    suspendWiFiAssertions(SuspensionReason::ProcessBackgrounding);
+    suspendWiFiAssertions(SuspensionReason::ProcessBackgrounding, [] { });
 #endif
 }
-    
+
 void NetworkProcess::platformProcessDidTransitionToForeground()
 {
 #if ENABLE(WIFI_ASSERTIONS)

Modified: branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp (234664 => 234665)


--- branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp	2018-08-07 19:09:16 UTC (rev 234664)
+++ branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp	2018-08-07 19:23:30 UTC (rev 234665)
@@ -69,9 +69,10 @@
     notImplemented();
 }
 
-void NetworkProcess::platformPrepareToSuspend()
+void NetworkProcess::platformPrepareToSuspend(CompletionHandler<void()>&& completionHandler)
 {
     notImplemented();
+    completionHandler();
 }
 
 void NetworkProcess::platformProcessDidResume()

Modified: branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp (234664 => 234665)


--- branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp	2018-08-07 19:09:16 UTC (rev 234664)
+++ branches/safari-606.1.36.2-branch/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp	2018-08-07 19:23:30 UTC (rev 234665)
@@ -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