Attachment 341005 Details for Bug 185844 – Patch

[patch] Patch

bug-185844-20180522122545.patch (text/plain), 4.42 KB, created by Andy Estes on 2018-05-22 12:25:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Estes

Created: 2018-05-22 12:25:46 PDT

Size: 4.42 KB

patch

obsolete

>Subversion Revision: 232004
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 6dabecafe0a28a2a5bc2f0ecf687f19a7f0226a1..c7baa83d990cb73836c859ff8acc9f04cb55e69a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-05-21  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-18  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r231982.
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 9e294a4fbb688b0b7fe9aa276ff99a9da0ebcb86..7f0b5f8d46d0976b0e357340eb00a6cddcc46e4f 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -803,6 +803,7 @@ private:
> 
> void NetworkProcess::actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend shouldAcknowledgeWhenReadyToSuspend)
> {
>+    platformPrepareToSuspend();
>     lowMemoryHandler(Critical::Yes);
> 
>     RefPtr<TaskCounter> delayedTaskCounter;
>@@ -844,6 +845,7 @@ void NetworkProcess::cancelPrepareToSuspend()
> void NetworkProcess::processDidResume()
> {
>     RELEASE_LOG(ProcessSuspension, "%p - NetworkProcess::processDidResume()", this);
>+    platformProcessDidResume();
>     for (auto& connection : m_webProcessConnections)
>         connection->endSuspension();
> }
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
>index d3a790b9359fda4d4c71daca50710b8325172c7f..24ab20800727cd5ad12c73d4d56abe7cb12ad990 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
>@@ -177,6 +177,8 @@ private:
> 
>     enum class ShouldAcknowledgeWhenReadyToSuspend { No, Yes };
>     void actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend);
>+    void platformPrepareToSuspend();
>+    void platformProcessDidResume();
> 
>     // ChildProcess
>     void initializeProcess(const ChildProcessInitializationParameters&) override;
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>index db9dc38d7a0dc1c6fd7bff3a0a4b82115e7d7ba0..d4de2e6cdd4c67d40dda818aa3de67b224eb1ab2 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>@@ -254,4 +254,18 @@ void NetworkProcess::syncAllCookies()
> #pragma clang diagnostic pop
> }
> 
>+void NetworkProcess::platformPrepareToSuspend()
>+{
>+#if ENABLE(WIFI_ASSERTIONS)
>+    suspendWiFiAssertions();
>+#endif
>+}
>+
>+void NetworkProcess::platformProcessDidResume()
>+{
>+#if ENABLE(WIFI_ASSERTIONS)
>+    resumeWiFiAssertions();
>+#endif
>+}
>+
> }
>diff --git a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>index 80919efda900a94acd7f8dc27ad61035231c5d4d..db6ad7445329d35f027cfebe72790add6b4597d7 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>@@ -74,4 +74,14 @@ void NetworkProcess::platformTerminate()
>     notImplemented();
> }
> 
>+void NetworkProcess::platformPrepareToSuspend()
>+{
>+    notImplemented();
>+}
>+
>+void NetworkProcess::platformProcessDidResume()
>+{
>+    notImplemented();
>+}
>+
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp
>index 0fa8fd25ec2f4bf638cfe84c3f218429abb04023..37c4205c0d5e53d56aacf85155d41257e117cc81 100644
>--- a/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp
>+++ b/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp
>@@ -176,4 +176,15 @@ void NetworkProcess::setNetworkProxySettings(const SoupNetworkProxySettings& set
>     });
> }
> 
>+void NetworkProcess::platformPrepareToSuspend()
>+{
>+    notImplemented();
>+}
>+
>+void NetworkProcess::platformProcessDidResume()
>+{
>+    notImplemented();
>+}
>+
>+
> } // namespace WebKit

Actions: View | Formatted Diff | Diff

Attachments on bug 185844: 340903 | 341005