Changeset 242662 in webkit

Timestamp:

Mar 8, 2019, 3:58:52 PM (7 years ago)

Author:

beidson@apple.com

Message:

Have the UIProcess take the UnboundedNetworking assertion when downloads are in progress.
​https://bugs.webkit.org/show_bug.cgi?id=195468

Reviewed by Andy Estes.

• UIProcess/Downloads/DownloadProxyMap.cpp:

(WebKit::DownloadProxyMap::DownloadProxyMap):
(WebKit::DownloadProxyMap::createDownloadProxy): If this is the first download, and the process has the entitlement,

take the assertion.

(WebKit::DownloadProxyMap::downloadFinished):
(WebKit::DownloadProxyMap::processDidClose):

• UIProcess/Downloads/DownloadProxyMap.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Downloads/DownloadProxyMap.cpp (modified) (5 diffs)
• UIProcess/Downloads/DownloadProxyMap.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-08  Brady Eidson  <beidson@apple.com>
+
+        Have the UIProcess take the UnboundedNetworking assertion when downloads are in progress.
+        https://bugs.webkit.org/show_bug.cgi?id=195468
+
+        Reviewed by Andy Estes.
+
+        * UIProcess/Downloads/DownloadProxyMap.cpp:
+        (WebKit::DownloadProxyMap::DownloadProxyMap):
+        (WebKit::DownloadProxyMap::createDownloadProxy): If this is the first download, and the process has the entitlement,
+          take the assertion.
+        (WebKit::DownloadProxyMap::downloadFinished):
+        (WebKit::DownloadProxyMap::processDidClose):
+        * UIProcess/Downloads/DownloadProxyMap.h:
+
 2019-03-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp

@@ -31 +31 @@
 #include "DownloadProxyMessages.h"
 #include "MessageReceiverMap.h"
+#include "ProcessAssertion.h"
 #include <wtf/StdLibExtras.h>
+
+#if PLATFORM(COCOA)
+#include <wtf/cocoa/Entitlements.h>
+#endif
 
 namespace WebKit {
@@ -37 +42 @@
 DownloadProxyMap::DownloadProxyMap(NetworkProcessProxy& process)
     : m_process(&process)
+#if PLATFORM(COCOA)
+    , m_shouldTakeAssertion(WTF::processHasEntitlement("com.apple.multitasking.systemappassertions"))
+#endif
 {
 }
@@ -49 +57 @@
     auto downloadProxy = DownloadProxy::create(*this, processPool, resourceRequest);
     m_downloads.set(downloadProxy->downloadID(), downloadProxy.copyRef());
+
+    if (m_downloads.size() == 1 && m_shouldTakeAssertion) {
+        ASSERT(!m_downloadAssertion);
+        m_downloadAssertion = std::make_unique<ProcessAssertion>(getCurrentProcessID(), "WebKit downloads"_s, AssertionState::UnboundedNetworking);
+    }
 
     m_process->addMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadProxy->downloadID().downloadID(), downloadProxy.get());
@@ -64 +77 @@
     downloadProxy->invalidate();
     m_downloads.remove(downloadID);
+
+    if (m_downloads.isEmpty() && m_shouldTakeAssertion) {
+        ASSERT(m_downloadAssertion);
+        m_downloadAssertion = nullptr;
+    }
 }
 
@@ -76 +94 @@
 
     m_downloads.clear();
+    m_downloadAssertion = nullptr;
     m_process = nullptr;
 }

trunk/Source/WebKit/UIProcess/Downloads/DownloadProxyMap.h

@@ -38 +38 @@
 class DownloadProxy;
 class NetworkProcessProxy;
+class ProcessAssertion;
 class WebProcessPool;
 
@@ -58 +59 @@
     NetworkProcessProxy* m_process;
     HashMap<DownloadID, RefPtr<DownloadProxy>> m_downloads;
+
+    bool m_shouldTakeAssertion { false };
+    std::unique_ptr<ProcessAssertion> m_downloadAssertion;
 };