Expose WebServiceWorkerNetworkProvider on DataSource

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 41 matching lines @@
 #include "platform/Histogram.h"
 #include "platform/SharedBuffer.h"
 #include "platform/heap/Handle.h"
 #include "platform/loader/fetch/SubstituteData.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/network/ContentSecurityPolicyResponseHeaders.h"
 #include "platform/network/NetworkUtils.h"
 #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"
 #include "public/web/WebSettings.h"
 #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"
 #include "web/WebDataSourceImpl.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WorkerContentSettingsClient.h"
 #include "wtf/Functional.h"
 #include "wtf/PtrUtil.h"
 
 namespace blink {
@@ skipping 246 matching lines @@
   RefPtr<SharedBuffer> buffer(
       SharedBuffer::create(content.data(), content.length()));
   m_loadingShadowPage = true;
   m_mainFrame->frame()->loader().load(
       FrameLoadRequest(0, ResourceRequest(m_workerStartData.scriptURL),
                        SubstituteData(buffer, "text/html", "UTF-8", KURL())));
 }
 
 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 WebSharedWorkerImpl) to
FrameFetchContext now?

[kinuko, 2017/03/10 01:51:03]

Yeah I want to remove this too, but that requires a bit more changes in
RenderFrameImpl and FrameFetchContext.

Let me try it in a separate patch.

 }
 
 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);
   m_mainScriptLoader->loadAsynchronously(
       *m_mainFrame->frame()->document(), m_workerStartData.scriptURL,
       DenyCrossOriginRequests, m_workerStartData.addressSpace, nullptr,
       bind(&WebEmbeddedWorkerImpl::onScriptLoaderFinished,
            WTF::unretained(this)));
   // Do nothing here since onScriptLoaderFinished() might have been already
   // invoked and |this| might have been deleted at this point.
@@ skipping 118 matching lines @@
       *this, *document, *m_workerContextClient);
   m_loaderProxy = WorkerLoaderProxy::create(this);
   m_workerThread =
       ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy);
   m_workerThread->start(std::move(startupData), m_mainThreadTaskRunners.get());
   m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
                                               scriptURL);
 }
 
 }  // namespace blink