Diff
Modified: trunk/Source/WebKit/ChangeLog (293743 => 293744)
--- trunk/Source/WebKit/ChangeLog 2022-05-03 22:23:23 UTC (rev 293743)
+++ trunk/Source/WebKit/ChangeLog 2022-05-03 22:55:26 UTC (rev 293744)
@@ -1,3 +1,16 @@
+2022-05-03 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
Add logging related to Launch Services database
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/LaunchServicesDatabaseObserver.mm (293743 => 293744)
--- trunk/Source/WebKit/NetworkProcess/cocoa/LaunchServicesDatabaseObserver.mm 2022-05-03 22:23:23 UTC (rev 293743)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/LaunchServicesDatabaseObserver.mm 2022-05-03 22:55:26 UTC (rev 293744)
@@ -33,10 +33,25 @@
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);
xpc_dictionary_set_value(message.get(), LaunchServicesDatabaseXPCConstants::xpcLaunchServicesDatabaseKey, change);
@@ -63,15 +78,22 @@
}
#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);
xpc_dictionary_set_value(message.get(), LaunchServicesDatabaseXPCConstants::xpcLaunchServicesDatabaseKey, change);
xpc_connection_send_message(connection.get(), message.get());
}];
- [LSDatabaseContext.sharedDatabaseContext removeDatabaseChangeObserver4WebKit:observer.get()];
+ [databaseContext() removeDatabaseChangeObserver4WebKit:observer.get()];
#else
auto message = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
xpc_dictionary_set_string(message.get(), XPCEndpoint::xpcMessageNameKey, LaunchServicesDatabaseXPCConstants::xpcUpdateLaunchServicesDatabaseMessageName);
@@ -82,7 +104,10 @@
LaunchServicesDatabaseObserver::~LaunchServicesDatabaseObserver()
{
#if HAVE(LSDATABASECONTEXT)
- [LSDatabaseContext.sharedDatabaseContext removeDatabaseChangeObserver4WebKit:m_observer.get()];
+ if (![databaseContext() respondsToSelector:@selector(removeDatabaseChangeObserver4WebKit:)])
+ return;
+
+ [databaseContext() removeDatabaseChangeObserver4WebKit:m_observer.get()];
#endif
}
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (293743 => 293744)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2022-05-03 22:23:23 UTC (rev 293743)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2022-05-03 22:55:26 UTC (rev 293744)
@@ -241,8 +241,6 @@
, m_throttler(*this, WebProcessPool::anyProcessPoolNeedsUIBackgroundAssertion())
, m_cookieManager(makeUniqueRef<WebCookieManagerProxy>(*this))
{
- RELEASE_LOG(Process, "%p - NetworkProcessProxy::NetworkProcessProxy", this);
-
connect();
sendCreationParametersToNewProcess();
updateProcessAssertion();
@@ -551,8 +549,6 @@
void NetworkProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
{
- RELEASE_LOG(Process, "%p - NetworkProcessProxy::didFinishLaunching", this);
-
AuxiliaryProcessProxy::didFinishLaunching(launcher, connectionIdentifier);
if (!IPC::Connection::identifierIsValid(connectionIdentifier)) {
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm (293743 => 293744)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm 2022-05-03 22:23:23 UTC (rev 293743)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm 2022-05-03 22:55:26 UTC (rev 293744)
@@ -80,8 +80,6 @@
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;
auto* connection = process.connection();
Modified: trunk/Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm (293743 => 293744)
--- trunk/Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm 2022-05-03 22:23:23 UTC (rev 293743)
+++ trunk/Source/WebKit/WebProcess/cocoa/LaunchServicesDatabaseManager.mm 2022-05-03 22:55:26 UTC (rev 293744)
@@ -49,10 +49,12 @@
#if HAVE(LSDATABASECONTEXT)
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();
m_hasReceivedLaunchServicesDatabase = true;
