Diff
Modified: branches/safari-613.1.4-branch/Source/WebKit/ChangeLog (283670 => 283671)
--- branches/safari-613.1.4-branch/Source/WebKit/ChangeLog 2021-10-06 22:08:00 UTC (rev 283670)
+++ branches/safari-613.1.4-branch/Source/WebKit/ChangeLog 2021-10-06 22:12:54 UTC (rev 283671)
@@ -1,3 +1,7 @@
+2021-10-06 Alan Coon <[email protected]>
+
+ Revert r283374. rdar://problem/83847918
+
2021-10-04 Jean-Yves Avenard <[email protected]>
Vorbis decoder can't be instantiated - follow up on Bug 230742
Modified: branches/safari-613.1.4-branch/Source/WebKit/GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in (283670 => 283671)
--- branches/safari-613.1.4-branch/Source/WebKit/GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in 2021-10-06 22:08:00 UTC (rev 283670)
+++ branches/safari-613.1.4-branch/Source/WebKit/GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in 2021-10-06 22:12:54 UTC (rev 283671)
@@ -691,9 +691,7 @@
(allow mach-lookup
(global-name "com.apple.audio.audiohald")
(global-name "com.apple.CARenderServer") ; Needed for [CAContext remoteContextWithOptions]
-#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")
(global-name "com.apple.trustd.agent")
Modified: branches/safari-613.1.4-branch/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp (283670 => 283671)
--- branches/safari-613.1.4-branch/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp 2021-10-06 22:08:00 UTC (rev 283670)
+++ branches/safari-613.1.4-branch/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp 2021-10-06 22:12:54 UTC (rev 283671)
@@ -432,14 +432,6 @@
if (xpc_connection_t connection = this->connection()->xpcConnection())
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
}
void GPUProcessProxy::updateProcessAssertion()
Modified: branches/safari-613.1.4-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm (283670 => 283671)
--- branches/safari-613.1.4-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm 2021-10-06 22:08:00 UTC (rev 283670)
+++ branches/safari-613.1.4-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxyCocoa.mm 2021-10-06 22:12:54 UTC (rev 283671)
@@ -54,7 +54,7 @@
if (messageName == LaunchServicesDatabaseXPCConstants::xpcLaunchServicesDatabaseXPCEndpointMessageName) {
m_networkProcess->m_endpointMessage = event;
for (auto& dataStore : copyToVectorOf<Ref<WebsiteDataStore>>(m_networkProcess->m_websiteDataStores))
- dataStore->sendNetworkProcessXPCEndpointToAllProcesses();
+ dataStore->sendNetworkProcessXPCEndpointToAllWebProcesses();
}
return true;
Modified: branches/safari-613.1.4-branch/Source/WebKit/UIProcess/WebProcessProxy.cpp (283670 => 283671)
--- branches/safari-613.1.4-branch/Source/WebKit/UIProcess/WebProcessProxy.cpp 2021-10-06 22:08:00 UTC (rev 283670)
+++ branches/safari-613.1.4-branch/Source/WebKit/UIProcess/WebProcessProxy.cpp 2021-10-06 22:12:54 UTC (rev 283671)
@@ -338,12 +338,8 @@
WEBPROCESSPROXY_RELEASE_LOG(Process, "setWebsiteDataStore() dataStore=%p, sessionID=%" PRIu64, &dataStore, dataStore.sessionID().toUInt64());
m_websiteDataStore = &dataStore;
#if PLATFORM(COCOA)
- dataStore.sendNetworkProcessXPCEndpointToProcess(*this);
-#if ENABLE(GPU_PROCESS)
- if (GPUProcessProxy::singletonIfCreated())
- dataStore.sendNetworkProcessXPCEndpointToProcess(*GPUProcessProxy::singletonIfCreated());
+ dataStore.sendNetworkProcessXPCEndpointToWebProcess(*this);
#endif
-#endif
updateRegistrationWithDataStore();
send(Messages::WebProcess::SetWebsiteDataStoreParameters(processPool().webProcessDataStoreParameters(*this, dataStore)), 0);
}
@@ -1071,7 +1067,7 @@
#if PLATFORM(COCOA)
if (m_websiteDataStore)
- m_websiteDataStore->sendNetworkProcessXPCEndpointToProcess(*this);
+ m_websiteDataStore->sendNetworkProcessXPCEndpointToWebProcess(*this);
#endif
RELEASE_ASSERT(!m_webConnection);
Modified: branches/safari-613.1.4-branch/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (283670 => 283671)
--- branches/safari-613.1.4-branch/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2021-10-06 22:08:00 UTC (rev 283670)
+++ branches/safari-613.1.4-branch/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2021-10-06 22:12:54 UTC (rev 283671)
@@ -49,10 +49,6 @@
#import <wtf/cocoa/Entitlements.h>
#import <wtf/text/cf/StringConcatenateCF.h>
-#if ENABLE(GPU_PROCESS)
-#import "GPUProcessProxy.h"
-#endif
-
#if PLATFORM(IOS_FAMILY)
#import <UIKit/UIApplication.h>
#import <pal/ios/ManagedConfigurationSoftLink.h>
@@ -598,7 +594,7 @@
return WTF::hasEntitlement(networkProcess().connection()->xpcConnection(), entitlement.utf8().data());
}
-void WebsiteDataStore::sendNetworkProcessXPCEndpointToProcess(AuxiliaryProcessProxy& process) const
+void WebsiteDataStore::sendNetworkProcessXPCEndpointToWebProcess(WebProcessProxy& process)
{
if (process.state() != AuxiliaryProcessProxy::State::Running)
return;
@@ -611,14 +607,10 @@
xpc_connection_send_message(connection->xpcConnection(), message);
}
-void WebsiteDataStore::sendNetworkProcessXPCEndpointToAllProcesses()
+void WebsiteDataStore::sendNetworkProcessXPCEndpointToAllWebProcesses()
{
for (auto& process : m_processes)
- sendNetworkProcessXPCEndpointToProcess(process);
-#if ENABLE(GPU_PROCESS)
- if (GPUProcessProxy::singletonIfCreated())
- sendNetworkProcessXPCEndpointToProcess(*GPUProcessProxy::singletonIfCreated());
-#endif
+ sendNetworkProcessXPCEndpointToWebProcess(process);
}
}
Modified: branches/safari-613.1.4-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (283670 => 283671)
--- branches/safari-613.1.4-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2021-10-06 22:08:00 UTC (rev 283670)
+++ branches/safari-613.1.4-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2021-10-06 22:12:54 UTC (rev 283671)
@@ -82,7 +82,6 @@
namespace WebKit {
class AuthenticatorManager;
-class AuxiliaryProcessProxy;
class SecKeyProxyStore;
class DeviceIdHashSaltStorage;
class NetworkProcessProxy;
@@ -279,8 +278,8 @@
void dispatchOnQueue(Function<void()>&&);
#if PLATFORM(COCOA)
- void sendNetworkProcessXPCEndpointToProcess(AuxiliaryProcessProxy&) const;
- void sendNetworkProcessXPCEndpointToAllProcesses();
+ void sendNetworkProcessXPCEndpointToWebProcess(WebProcessProxy&);
+ void sendNetworkProcessXPCEndpointToAllWebProcesses();
static bool useNetworkLoader();
#endif
