Diff
Modified: trunk/Source/WebKit/ChangeLog (239740 => 239741)
--- trunk/Source/WebKit/ChangeLog 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/ChangeLog 2019-01-08 21:24:01 UTC (rev 239741)
@@ -1,5 +1,43 @@
2019-01-08 Alex Christensen <achristen...@webkit.org>
+ Remove more use of NetworkProcess::singleton
+ https://bugs.webkit.org/show_bug.cgi?id=193244
+
+ Reviewed by Brent Fulgham.
+
+ * NetworkProcess/NetworkCORSPreflightChecker.cpp:
+ (WebKit::NetworkCORSPreflightChecker::NetworkCORSPreflightChecker):
+ (WebKit::NetworkCORSPreflightChecker::didReceiveChallenge):
+ * NetworkProcess/NetworkCORSPreflightChecker.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::loadPing):
+ * NetworkProcess/NetworkContentRuleListManager.cpp:
+ (WebKit::NetworkContentRuleListManager::NetworkContentRuleListManager):
+ (WebKit::NetworkContentRuleListManager::contentExtensionsBackend):
+ * NetworkProcess/NetworkContentRuleListManager.h:
+ * NetworkProcess/NetworkLoadChecker.cpp:
+ (WebKit::NetworkLoadChecker::NetworkLoadChecker):
+ (WebKit::NetworkLoadChecker::applyHTTPSUpgradeIfNeeded const):
+ (WebKit::NetworkLoadChecker::checkCORSRequestWithPreflight):
+ (WebKit::NetworkLoadChecker::processContentExtensionRulesForLoad):
+ * NetworkProcess/NetworkLoadChecker.h:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::NetworkProcess):
+ (WebKit::NetworkProcess::didReceiveMessage):
+ (WebKit::NetworkProcess::createNetworkConnectionToWebProcess):
+ * NetworkProcess/NetworkProcess.h:
+ (WebKit::NetworkProcess::networkContentRuleListManager):
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ * NetworkProcess/PingLoad.cpp:
+ (WebKit::PingLoad::PingLoad):
+ * NetworkProcess/PingLoad.h:
+ * NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp:
+ (WebKit::WebSWServerToContextConnection::WebSWServerToContextConnection):
+ (WebKit::WebSWServerToContextConnection::connectionMayNoLongerBeNeeded):
+ * NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h:
+
+2019-01-08 Alex Christensen <achristen...@webkit.org>
+
Stop using NetworkProcess::singleton in NetworkCache code
https://bugs.webkit.org/show_bug.cgi?id=193243
Modified: trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp 2019-01-08 21:24:01 UTC (rev 239741)
@@ -40,8 +40,9 @@
using namespace WebCore;
-NetworkCORSPreflightChecker::NetworkCORSPreflightChecker(Parameters&& parameters, bool shouldCaptureExtraNetworkLoadMetrics, CompletionCallback&& completionCallback)
+NetworkCORSPreflightChecker::NetworkCORSPreflightChecker(NetworkProcess& networkProcess, Parameters&& parameters, bool shouldCaptureExtraNetworkLoadMetrics, CompletionCallback&& completionCallback)
: m_parameters(WTFMove(parameters))
+ , m_networkProcess(networkProcess)
, m_completionCallback(WTFMove(completionCallback))
, m_shouldCaptureExtraNetworkLoadMetrics(shouldCaptureExtraNetworkLoadMetrics)
{
@@ -101,7 +102,7 @@
return;
}
- NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.pageID, m_parameters.frameID, challenge, WTFMove(completionHandler));
+ m_networkProcess->authenticationManager().didReceiveAuthenticationChallenge(m_parameters.pageID, m_parameters.frameID, challenge, WTFMove(completionHandler));
}
void NetworkCORSPreflightChecker::didReceiveResponse(WebCore::ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h 2019-01-08 21:24:01 UTC (rev 239741)
@@ -38,6 +38,8 @@
namespace WebKit {
+class NetworkProcess;
+
class NetworkCORSPreflightChecker final : private NetworkDataTaskClient {
WTF_MAKE_FAST_ALLOCATED;
public:
@@ -53,7 +55,7 @@
};
using CompletionCallback = CompletionHandler<void(WebCore::ResourceError&&)>;
- NetworkCORSPreflightChecker(Parameters&&, bool shouldCaptureExtraNetworkLoadMetrics, CompletionCallback&&);
+ NetworkCORSPreflightChecker(NetworkProcess&, Parameters&&, bool shouldCaptureExtraNetworkLoadMetrics, CompletionCallback&&);
~NetworkCORSPreflightChecker();
const WebCore::ResourceRequest& originalRequest() const { return m_parameters.originalRequest; }
@@ -72,6 +74,7 @@
void cannotShowURL() final;
Parameters m_parameters;
+ Ref<NetworkProcess> m_networkProcess;
WebCore::ResourceResponse m_response;
CompletionCallback m_completionCallback;
RefPtr<NetworkDataTask> m_task;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2019-01-08 21:24:01 UTC (rev 239741)
@@ -341,7 +341,7 @@
};
// PingLoad manages its own lifetime, deleting itself when its purpose has been fulfilled.
- new PingLoad(WTFMove(loadParameters), WTFMove(completionHandler));
+ new PingLoad(networkProcess(), WTFMove(loadParameters), WTFMove(completionHandler));
}
void NetworkConnectionToWebProcess::setOnLineState(bool isOnLine)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp 2019-01-08 21:24:01 UTC (rev 239741)
@@ -35,7 +35,11 @@
namespace WebKit {
using namespace WebCore;
-NetworkContentRuleListManager::NetworkContentRuleListManager() = default;
+NetworkContentRuleListManager::NetworkContentRuleListManager(NetworkProcess& networkProcess)
+ : m_networkProcess(networkProcess)
+{
+}
+
NetworkContentRuleListManager::~NetworkContentRuleListManager()
{
auto pendingCallbacks = WTFMove(m_pendingCallbacks);
@@ -59,7 +63,7 @@
m_pendingCallbacks.ensure(identifier, [] {
return Vector<BackendCallback> { };
}).iterator->value.append(WTFMove(callback));
- NetworkProcess::singleton().parentProcessConnection()->send(Messages::NetworkProcessProxy::ContentExtensionRules { identifier }, 0);
+ m_networkProcess.parentProcessConnection()->send(Messages::NetworkProcessProxy::ContentExtensionRules { identifier }, 0);
}
void NetworkContentRuleListManager::addContentRuleLists(UserContentControllerIdentifier identifier, const Vector<std::pair<String, WebCompiledContentRuleListData>>& contentRuleLists)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h 2019-01-08 21:24:01 UTC (rev 239741)
@@ -38,9 +38,11 @@
namespace WebKit {
+class NetworkProcess;
+
class NetworkContentRuleListManager {
public:
- NetworkContentRuleListManager();
+ NetworkContentRuleListManager(NetworkProcess&);
~NetworkContentRuleListManager();
void didReceiveMessage(IPC::Connection&, IPC::Decoder&);
@@ -56,6 +58,7 @@
HashMap<UserContentControllerIdentifier, std::unique_ptr<WebCore::ContentExtensions::ContentExtensionsBackend>> m_contentExtensionBackends;
HashMap<UserContentControllerIdentifier, Vector<BackendCallback>> m_pendingCallbacks;
+ NetworkProcess& m_networkProcess;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp 2019-01-08 21:24:01 UTC (rev 239741)
@@ -47,9 +47,10 @@
return url.protocolIsData() || url.protocolIsBlob() || !origin || origin->canRequest(url);
}
-NetworkLoadChecker::NetworkLoadChecker(FetchOptions&& options, PAL::SessionID sessionID, uint64_t pageID, uint64_t frameID, HTTPHeaderMap&& originalRequestHeaders, URL&& url, RefPtr<SecurityOrigin>&& sourceOrigin, PreflightPolicy preflightPolicy, String&& referrer, bool isHTTPSUpgradeEnabled, bool shouldCaptureExtraNetworkLoadMetrics, LoadType requestLoadType)
+NetworkLoadChecker::NetworkLoadChecker(NetworkProcess& networkProcess, FetchOptions&& options, PAL::SessionID sessionID, uint64_t pageID, uint64_t frameID, HTTPHeaderMap&& originalRequestHeaders, URL&& url, RefPtr<SecurityOrigin>&& sourceOrigin, PreflightPolicy preflightPolicy, String&& referrer, bool isHTTPSUpgradeEnabled, bool shouldCaptureExtraNetworkLoadMetrics, LoadType requestLoadType)
: m_options(WTFMove(options))
, m_sessionID(sessionID)
+ , m_networkProcess(networkProcess)
, m_pageID(pageID)
, m_frameID(frameID)
, m_originalRequestHeaders(WTFMove(originalRequestHeaders))
@@ -197,7 +198,7 @@
return;
}
- auto& httpsUpgradeChecker = NetworkProcess::singleton().networkHTTPSUpgradeChecker();
+ auto& httpsUpgradeChecker = m_networkProcess->networkHTTPSUpgradeChecker();
// Do not wait for httpsUpgradeChecker to complete its setup.
if (!httpsUpgradeChecker.didSetupCompleteSuccessfully()) {
@@ -407,7 +408,7 @@
m_frameID,
m_storedCredentialsPolicy
};
- m_corsPreflightChecker = std::make_unique<NetworkCORSPreflightChecker>(WTFMove(parameters), m_shouldCaptureExtraNetworkLoadMetrics, [this, request = WTFMove(request), handler = WTFMove(handler), isRedirected = isRedirected()](auto&& error) mutable {
+ m_corsPreflightChecker = std::make_unique<NetworkCORSPreflightChecker>(m_networkProcess.get(), WTFMove(parameters), m_shouldCaptureExtraNetworkLoadMetrics, [this, request = WTFMove(request), handler = WTFMove(handler), isRedirected = isRedirected()](auto&& error) mutable {
RELEASE_LOG_IF_ALLOWED("checkCORSRequestWithPreflight - makeCrossOriginAccessRequestWithPreflight preflight complete, success: %d forRedirect? %d", error.isNull(), isRedirected);
if (!error.isNull()) {
@@ -456,7 +457,7 @@
return;
}
- NetworkProcess::singleton().networkContentRuleListManager().contentExtensionsBackend(*m_userContentControllerIdentifier, [this, weakThis = makeWeakPtr(this), request = WTFMove(request), callback = WTFMove(callback)](auto& backend) mutable {
+ m_networkProcess->networkContentRuleListManager().contentExtensionsBackend(*m_userContentControllerIdentifier, [this, weakThis = makeWeakPtr(this), request = WTFMove(request), callback = WTFMove(callback)](auto& backend) mutable {
if (!weakThis) {
callback(makeUnexpected(ResourceError { ResourceError::Type::Cancellation }));
return;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.h (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.h 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoadChecker.h 2019-01-08 21:24:01 UTC (rev 239741)
@@ -47,12 +47,13 @@
namespace WebKit {
class NetworkCORSPreflightChecker;
+class NetworkProcess;
class NetworkLoadChecker : public CanMakeWeakPtr<NetworkLoadChecker> {
public:
enum class LoadType : bool { MainFrame, Other };
- NetworkLoadChecker(WebCore::FetchOptions&&, PAL::SessionID, uint64_t pageID, uint64_t frameID, WebCore::HTTPHeaderMap&&, URL&&, RefPtr<WebCore::SecurityOrigin>&&, WebCore::PreflightPolicy, String&& referrer, bool isHTTPSUpgradeEnabled = false, bool shouldCaptureExtraNetworkLoadMetrics = false, LoadType requestLoadType = LoadType::Other);
+ NetworkLoadChecker(NetworkProcess&, WebCore::FetchOptions&&, PAL::SessionID, uint64_t pageID, uint64_t frameID, WebCore::HTTPHeaderMap&&, URL&&, RefPtr<WebCore::SecurityOrigin>&&, WebCore::PreflightPolicy, String&& referrer, bool isHTTPSUpgradeEnabled = false, bool shouldCaptureExtraNetworkLoadMetrics = false, LoadType requestLoadType = LoadType::Other);
~NetworkLoadChecker();
struct RedirectionTriplet {
@@ -122,6 +123,7 @@
WebCore::FetchOptions m_options;
WebCore::StoredCredentialsPolicy m_storedCredentialsPolicy;
PAL::SessionID m_sessionID;
+ Ref<NetworkProcess> m_networkProcess;
uint64_t m_pageID;
uint64_t m_frameID;
WebCore::HTTPHeaderMap m_originalRequestHeaders; // Needed for CORS checks.
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-01-08 21:24:01 UTC (rev 239741)
@@ -128,6 +128,9 @@
#if PLATFORM(COCOA)
, m_clearCacheDispatchGroup(0)
#endif
+#if ENABLE(CONTENT_EXTENSIONS)
+ , m_networkContentRuleListManager(*this)
+#endif
, m_storageTaskQueue(WorkQueue::create("com.apple.WebKit.StorageTask"))
#if ENABLE(INDEXED_DATABASE)
, m_idbPerOriginQuota(IDBServer::defaultPerOriginQuota)
@@ -202,7 +205,7 @@
#if ENABLE(CONTENT_EXTENSIONS)
if (decoder.messageReceiverName() == Messages::NetworkContentRuleListManager::messageReceiverName()) {
- m_NetworkContentRuleListManager.didReceiveMessage(connection, decoder);
+ m_networkContentRuleListManager.didReceiveMessage(connection, decoder);
return;
}
#endif
@@ -411,7 +414,7 @@
if (isServiceWorkerProcess && !m_webProcessConnections.isEmpty()) {
ASSERT(parentProcessHasServiceWorkerEntitlement());
ASSERT(m_waitingForServerToContextProcessConnection);
- auto contextConnection = WebSWServerToContextConnection::create(securityOrigin, m_webProcessConnections.last()->connection());
+ auto contextConnection = WebSWServerToContextConnection::create(*this, securityOrigin, m_webProcessConnections.last()->connection());
auto addResult = m_serverToContextConnections.add(WTFMove(securityOrigin), contextConnection.copyRef());
ASSERT_UNUSED(addResult, addResult.isNewEntry);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-01-08 21:24:01 UTC (rev 239741)
@@ -172,7 +172,7 @@
bool sessionIsControlledByAutomation(PAL::SessionID) const;
#if ENABLE(CONTENT_EXTENSIONS)
- NetworkContentRuleListManager& networkContentRuleListManager() { return m_NetworkContentRuleListManager; }
+ NetworkContentRuleListManager& networkContentRuleListManager() { return m_networkContentRuleListManager; }
#endif
#if ENABLE(INDEXED_DATABASE)
@@ -391,7 +391,7 @@
#endif
#if ENABLE(CONTENT_EXTENSIONS)
- NetworkContentRuleListManager m_NetworkContentRuleListManager;
+ NetworkContentRuleListManager m_networkContentRuleListManager;
#endif
Ref<WorkQueue> m_storageTaskQueue;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2019-01-08 21:24:01 UTC (rev 239741)
@@ -112,7 +112,7 @@
if (synchronousReply || parameters.shouldRestrictHTTPResponseAccess) {
NetworkLoadChecker::LoadType requestLoadType = isMainFrameLoad() ? NetworkLoadChecker::LoadType::MainFrame : NetworkLoadChecker::LoadType::Other;
- m_networkLoadChecker = std::make_unique<NetworkLoadChecker>(FetchOptions { m_parameters.options }, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, HTTPHeaderMap { m_parameters.originalRequestHeaders }, URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, originalRequest().httpReferrer(), m_parameters.isHTTPSUpgradeEnabled, shouldCaptureExtraNetworkLoadMetrics(), requestLoadType);
+ m_networkLoadChecker = std::make_unique<NetworkLoadChecker>(connection.networkProcess(), FetchOptions { m_parameters.options }, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, HTTPHeaderMap { m_parameters.originalRequestHeaders }, URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, originalRequest().httpReferrer(), m_parameters.isHTTPSUpgradeEnabled, shouldCaptureExtraNetworkLoadMetrics(), requestLoadType);
if (m_parameters.cspResponseHeaders)
m_networkLoadChecker->setCSPResponseHeaders(ContentSecurityPolicyResponseHeaders { m_parameters.cspResponseHeaders.value() });
#if ENABLE(CONTENT_EXTENSIONS)
Modified: trunk/Source/WebKit/NetworkProcess/PingLoad.cpp (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/PingLoad.cpp 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/PingLoad.cpp 2019-01-08 21:24:01 UTC (rev 239741)
@@ -39,11 +39,11 @@
using namespace WebCore;
-PingLoad::PingLoad(NetworkResourceLoadParameters&& parameters, CompletionHandler<void(const ResourceError&, const ResourceResponse&)>&& completionHandler)
+PingLoad::PingLoad(NetworkProcess& networkProcess, NetworkResourceLoadParameters&& parameters, CompletionHandler<void(const ResourceError&, const ResourceResponse&)>&& completionHandler)
: m_parameters(WTFMove(parameters))
, m_completionHandler(WTFMove(completionHandler))
, m_timeoutTimer(*this, &PingLoad::timeoutTimerFired)
- , m_networkLoadChecker(makeUniqueRef<NetworkLoadChecker>(FetchOptions { m_parameters.options}, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, WTFMove(m_parameters.originalRequestHeaders), URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, m_parameters.request.httpReferrer()))
+ , m_networkLoadChecker(makeUniqueRef<NetworkLoadChecker>(networkProcess, FetchOptions { m_parameters.options}, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, WTFMove(m_parameters.originalRequestHeaders), URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, m_parameters.request.httpReferrer()))
{
m_networkLoadChecker->enableContentExtensionsCheck();
if (m_parameters.cspResponseHeaders)
Modified: trunk/Source/WebKit/NetworkProcess/PingLoad.h (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/PingLoad.h 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/PingLoad.h 2019-01-08 21:24:01 UTC (rev 239741)
@@ -36,10 +36,11 @@
namespace WebKit {
class NetworkLoadChecker;
+class NetworkProcess;
class PingLoad final : public CanMakeWeakPtr<PingLoad>, private NetworkDataTaskClient {
public:
- PingLoad(NetworkResourceLoadParameters&&, CompletionHandler<void(const WebCore::ResourceError&, const WebCore::ResourceResponse&)>&&);
+ PingLoad(NetworkProcess&, NetworkResourceLoadParameters&&, CompletionHandler<void(const WebCore::ResourceError&, const WebCore::ResourceResponse&)>&&);
private:
~PingLoad();
Modified: trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp 2019-01-08 21:24:01 UTC (rev 239741)
@@ -36,12 +36,15 @@
namespace WebKit {
using namespace WebCore;
-WebSWServerToContextConnection::WebSWServerToContextConnection(const SecurityOriginData& securityOrigin, Ref<IPC::Connection>&& connection)
+WebSWServerToContextConnection::WebSWServerToContextConnection(NetworkProcess& networkProcess, const SecurityOriginData& securityOrigin, Ref<IPC::Connection>&& connection)
: SWServerToContextConnection(securityOrigin)
, m_ipcConnection(WTFMove(connection))
+ , m_networkProcess(networkProcess)
{
}
+WebSWServerToContextConnection::~WebSWServerToContextConnection() = default;
+
IPC::Connection* WebSWServerToContextConnection::messageSenderConnection()
{
return m_ipcConnection.ptr();
@@ -104,7 +107,7 @@
void WebSWServerToContextConnection::connectionMayNoLongerBeNeeded()
{
- NetworkProcess::singleton().swContextConnectionMayNoLongerBeNeeded(*this);
+ m_networkProcess->swContextConnectionMayNoLongerBeNeeded(*this);
}
void WebSWServerToContextConnection::terminate()
Modified: trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h (239740 => 239741)
--- trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h 2019-01-08 21:23:00 UTC (rev 239740)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h 2019-01-08 21:24:01 UTC (rev 239741)
@@ -33,6 +33,8 @@
namespace WebKit {
+class NetworkProcess;
+
class WebSWServerToContextConnection : public WebCore::SWServerToContextConnection, public IPC::MessageSender, public IPC::MessageReceiver {
public:
template <typename... Args> static Ref<WebSWServerToContextConnection> create(Args&&... args)
@@ -50,7 +52,8 @@
void terminate();
private:
- WebSWServerToContextConnection(const WebCore::SecurityOriginData&, Ref<IPC::Connection>&&);
+ WebSWServerToContextConnection(NetworkProcess&, const WebCore::SecurityOriginData&, Ref<IPC::Connection>&&);
+ ~WebSWServerToContextConnection();
// IPC::MessageSender
IPC::Connection* messageSenderConnection() final;
@@ -70,6 +73,7 @@
void connectionMayNoLongerBeNeeded() final;
Ref<IPC::Connection> m_ipcConnection;
+ Ref<NetworkProcess> m_networkProcess;
}; // class WebSWServerToContextConnection
