third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp - Issue 2733283004: Expose WebServiceWorkerNetworkProvider on DataSource

Unified Diff: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

Issue 2733283004: Expose WebServiceWorkerNetworkProvider on DataSource (Closed)

Patch Set: . Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('K') | « third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h ('k') | third_party/WebKit/Source/web/WebEmbeddedWorkerImplTest.cpp » ('j') | third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

diff --git a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

index 3135c41469973049a984e8b5e991e2205798430b..7172d469ab0836543eb62fb4424400573946661e 100644

--- a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

+++ b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

@@ -59,6 +59,7 @@

#include "platform/weborigin/SecurityOrigin.h"

#include "public/platform/Platform.h"

#include "public/platform/WebURLRequest.h"

+#include "public/platform/modules/serviceworker/WebServiceWorkerNetworkProvider.h"

#include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"

#include "public/web/WebConsoleMessage.h"

#include "public/web/WebDevToolsAgent.h"

@@ -66,7 +67,6 @@

#include "public/web/WebView.h"

#include "public/web/WebWorkerContentSettingsClientProxy.h"

#include "public/web/modules/serviceworker/WebServiceWorkerContextClient.h"

-#include "public/web/modules/serviceworker/WebServiceWorkerNetworkProvider.h"

#include "web/IndexedDBClientImpl.h"

#include "web/ServiceWorkerGlobalScopeClientImpl.h"

#include "web/ServiceWorkerGlobalScopeProxy.h"

@@ -333,21 +333,20 @@ void WebEmbeddedWorkerImpl::loadShadowPage() {

void WebEmbeddedWorkerImpl::willSendRequest(WebLocalFrame* frame,

WebURLRequest& request) {

- if (m_networkProvider)

- m_networkProvider->willSendRequest(frame->dataSource(), request);

+ auto networkProvider = frame->dataSource()->getServiceWorkerNetworkProvider();

+ if (networkProvider)

+ networkProvider->willSendRequest(request);

Nate Chapin 2017/03/09 19:52:07 Can we move this (and the equivalent one in WebSha

kinuko 2017/03/10 01:51:03 Yeah I want to remove this too, but that requires

}

void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) {

DCHECK(!m_mainScriptLoader);

- DCHECK(!m_networkProvider);

DCHECK(m_mainFrame);

DCHECK(m_workerContextClient);

DCHECK(m_loadingShadowPage);

DCHECK(!m_askedToTerminate);

m_loadingShadowPage = false;

- m_networkProvider =

- WTF::wrapUnique(m_workerContextClient->createServiceWorkerNetworkProvider(

- frame->dataSource()));

+ frame->dataSource()->setServiceWorkerNetworkProvider(WTF::wrapUnique(

+ m_workerContextClient->createServiceWorkerNetworkProvider()));

m_mainScriptLoader = WorkerScriptLoader::create();

m_mainScriptLoader->setRequestContext(

WebURLRequest::RequestContextServiceWorker);