Changeset 283374 in webkit

Timestamp:

Oct 1, 2021, 9:48:07 AM (5 years ago)

Author:

pvollan@apple.com

Message:

Send Launch Services database to GPU process
​https://bugs.webkit.org/show_bug.cgi?id=225151
<rdar://74749122>

Reviewed by Brent Fulgham.

Send Launch Services database to the GPU process after it has finished launching, like we do for WebContent processes.
The Launch Services database is represented as an XPC object, and needs to be sent over a dedicated XPC channel.

• GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in:
• UIProcess/GPU/GPUProcessProxy.cpp:

(WebKit::GPUProcessProxy::didFinishLaunching):
(WebKit::GPUProcessProxy::addSession):

• UIProcess/Network/NetworkProcessProxyCocoa.mm:

(WebKit::NetworkProcessProxy::XPCEventHandler::handleXPCEvent const):

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::setWebsiteDataStore):
(WebKit::WebProcessProxy::didFinishLaunching):

• UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:

(WebKit::WebsiteDataStore::sendNetworkProcessXPCEndpointToProcess const):
(WebKit::WebsiteDataStore::sendNetworkProcessXPCEndpointToAllProcesses):
(WebKit::WebsiteDataStore::sendNetworkProcessXPCEndpointToWebProcess): Deleted.
(WebKit::WebsiteDataStore::sendNetworkProcessXPCEndpointToAllWebProcesses): Deleted.

• UIProcess/WebsiteData/WebsiteDataStore.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in (modified) (1 diff)
• UIProcess/GPU/GPUProcessProxy.cpp (modified) (1 diff)
• UIProcess/Network/NetworkProcessProxyCocoa.mm (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (2 diffs)
• UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (modified) (3 diffs)
• UIProcess/WebsiteData/WebsiteDataStore.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-01  Per Arne Vollan  <pvollan@apple.com>
+
+        Send Launch Services database to GPU process
+        https://bugs.webkit.org/show_bug.cgi?id=225151
+        <rdar://74749122>
+
+        Reviewed by Brent Fulgham.
+
+        Send Launch Services database to the GPU process after it has finished launching, like we do for WebContent processes.
+        The Launch Services database is represented as an XPC object, and needs to be sent over a dedicated XPC channel.
+
+        * GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in:
+        * UIProcess/GPU/GPUProcessProxy.cpp:
+        (WebKit::GPUProcessProxy::didFinishLaunching):
+        (WebKit::GPUProcessProxy::addSession):
+        * UIProcess/Network/NetworkProcessProxyCocoa.mm:
+        (WebKit::NetworkProcessProxy::XPCEventHandler::handleXPCEvent const):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::setWebsiteDataStore):
+        (WebKit::WebProcessProxy::didFinishLaunching):
+        * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
+        (WebKit::WebsiteDataStore::sendNetworkProcessXPCEndpointToProcess const):
+        (WebKit::WebsiteDataStore::sendNetworkProcessXPCEndpointToAllProcesses):
+        (WebKit::WebsiteDataStore::sendNetworkProcessXPCEndpointToWebProcess): Deleted.
+        (WebKit::WebsiteDataStore::sendNetworkProcessXPCEndpointToAllWebProcesses): Deleted.
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+
 2021-10-01  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in

@@ -696 +696 @@
        (global-name "com.apple.windowserver.active")
 #endif
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 120000
        (global-name "com.apple.lsd.mapdb")
+#endif
        (global-name "com.apple.fonts")
        (global-name "com.apple.PowerManagement.control")

trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp

@@ -433 +433 @@
         m_throttler.didConnectToProcess(xpc_connection_get_pid(connection));
 #endif
+
+#if PLATFORM(COCOA)
+    auto it = m_sessionIDs.begin();
+    if (it != m_sessionIDs.end()) {
+        auto webSiteDataStore = WebsiteDataStore::existingDataStoreForSessionID(*m_sessionIDs.begin());
+        webSiteDataStore->sendNetworkProcessXPCEndpointToProcess(*this);
+    }
+#endif
 }
 

trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm

@@ -55 +55 @@
         m_networkProcess->m_endpointMessage = event;
         for (auto& dataStore : copyToVectorOf<Ref<WebsiteDataStore>>(m_networkProcess->m_websiteDataStores))
-            dataStore->sendNetworkProcessXPCEndpointToAllWebProcesses();
+            dataStore->sendNetworkProcessXPCEndpointToAllProcesses();
     }
 

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -339 +339 @@
     m_websiteDataStore = &dataStore;
 #if PLATFORM(COCOA)
-    dataStore.sendNetworkProcessXPCEndpointToWebProcess(*this);
+    dataStore.sendNetworkProcessXPCEndpointToProcess(*this);
+#if ENABLE(GPU_PROCESS)
+    if (GPUProcessProxy::singletonIfCreated())
+        dataStore.sendNetworkProcessXPCEndpointToProcess(*GPUProcessProxy::singletonIfCreated());
+#endif
 #endif
     updateRegistrationWithDataStore();
@@ -1068 +1072 @@
 #if PLATFORM(COCOA)
     if (m_websiteDataStore)
-        m_websiteDataStore->sendNetworkProcessXPCEndpointToWebProcess(*this);
+        m_websiteDataStore->sendNetworkProcessXPCEndpointToProcess(*this);
 #endif
 

trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

@@ -50 +50 @@
 #import <wtf/text/cf/StringConcatenateCF.h>
 
+#if ENABLE(GPU_PROCESS)
+#import "GPUProcessProxy.h"
+#endif
+
 #if PLATFORM(IOS_FAMILY)
 #import <UIKit/UIApplication.h>
@@ -595 +599 @@
 }
 
-void WebsiteDataStore::sendNetworkProcessXPCEndpointToWebProcess(WebProcessProxy& process)
+void WebsiteDataStore::sendNetworkProcessXPCEndpointToProcess(AuxiliaryProcessProxy& process) const
 {
     if (process.state() != AuxiliaryProcessProxy::State::Running)
@@ -608 +612 @@
 }
 
-void WebsiteDataStore::sendNetworkProcessXPCEndpointToAllWebProcesses()
+void WebsiteDataStore::sendNetworkProcessXPCEndpointToAllProcesses()
 {
     for (auto& process : m_processes)
-        sendNetworkProcessXPCEndpointToWebProcess(process);
-}
-
-}
+        sendNetworkProcessXPCEndpointToProcess(process);
+#if ENABLE(GPU_PROCESS)
+    if (GPUProcessProxy::singletonIfCreated())
+        sendNetworkProcessXPCEndpointToProcess(*GPUProcessProxy::singletonIfCreated());
+#endif
+}
+
+}

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

@@ -83 +83 @@
 
 class AuthenticatorManager;
+class AuxiliaryProcessProxy;
 class SecKeyProxyStore;
 class DeviceIdHashSaltStorage;
@@ -279 +280 @@
 
 #if PLATFORM(COCOA)
-    void sendNetworkProcessXPCEndpointToWebProcess(WebProcessProxy&);
-    void sendNetworkProcessXPCEndpointToAllWebProcesses();
+    void sendNetworkProcessXPCEndpointToProcess(AuxiliaryProcessProxy&) const;
+    void sendNetworkProcessXPCEndpointToAllProcesses();
     
     static bool useNetworkLoader();