Title: [232077] trunk/Source/WebKit
- Revision
- 232077
- Author
- aes...@apple.com
- Date
- 2018-05-22 13:48:43 -0700 (Tue, 22 May 2018)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (232076 => 232077)
--- trunk/Source/WebKit/ChangeLog 2018-05-22 19:55:03 UTC (rev 232076)
+++ trunk/Source/WebKit/ChangeLog 2018-05-22 20:48:43 UTC (rev 232077)
@@ -1,3 +1,19 @@
+2018-05-22 Andy Estes <aes...@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 <bfulg...@apple.com>
REGRESSION(r229093): Re-enable Network Extension support in the WebContent process (Take 2)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (232076 => 232077)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-05-22 19:55:03 UTC (rev 232076)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-05-22 20:48:43 UTC (rev 232077)
@@ -803,6 +803,7 @@
void NetworkProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend shouldAcknowledgeWhenReadyToSuspend)
{
+ platformPrepareToSuspend();
lowMemoryHandler(Critical::Yes);
RefPtr<TaskCounter> delayedTaskCounter;
@@ -844,6 +845,7 @@
void NetworkProcess::processDidResume()
{
RELEASE_LOG(ProcessSuspension, "%p - NetworkProcess::processDidResume()", this);
+ platformProcessDidResume();
for (auto& connection : m_webProcessConnections)
connection->endSuspension();
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (232076 => 232077)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-05-22 19:55:03 UTC (rev 232076)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-05-22 20:48:43 UTC (rev 232077)
@@ -177,6 +177,8 @@
enum class ShouldAcknowledgeWhenReadyToSuspend { No, Yes };
void actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend);
+ void platformPrepareToSuspend();
+ void platformProcessDidResume();
// ChildProcess
void initializeProcess(const ChildProcessInitializationParameters&) override;
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (232076 => 232077)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2018-05-22 19:55:03 UTC (rev 232076)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2018-05-22 20:48:43 UTC (rev 232077)
@@ -254,4 +254,18 @@
#pragma clang diagnostic pop
}
+void NetworkProcess::platformPrepareToSuspend()
+{
+#if ENABLE(WIFI_ASSERTIONS)
+ suspendWiFiAssertions();
+#endif
}
+
+void NetworkProcess::platformProcessDidResume()
+{
+#if ENABLE(WIFI_ASSERTIONS)
+ resumeWiFiAssertions();
+#endif
+}
+
+}
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp (232076 => 232077)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp 2018-05-22 19:55:03 UTC (rev 232076)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp 2018-05-22 20:48:43 UTC (rev 232077)
@@ -74,4 +74,14 @@
notImplemented();
}
+void NetworkProcess::platformPrepareToSuspend()
+{
+ notImplemented();
+}
+
+void NetworkProcess::platformProcessDidResume()
+{
+ notImplemented();
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp (232076 => 232077)
--- trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2018-05-22 19:55:03 UTC (rev 232076)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2018-05-22 20:48:43 UTC (rev 232077)
@@ -176,4 +176,15 @@
});
}
+void NetworkProcess::platformPrepareToSuspend()
+{
+ notImplemented();
+}
+
+void NetworkProcess::platformProcessDidResume()
+{
+ notImplemented();
+}
+
+
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
