Changeset 295528 in webkit

Timestamp:

Jun 14, 2022 11:02:18 AM (2 years ago)

Author:

pvollan@apple.com

Message:

Adopt SPI to get default content of Launch Services database
​https://bugs.webkit.org/show_bug.cgi?id=241286
<rdar://64528683>

Reviewed by Geoffrey Garen.

Adopt SPI to get system content of Launch Services database. If this SPI is available,
it will replace the SPI we currently use to retrieve the database in the Network process.

• Source/WTF/wtf/PlatformHave.h:
• Source/WebKit/NetworkProcess/cocoa/LaunchServicesDatabaseObserver.mm:

(WebKit::LaunchServicesDatabaseObserver::LaunchServicesDatabaseObserver):
(WebKit::LaunchServicesDatabaseObserver::startObserving):
(WebKit::LaunchServicesDatabaseObserver::~LaunchServicesDatabaseObserver):

Canonical link: ​https://commits.webkit.org/251533@main

Location:

trunk/Source

Files:

• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebKit/NetworkProcess/cocoa/LaunchServicesDatabaseObserver.mm (modified) (3 diffs)

trunk/Source/WTF/wtf/PlatformHave.h

@@ -1230 +1230 @@
 #endif
 
+#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000) \
+    || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000))
+#define HAVE_SYSTEM_CONTENT_LS_DATABASE 1
+#endif
+
 #if !defined(HAVE_VK_IMAGE_TRANSLATION_SUPPORT) \
     && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000) \

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

@@ -37 +37 @@
 LaunchServicesDatabaseObserver::LaunchServicesDatabaseObserver(NetworkProcess&)
 {
-#if HAVE(LSDATABASECONTEXT)
+#if HAVE(LSDATABASECONTEXT) && !HAVE(SYSTEM_CONTENT_LS_DATABASE)
     m_observer = [LSDatabaseContext.sharedDatabaseContext addDatabaseChangeObserver4WebKit:^(xpc_object_t change) {
         auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
@@ -64 +64 @@
     }
 
-#if HAVE(LSDATABASECONTEXT)
+#if HAVE(SYSTEM_CONTENT_LS_DATABASE)
+    [LSDatabaseContext.sharedDatabaseContext getSystemContentDatabaseObject4WebKit:makeBlockPtr([connection = connection] (xpc_object_t _Nullable object, NSError * _Nullable error) {
+        if (!object)
+            return;
+        auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
+        xpc_dictionary_set_string(message.get(), XPCEndpoint::xpcMessageNameKey, LaunchServicesDatabaseXPCConstants::xpcUpdateLaunchServicesDatabaseMessageName);
+        xpc_dictionary_set_value(message.get(), LaunchServicesDatabaseXPCConstants::xpcLaunchServicesDatabaseKey, object);
+
+        xpc_connection_send_message(connection.get(), message.get());
+
+    }).get()];
+#elif HAVE(LSDATABASECONTEXT)
     RetainPtr<id> observer = [LSDatabaseContext.sharedDatabaseContext addDatabaseChangeObserver4WebKit:^(xpc_object_t change) {
         auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
@@ -83 +94 @@
 LaunchServicesDatabaseObserver::~LaunchServicesDatabaseObserver()
 {
-#if HAVE(LSDATABASECONTEXT)
+#if HAVE(LSDATABASECONTEXT) && !HAVE(SYSTEM_CONTENT_LS_DATABASE)
     [LSDatabaseContext.sharedDatabaseContext removeDatabaseChangeObserver4WebKit:m_observer.get()];
 #endif