Diff
Modified: trunk/Source/WebKit/ChangeLog (274204 => 274205)
--- trunk/Source/WebKit/ChangeLog 2021-03-10 09:44:49 UTC (rev 274204)
+++ trunk/Source/WebKit/ChangeLog 2021-03-10 11:24:47 UTC (rev 274205)
@@ -1,3 +1,18 @@
+2021-03-10 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r274186.
+ https://bugs.webkit.org/show_bug.cgi?id=223023
+
+ triggers an infinite network process launch loop in GTK
+
+ Reverted changeset:
+
+ "REGRESSION (r272376): [iOS] ASSERTION FAILED:
+ sessionID.isEphemeral() || !path.isEmpty() in
+ WebKit::NetworkProcess::swServerForSession"
+ https://bugs.webkit.org/show_bug.cgi?id=222713
+ https://trac.webkit.org/changeset/274186
+
2021-03-09 Don Olmstead <don.olmst...@sony.com>
GLib JSC API headers should only include other GLib JSC API headers
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (274204 => 274205)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2021-03-10 09:44:49 UTC (rev 274204)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2021-03-10 11:24:47 UTC (rev 274205)
@@ -353,9 +353,6 @@
for (auto& scheme : parameters.urlSchemesRegisteredAsNoAccess)
registerURLSchemeAsNoAccess(scheme);
- for (auto&& websiteDataStoreParameters : WTFMove(parameters.websiteDataStoreParameters))
- addWebsiteDataStore(WTFMove(websiteDataStoreParameters));
-
RELEASE_LOG(Process, "%p - NetworkProcess::initializeNetworkProcess: Presenting processPID=%d", this, WebCore::presentingApplicationPID());
}
@@ -433,8 +430,6 @@
}).isNewEntry;
if (isNewEntry)
SandboxExtension::consumePermanently(cacheRootPathHandle);
- else
- ASSERT_NOT_REACHED();
}
void NetworkProcess::removeSessionStorageQuotaManager(PAL::SessionID sessionID)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (274204 => 274205)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2021-03-10 09:44:49 UTC (rev 274204)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2021-03-10 11:24:47 UTC (rev 274205)
@@ -28,7 +28,6 @@
#include "ArgumentCoders.h"
#include "WebCoreArgumentCoders.h"
-#include "WebsiteDataStoreParameters.h"
#if PLATFORM(COCOA)
#include "ArgumentCodersCF.h"
@@ -37,9 +36,6 @@
namespace WebKit {
NetworkProcessCreationParameters::NetworkProcessCreationParameters() = default;
-NetworkProcessCreationParameters::~NetworkProcessCreationParameters() = default;
-NetworkProcessCreationParameters::NetworkProcessCreationParameters(NetworkProcessCreationParameters&&) = default;
-NetworkProcessCreationParameters& NetworkProcessCreationParameters::operator=(NetworkProcessCreationParameters&&) = default;
void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
{
@@ -72,7 +68,6 @@
encoder << enablePrivateClickMeasurement;
encoder << enablePrivateClickMeasurementDebugMode;
- encoder << websiteDataStoreParameters;
}
bool NetworkProcessCreationParameters::decode(IPC::Decoder& decoder, NetworkProcessCreationParameters& result)
@@ -143,12 +138,6 @@
if (!decoder.decode(result.enablePrivateClickMeasurementDebugMode))
return false;
- Optional<Vector<WebsiteDataStoreParameters>> websiteDataStoreParameters;
- decoder >> websiteDataStoreParameters;
- if (!websiteDataStoreParameters)
- return false;
- result.websiteDataStoreParameters = WTFMove(*websiteDataStoreParameters);
-
return true;
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (274204 => 274205)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2021-03-10 09:44:49 UTC (rev 274204)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2021-03-10 11:24:47 UTC (rev 274205)
@@ -43,13 +43,8 @@
namespace WebKit {
-struct WebsiteDataStoreParameters;
-
struct NetworkProcessCreationParameters {
NetworkProcessCreationParameters();
- NetworkProcessCreationParameters(NetworkProcessCreationParameters&&);
- ~NetworkProcessCreationParameters();
- NetworkProcessCreationParameters& operator=(NetworkProcessCreationParameters&&);
void encode(IPC::Encoder&) const;
static WARN_UNUSED_RETURN bool decode(IPC::Decoder&, NetworkProcessCreationParameters&);
@@ -87,8 +82,6 @@
bool enablePrivateClickMeasurement { true };
bool enablePrivateClickMeasurementDebugMode { false };
-
- Vector<WebsiteDataStoreParameters> websiteDataStoreParameters;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (274204 => 274205)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2021-03-10 09:44:49 UTC (rev 274204)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2021-03-10 11:24:47 UTC (rev 274205)
@@ -158,10 +158,6 @@
SandboxExtension::createHandle(parentBundleDirectory, SandboxExtension::Type::ReadOnly, parameters.parentBundleDirectoryExtensionHandle);
SandboxExtension::createHandleForTemporaryFile(emptyString(), SandboxExtension::Type::ReadWrite, parameters.tempDirectoryExtensionHandle);
#endif
- parameters.websiteDataStoreParameters = WebsiteDataStore::parametersFromEachWebsiteDataStore();
- WebsiteDataStore::forEachWebsiteDataStore([this](auto& websiteDataStore) {
- addSession(websiteDataStore, SendParametersToNetworkProcess::No);
- });
WebProcessPool::platformInitializeNetworkProcess(parameters);
send(Messages::NetworkProcess::InitializeNetworkProcess(parameters), 0);
}
@@ -1331,13 +1327,11 @@
sendWithAsyncReply(Messages::NetworkProcess::FlushCookies(sessionID), WTFMove(completionHandler));
}
-void NetworkProcessProxy::addSession(WebsiteDataStore& store, SendParametersToNetworkProcess sendParametersToNetworkProcess)
+void NetworkProcessProxy::addSession(WebsiteDataStore& store)
{
- auto addResult = m_websiteDataStores.add(store);
- if (!addResult.isNewEntry)
- return;
+ m_websiteDataStores.add(store);
- if (canSendMessage() && sendParametersToNetworkProcess == SendParametersToNetworkProcess::Yes)
+ if (canSendMessage())
send(Messages::NetworkProcess::AddWebsiteDataStore { store.parameters() }, 0);
auto sessionID = store.sessionID();
if (!sessionID.isEphemeral()) {
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (274204 => 274205)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2021-03-10 09:44:49 UTC (rev 274204)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2021-03-10 11:24:47 UTC (rev 274205)
@@ -221,8 +221,7 @@
void didDestroyWebUserContentControllerProxy(WebUserContentControllerProxy&);
#endif
- enum class SendParametersToNetworkProcess : bool { No, Yes };
- void addSession(WebsiteDataStore&, SendParametersToNetworkProcess);
+ void addSession(WebsiteDataStore&);
void removeSession(WebsiteDataStore&);
#if ENABLE(INDEXED_DATABASE)
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (274204 => 274205)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2021-03-10 09:44:49 UTC (rev 274204)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2021-03-10 11:24:47 UTC (rev 274205)
@@ -208,7 +208,7 @@
{
if (!m_networkProcess) {
m_networkProcess = networkProcessForSession(m_sessionID);
- m_networkProcess->addSession(*this, NetworkProcessProxy::SendParametersToNetworkProcess::Yes);
+ m_networkProcess->addSession(*this);
}
return *m_networkProcess;
@@ -1910,15 +1910,6 @@
processPool->setCacheModelSynchronouslyForTesting(cacheModel);
}
-Vector<WebsiteDataStoreParameters> WebsiteDataStore::parametersFromEachWebsiteDataStore()
-{
- Vector<WebsiteDataStoreParameters> parameters;
- parameters.reserveInitialCapacity(allDataStores().size());
- for (auto* dataStore : allDataStores().values())
- parameters.uncheckedAppend(dataStore->parameters());
- return parameters;
-}
-
WebsiteDataStoreParameters WebsiteDataStore::parameters()
{
WebsiteDataStoreParameters parameters;
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (274204 => 274205)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2021-03-10 09:44:49 UTC (rev 274204)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2021-03-10 11:24:47 UTC (rev 274205)
@@ -258,7 +258,6 @@
DeviceIdHashSaltStorage& deviceIdHashSaltStorage() { return m_deviceIdHashSaltStorage.get(); }
WebsiteDataStoreParameters parameters();
- static Vector<WebsiteDataStoreParameters> parametersFromEachWebsiteDataStore();
void flushCookies(CompletionHandler<void()>&&);
void clearCachedCredentials();
