Changeset 232077 in webkit

Timestamp:

May 22, 2018 1:48:43 PM (6 years ago)

Author:

aestes@apple.com

Message:

[Wi-Fi Assertions] Drop assertions on process suspension
​https://bugs.webkit.org/show_bug.cgi?id=185844
<rdar://problem/40352319>

Reviewed by Daniel Bates.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::actualPrepareToSuspend):
(WebKit::NetworkProcess::processDidResume):

• NetworkProcess/NetworkProcess.h:
• NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformPrepareToSuspend):
(WebKit::NetworkProcess::platformProcessDidResume):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcess.h (modified) (1 diff)
• NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (1 diff)
• NetworkProcess/curl/NetworkProcessCurl.cpp (modified) (1 diff)
• NetworkProcess/soup/NetworkProcessSoup.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-22  Andy Estes  <aestes@apple.com>
+
+        [Wi-Fi Assertions] Drop assertions on process suspension
+        https://bugs.webkit.org/show_bug.cgi?id=185844
+        <rdar://problem/40352319>
+
+        Reviewed by Daniel Bates.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::actualPrepareToSuspend):
+        (WebKit::NetworkProcess::processDidResume):
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::platformPrepareToSuspend):
+        (WebKit::NetworkProcess::platformProcessDidResume):
+
 2018-05-22  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -804 +804 @@
 void NetworkProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend shouldAcknowledgeWhenReadyToSuspend)
 {
+    platformPrepareToSuspend();
     lowMemoryHandler(Critical::Yes);
 
@@ -845 +846 @@
 {
     RELEASE_LOG(ProcessSuspension, "%p - NetworkProcess::processDidResume()", this);
+    platformProcessDidResume();
     for (auto& connection : m_webProcessConnections)
         connection->endSuspension();

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

@@ -178 +178 @@
     enum class ShouldAcknowledgeWhenReadyToSuspend { No, Yes };
     void actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend);
+    void platformPrepareToSuspend();
+    void platformProcessDidResume();
 
     // ChildProcess

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm

@@ -255 +255 @@
 }
 
-}
+void NetworkProcess::platformPrepareToSuspend()
+{
+#if ENABLE(WIFI_ASSERTIONS)
+    suspendWiFiAssertions();
+#endif
+}
+
+void NetworkProcess::platformProcessDidResume()
+{
+#if ENABLE(WIFI_ASSERTIONS)
+    resumeWiFiAssertions();
+#endif
+}
+
+}

trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp

@@ -75 +75 @@
 }
 
+void NetworkProcess::platformPrepareToSuspend()
+{
+    notImplemented();
+}
+
+void NetworkProcess::platformProcessDidResume()
+{
+    notImplemented();
+}
+
 } // namespace WebKit

trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp

@@ -177 +177 @@
 }
 
+void NetworkProcess::platformPrepareToSuspend()
+{
+    notImplemented();
+}
+
+void NetworkProcess::platformProcessDidResume()
+{
+    notImplemented();
+}
+
+
 } // namespace WebKit