WebKit Bugzilla
Attachment 358606 Details for
Bug 193244
: Remove more use of NetworkProcess::singleton
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-193244-20190108100548.patch (text/plain), 22.17 KB, created by
Alex Christensen
on 2019-01-08 10:05:48 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Alex Christensen
Created:
2019-01-08 10:05:48 PST
Size:
22.17 KB
patch
obsolete
>Index: Source/WebKit/ChangeLog >=================================================================== >--- Source/WebKit/ChangeLog (revision 239726) >+++ Source/WebKit/ChangeLog (working copy) >@@ -1,3 +1,41 @@ >+2019-01-08 Alex Christensen <achristensen@webkit.org> >+ >+ Remove more use of NetworkProcess::singleton >+ https://bugs.webkit.org/show_bug.cgi?id=193244 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * 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 <achristensen@webkit.org> > > Always call CompletionHandler in Cache::store >Index: Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp (revision 239670) >+++ Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp (working copy) >@@ -40,8 +40,9 @@ namespace WebKit { > > 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 @@ void NetworkCORSPreflightChecker::didRec > 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) >Index: Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h (revision 239670) >+++ Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.h (working copy) >@@ -38,6 +38,8 @@ class SecurityOrigin; > > namespace WebKit { > >+class NetworkProcess; >+ > class NetworkCORSPreflightChecker final : private NetworkDataTaskClient { > WTF_MAKE_FAST_ALLOCATED; > public: >@@ -53,7 +55,7 @@ public: > }; > 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 @@ private: > void cannotShowURL() final; > > Parameters m_parameters; >+ Ref<NetworkProcess> m_networkProcess; > WebCore::ResourceResponse m_response; > CompletionCallback m_completionCallback; > RefPtr<NetworkDataTask> m_task; >Index: Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (revision 239701) >+++ Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (working copy) >@@ -341,7 +341,7 @@ void NetworkConnectionToWebProcess::load > }; > > // 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) >Index: Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp (revision 239670) >+++ Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp (working copy) >@@ -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 @@ void NetworkContentRuleListManager::cont > 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) >Index: Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h (revision 239670) >+++ Source/WebKit/NetworkProcess/NetworkContentRuleListManager.h (working copy) >@@ -38,9 +38,11 @@ class Decoder; > > namespace WebKit { > >+class NetworkProcess; >+ > class NetworkContentRuleListManager { > public: >- NetworkContentRuleListManager(); >+ NetworkContentRuleListManager(NetworkProcess&); > ~NetworkContentRuleListManager(); > > void didReceiveMessage(IPC::Connection&, IPC::Decoder&); >@@ -56,6 +58,7 @@ private: > > HashMap<UserContentControllerIdentifier, std::unique_ptr<WebCore::ContentExtensions::ContentExtensionsBackend>> m_contentExtensionBackends; > HashMap<UserContentControllerIdentifier, Vector<BackendCallback>> m_pendingCallbacks; >+ NetworkProcess& m_networkProcess; > }; > > } // namespace WebKit >Index: Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp (revision 239699) >+++ Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp (working copy) >@@ -47,9 +47,10 @@ static inline bool isSameOrigin(const UR > 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 @@ void NetworkLoadChecker::applyHTTPSUpgra > 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 @@ void NetworkLoadChecker::checkCORSReques > 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 @@ void NetworkLoadChecker::processContentE > 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; >Index: Source/WebKit/NetworkProcess/NetworkLoadChecker.h >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkLoadChecker.h (revision 239670) >+++ Source/WebKit/NetworkProcess/NetworkLoadChecker.h (working copy) >@@ -47,12 +47,13 @@ enum class StoredCredentialsPolicy : boo > 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 @@ private: > 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. >Index: Source/WebKit/NetworkProcess/NetworkProcess.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcess.cpp (revision 239710) >+++ Source/WebKit/NetworkProcess/NetworkProcess.cpp (working copy) >@@ -128,6 +128,7 @@ NetworkProcess::NetworkProcess() > #if PLATFORM(COCOA) > , m_clearCacheDispatchGroup(0) > #endif >+ , m_networkContentRuleListManager(*this) > , m_storageTaskQueue(WorkQueue::create("com.apple.WebKit.StorageTask")) > #if ENABLE(INDEXED_DATABASE) > , m_idbPerOriginQuota(IDBServer::defaultPerOriginQuota) >@@ -202,7 +203,7 @@ void NetworkProcess::didReceiveMessage(I > > #if ENABLE(CONTENT_EXTENSIONS) > if (decoder.messageReceiverName() == Messages::NetworkContentRuleListManager::messageReceiverName()) { >- m_NetworkContentRuleListManager.didReceiveMessage(connection, decoder); >+ m_networkContentRuleListManager.didReceiveMessage(connection, decoder); > return; > } > #endif >@@ -411,7 +412,7 @@ void NetworkProcess::createNetworkConnec > 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); > >Index: Source/WebKit/NetworkProcess/NetworkProcess.h >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcess.h (revision 239710) >+++ Source/WebKit/NetworkProcess/NetworkProcess.h (working copy) >@@ -172,7 +172,7 @@ public: > 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 @@ private: > #endif > > #if ENABLE(CONTENT_EXTENSIONS) >- NetworkContentRuleListManager m_NetworkContentRuleListManager; >+ NetworkContentRuleListManager m_networkContentRuleListManager; > #endif > > Ref<WorkQueue> m_storageTaskQueue; >Index: Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (revision 239725) >+++ Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (working copy) >@@ -112,7 +112,7 @@ NetworkResourceLoader::NetworkResourceLo > > 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) >Index: Source/WebKit/NetworkProcess/PingLoad.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/PingLoad.cpp (revision 239670) >+++ Source/WebKit/NetworkProcess/PingLoad.cpp (working copy) >@@ -39,11 +39,11 @@ namespace WebKit { > > 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) >Index: Source/WebKit/NetworkProcess/PingLoad.h >=================================================================== >--- Source/WebKit/NetworkProcess/PingLoad.h (revision 239670) >+++ Source/WebKit/NetworkProcess/PingLoad.h (working copy) >@@ -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(); >Index: Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp (revision 239670) >+++ Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp (working copy) >@@ -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::did > > void WebSWServerToContextConnection::connectionMayNoLongerBeNeeded() > { >- NetworkProcess::singleton().swContextConnectionMayNoLongerBeNeeded(*this); >+ m_networkProcess->swContextConnectionMayNoLongerBeNeeded(*this); > } > > void WebSWServerToContextConnection::terminate() >Index: Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h >=================================================================== >--- Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h (revision 239670) >+++ Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.h (working copy) >@@ -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 @@ public: > 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 @@ private: > void connectionMayNoLongerBeNeeded() final; > > Ref<IPC::Connection> m_ipcConnection; >+ Ref<NetworkProcess> m_networkProcess; > > }; // class WebSWServerToContextConnection >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193244
:
358606
|
358610