Actually start ServiceWorkerThread in EmbeddedWorker

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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "WebEmbeddedWorkerImpl.h"
 
+#include "ServiceWorkerGlobalScopeProxy.h"
 #include "WebDataSourceImpl.h"
 #include "WebFrameImpl.h"
 #include "WebServiceWorkerContextClient.h"
 #include "WebView.h"
 #include "WebWorkerPermissionClientProxy.h"
 #include "WorkerPermissionClient.h"
 #include "core/dom/Document.h"
 #include "core/frame/ContentSecurityPolicyResponseHeaders.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/SubstituteData.h"
 #include "core/workers/WorkerClients.h"
+#include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
 #include "core/workers/WorkerScriptLoaderClient.h"
 #include "core/workers/WorkerThreadStartupData.h"
+#include "modules/serviceworkers/ServiceWorkerThread.h"
 #include "platform/NotImplemented.h"
 #include "platform/SharedBuffer.h"
 #include "wtf/Functional.h"
 
 using namespace WebCore;
 
 namespace blink {
 
 // A thin wrapper for one-off script loading.
 class WebEmbeddedWorkerImpl::Loader : public WorkerScriptLoaderClient {
@@ skipping 12 matching lines @@
     {
         m_callback();
     }
 
     void cancel()
     {
         m_scriptLoader->cancel();
     }
 
     bool failed() const { return m_scriptLoader->failed(); }
+    const KURL& url() const { return m_scriptLoader->responseURL(); }
     String script() const { return m_scriptLoader->script(); }
 
 private:
     Loader(ExecutionContext* loadingContext, const KURL& scriptURL, const Closure& callback)
         : m_scriptLoader(WorkerScriptLoader::create())
         , m_callback(callback)
     {
         m_scriptLoader->setTargetType(ResourceRequest::TargetIsServiceWorker);
         m_scriptLoader->loadAsynchronously(
             loadingContext, scriptURL, DenyCrossOriginRequests, this);
     }
 
     RefPtr<WorkerScriptLoader> m_scriptLoader;
     Closure m_callback;
 };
 
+class WebEmbeddedWorkerImpl::LoaderProxy : public WorkerLoaderProxy {
+public:
+    static PassOwnPtr<LoaderProxy> create(WebEmbeddedWorkerImpl* embeddedWorker)
+    {
+        return adoptPtr(new LoaderProxy(embeddedWorker));
+    }
+
+    virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask> task) OVERRIDE
+    {
+        m_embeddedWorker->m_loadingContext->postTask(task);
+    }
+
+    virtual bool postTaskForModeToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask> task, const String& mode) OVERRIDE
+    {
+        if (m_embeddedWorker->m_askedToTerminate
+            || !m_embeddedWorker->m_workerThread)

[adamk, 2013/12/05 22:50:12]

Nit: This linebreak looks funny in Blink

[kinuko, 2013/12/09 12:24:20]

Concatenated the lines.

+            return false;
+        return m_embeddedWorker->m_workerThread->runLoop().postTaskForMode(task, mode);
+    }
+
+private:
+    explicit LoaderProxy(WebEmbeddedWorkerImpl* embeddedWorker)
+        : m_embeddedWorker(embeddedWorker)
+    {
+    }
+
+    // Not owned, embedded worker owns this.

[adamk, 2013/12/05 22:50:12]

Maybe should be a reference too?

I guess you're following the style around here (and in Chromium) by using
pointers; not clear if it's worth changing just a few of these, but I'd be
interested in your thoughts.

[kinuko, 2013/12/09 12:24:20]

Done.

+    WebEmbeddedWorkerImpl* m_embeddedWorker;
+};
+
 WebEmbeddedWorker* WebEmbeddedWorker::create(
     WebServiceWorkerContextClient* client,
     WebWorkerPermissionClientProxy* permissionClient)
 {
     return new WebEmbeddedWorkerImpl(adoptPtr(client), adoptPtr(permissionClient));
 }
 
 WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(
     PassOwnPtr<WebServiceWorkerContextClient> client,
     PassOwnPtr<WebWorkerPermissionClientProxy> permissionClient)
@@ skipping 76 matching lines @@
 void WebEmbeddedWorkerImpl::onScriptLoaderFinished()
 {
     ASSERT(m_mainScriptLoader);
 
     if (m_mainScriptLoader->failed() || m_askedToTerminate) {
         m_workerContextClient->workerContextFailedToStart();
         m_mainScriptLoader.clear();
         return;
     }
 
-    // FIXME: Create WorkerReportingProxy, set up WorkerThreadStartupData,
-    // create ServiceWorkerThread and start it with m_scripLoader->script().
+    WorkerThreadStartMode startMode =
+        (m_workerStartData.startMode == WebEmbeddedWorkerStartModePauseOnStart)
+        ? PauseWorkerGlobalScopeOnStart : DontPauseWorkerGlobalScopeOnStart;
+
+    OwnPtr<WorkerClients> workerClients = WorkerClients::create();
+    providePermissionClientToWorker(workerClients.get(), m_permissionClient.release());
+
+    OwnPtr<WorkerThreadStartupData> startupData =
+        WorkerThreadStartupData::create(
+            m_mainScriptLoader->url(),
+            m_workerStartData.userAgent,
+            m_mainScriptLoader->script(),
+            startMode,
+            // FIXME: fill appropriate CSP info and policy type.
+            String(),
+            ContentSecurityPolicy::Enforce,
+            workerClients.release());
 
     m_mainScriptLoader.clear();
 
-    notImplemented();
+    m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(this, m_loadingContext.get(), m_workerContextClient.release());
+    m_loaderProxy = LoaderProxy::create(this);
+
+    m_workerThread = ServiceWorkerThread::create(
+        *m_loaderProxy.get(),

[adamk, 2013/12/05 22:50:12]

No need for .get() if you're using operator*.

[kinuko, 2013/12/09 12:24:20]

Done.

+        *m_workerGlobalScopeProxy.get(),

[adamk, 2013/12/05 22:50:12]

Same here.

[kinuko, 2013/12/09 12:24:20]

Done.

+        startupData.release());

[adamk, 2013/12/05 22:50:12]

More linebreaks...

[kinuko, 2013/12/09 12:24:20]

Too chrome'y? I packed these in one line.

+    m_workerThread->start();
 }
 
 } // namespace blink