Changeset 293744 in webkit

Timestamp:

May 3, 2022, 3:55:26 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r293743.
​https://bugs.webkit.org/show_bug.cgi?id=240042

Introduced debug assert

Reverted changeset:

"Add logging related to Launch Services database"
​https://bugs.webkit.org/show_bug.cgi?id=240032
​https://commits.webkit.org/r293743

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cocoa/LaunchServicesDatabaseObserver.mm (modified) (4 diffs)
• UIProcess/Network/NetworkProcessProxy.cpp (modified) (2 diffs)
• UIProcess/Network/NetworkProcessProxyCocoa.mm (modified) (1 diff)
• WebProcess/cocoa/LaunchServicesDatabaseManager.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-05-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r293743.
+        https://bugs.webkit.org/show_bug.cgi?id=240042
+
+        Introduced debug assert
+
+        Reverted changeset:
+
+        "Add logging related to Launch Services database"
+        https://bugs.webkit.org/show_bug.cgi?id=240032
+        https://commits.webkit.org/r293743
+
 2022-05-03  Per Arne Vollan  <pvollan@apple.com>
 

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

@@ -34 +34 @@
 namespace WebKit {
 
+#if HAVE(LSDATABASECONTEXT)
+static LSDatabaseContext *databaseContext()
+{
+    static dispatch_once_t once;
+    static LSDatabaseContext *context = nullptr;
+    dispatch_once(&once, ^{
+        context = [NSClassFromString(@"LSDatabaseContext") sharedDatabaseContext];
+    });
+    return context;
+}
+#endif
+
 LaunchServicesDatabaseObserver::LaunchServicesDatabaseObserver(NetworkProcess&)
 {
 #if HAVE(LSDATABASECONTEXT)
-    m_observer = [LSDatabaseContext.sharedDatabaseContext addDatabaseChangeObserver4WebKit:^(xpc_object_t change) {
+    if (![databaseContext() respondsToSelector:@selector(addDatabaseChangeObserver4WebKit:)])
+        return;
+
+    m_observer = [databaseContext() addDatabaseChangeObserver4WebKit:^(xpc_object_t change) {
         auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
         xpc_dictionary_set_string(message.get(), XPCEndpoint::xpcMessageNameKey, LaunchServicesDatabaseXPCConstants::xpcUpdateLaunchServicesDatabaseMessageName);
@@ -64 +79 @@
 
 #if HAVE(LSDATABASECONTEXT)
-    RetainPtr<id> observer = [LSDatabaseContext.sharedDatabaseContext addDatabaseChangeObserver4WebKit:^(xpc_object_t change) {
+    if (![databaseContext() respondsToSelector:@selector(addDatabaseChangeObserver4WebKit:)]) {
+        auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
+        xpc_dictionary_set_string(message.get(), XPCEndpoint::xpcMessageNameKey, LaunchServicesDatabaseXPCConstants::xpcUpdateLaunchServicesDatabaseMessageName);
+        xpc_connection_send_message(connection.get(), message.get());
+        return;
+    }
+
+    RetainPtr<id> observer = [databaseContext() addDatabaseChangeObserver4WebKit:^(xpc_object_t change) {
         auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
         xpc_dictionary_set_string(message.get(), XPCEndpoint::xpcMessageNameKey, LaunchServicesDatabaseXPCConstants::xpcUpdateLaunchServicesDatabaseMessageName);
@@ -72 +94 @@
     }];
 
-    [LSDatabaseContext.sharedDatabaseContext removeDatabaseChangeObserver4WebKit:observer.get()];
+    [databaseContext() removeDatabaseChangeObserver4WebKit:observer.get()];
 #else
     auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
@@ -83 +105 @@
 {
 #if HAVE(LSDATABASECONTEXT)
-    [LSDatabaseContext.sharedDatabaseContext removeDatabaseChangeObserver4WebKit:m_observer.get()];
+    if (![databaseContext() respondsToSelector:@selector(removeDatabaseChangeObserver4WebKit:)])
+        return;
+
+    [databaseContext() removeDatabaseChangeObserver4WebKit:m_observer.get()];
 #endif
 }

trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

@@ -242 +242 @@
     , m_cookieManager(makeUniqueRef<WebCookieManagerProxy>(*this))
 {
-    RELEASE_LOG(Process, "%p - NetworkProcessProxy::NetworkProcessProxy", this);
-
     connect();
     sendCreationParametersToNewProcess();
@@ -552 +550 @@
 void NetworkProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
 {
-    RELEASE_LOG(Process, "%p - NetworkProcessProxy::didFinishLaunching", this);
-
     AuxiliaryProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
 

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

@@ -81 +81 @@
 bool NetworkProcessProxy::sendXPCEndpointToProcess(AuxiliaryProcessProxy& process)
 {
-    RELEASE_LOG(Process, "%p - NetworkProcessProxy::sendXPCEndpointToProcess(%p) state = %d connection = %p XPC endpoint message = %p", this, &process, process.state(), process.connection(), xpcEndpointMessage());
-
     if (process.state() != AuxiliaryProcessProxy::State::Running)
         return false;

trunk/Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm

@@ -50 +50 @@
         auto database = xpc_dictionary_get_value(message, LaunchServicesDatabaseXPCConstants::xpcLaunchServicesDatabaseKey);
 
-        RELEASE_LOG(Loading, "Received Launch Services database %p", database);
-
-        if (database)
-            [LSDatabaseContext.sharedDatabaseContext observeDatabaseChange4WebKit:database];
+        if (database) {
+            auto context = [NSClassFromString(@"LSDatabaseContext") sharedDatabaseContext];
+            if (![context respondsToSelector:@selector(observeDatabaseChange4WebKit:)])
+                return;
+            [context observeDatabaseChange4WebKit:database];
+        }
 #endif
         m_semaphore.signal();