Changeset 295445 in webkit

Timestamp:

Jun 9, 2022 9:58:46 PM (2 years ago)

Author:

pvollan@apple.com

Message:

Revert r295422
​https://bugs.webkit.org/show_bug.cgi?id=241502

Unreviewed, revert r295422.

• Source/WebKit/NetworkProcess/cocoa/LaunchServicesDatabaseObserver.mm:

(WebKit::LaunchServicesDatabaseObserver::LaunchServicesDatabaseObserver):
(WebKit::LaunchServicesDatabaseObserver::startObserving):
(WebKit::LaunchServicesDatabaseObserver::~LaunchServicesDatabaseObserver):
(WebKit::hasSystemContentDatabase): Deleted.

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

File:

• trunk/Source/WebKit/NetworkProcess/cocoa/LaunchServicesDatabaseObserver.mm (modified) (3 diffs)

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

@@ -35 +35 @@
 namespace WebKit {
 
-#if HAVE(LSDATABASECONTEXT)
-static bool hasSystemContentDatabase()
-{
-    return [LSDatabaseContext.sharedDatabaseContext respondsToSelector:@selector(getSystemContentDatabaseObject4WebKit:)];
-}
-#endif
-
 LaunchServicesDatabaseObserver::LaunchServicesDatabaseObserver(NetworkProcess&)
 {
 #if HAVE(LSDATABASECONTEXT)
-    if (hasSystemContentDatabase())
-        return;
-
     m_observer = [LSDatabaseContext.sharedDatabaseContext addDatabaseChangeObserver4WebKit:^(xpc_object_t change) {
         auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
@@ -75 +65 @@
 
 #if HAVE(LSDATABASECONTEXT)
-    if (hasSystemContentDatabase()) {
-        [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()];
-        return;
-    }
-
     RetainPtr<id> observer = [LSDatabaseContext.sharedDatabaseContext addDatabaseChangeObserver4WebKit:^(xpc_object_t change) {
         auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
@@ -108 +84 @@
 {
 #if HAVE(LSDATABASECONTEXT)
-    if (hasSystemContentDatabase())
-        return;
     [LSDatabaseContext.sharedDatabaseContext removeDatabaseChangeObserver4WebKit:m_observer.get()];
 #endif