Turn WorkerLoaderProxy into a threadsafe, ref-counted object.

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 104 matching lines @@
 private:
     Loader() : m_scriptLoader(WorkerScriptLoader::create())
     {
     }
 
     RefPtr<WorkerScriptLoader> m_scriptLoader;
     OwnPtr<Closure> m_callback;
     RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy;
 };
 
-class WebEmbeddedWorkerImpl::LoaderProxy : public WorkerLoaderProxy {
-public:
-    static PassOwnPtr<LoaderProxy> create(WebEmbeddedWorkerImpl& embeddedWorker)
-    {
-        return adoptPtr(new LoaderProxy(embeddedWorker));
-    }
-
-    virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask> task) override
-    {
-        toWebLocalFrameImpl(m_embeddedWorker.m_mainFrame)->frame()->document()->postTask(task);
-    }
-
-    virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask> task) override
-    {
-        if (m_embeddedWorker.m_askedToTerminate || !m_embeddedWorker.m_workerThread)
-            return false;
-        m_embeddedWorker.m_workerThread->postTask(task);
-        return !m_embeddedWorker.m_workerThread->terminated();
-    }
-
-private:
-    explicit LoaderProxy(WebEmbeddedWorkerImpl& embeddedWorker)
-        : m_embeddedWorker(embeddedWorker)
-    {
-    }
-
-    // Not owned, embedded worker owns this.
-    WebEmbeddedWorkerImpl& m_embeddedWorker;
-};
-
-WebEmbeddedWorker* WebEmbeddedWorker::create(
-    WebServiceWorkerContextClient* client,
-    WebWorkerPermissionClientProxy* permissionClient)
+WebEmbeddedWorker* WebEmbeddedWorker::create(WebServiceWorkerContextClient* client, WebWorkerPermissionClientProxy* permissionClient)
 {
     return new WebEmbeddedWorkerImpl(adoptPtr(client), adoptPtr(permissionClient));
 }
 
 static HashSet<WebEmbeddedWorkerImpl*>& runningWorkerInstances()
 {
     DEFINE_STATIC_LOCAL(HashSet<WebEmbeddedWorkerImpl*>, set, ());
     return set;
 }
 
-WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(
-    PassOwnPtr<WebServiceWorkerContextClient> client,
-    PassOwnPtr<WebWorkerPermissionClientProxy> permissionClient)
+WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(PassOwnPtr<WebServiceWorkerContextClient> client, PassOwnPtr<WebWorkerPermissionClientProxy> permissionClient)
     : m_workerContextClient(client)
     , m_permissionClient(permissionClient)
     , m_workerInspectorProxy(WorkerInspectorProxy::create())
     , m_webView(0)
     , m_mainFrame(0)
     , m_askedToTerminate(false)
     , m_pauseAfterDownloadState(DontPauseAfterDownload)
     , m_waitingForDebuggerState(NotWaitingForDebugger)
 {
     runningWorkerInstances().add(this);
 }
 
 WebEmbeddedWorkerImpl::~WebEmbeddedWorkerImpl()
 {
     // Prevent onScriptLoaderFinished from deleting 'this'.
     m_askedToTerminate = true;
 
     if (m_workerThread)
         m_workerThread->terminateAndWait();
 
     ASSERT(runningWorkerInstances().contains(this));
     runningWorkerInstances().remove(this);
     ASSERT(m_webView);
 
     // Detach the client before closing the view to avoid getting called back.
     toWebLocalFrameImpl(m_mainFrame)->setClient(0);
 
     m_webView->close();
     m_mainFrame->close();
+    if (m_loaderProxy)
+        m_loaderProxy->detachProvider(this);
 }
 
 void WebEmbeddedWorkerImpl::terminateAll()
 {
     HashSet<WebEmbeddedWorkerImpl*> instances = runningWorkerInstances();
     for (HashSet<WebEmbeddedWorkerImpl*>::iterator it = instances.begin(), itEnd = instances.end(); it != itEnd; ++it) {
         (*it)->terminateWorkerContext();
     }
 }
 
@@ skipping 77 matching lines @@
 }
 
 void WebEmbeddedWorkerImpl::postMessageToPageInspector(const String& message)
 {
     WorkerInspectorProxy::PageInspector* pageInspector = m_workerInspectorProxy->pageInspector();
     if (!pageInspector)
         return;
     pageInspector->dispatchMessageFromWorker(message);
 }
 
+void WebEmbeddedWorkerImpl::postTaskToLoader(PassOwnPtr<ExecutionContextTask> task)
+{
+    toWebLocalFrameImpl(m_mainFrame)->frame()->document()->postTask(task);
+}
+
+bool WebEmbeddedWorkerImpl::postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask> task)
+{
+    if (m_askedToTerminate || !m_workerThread)
+        return false;
+
+    m_workerThread->postTask(task);
+    return !m_workerThread->terminated();
+}
+
 void WebEmbeddedWorkerImpl::prepareShadowPageForLoader()
 {
     // Create 'shadow page', which is never displayed and is used mainly to
     // provide a context for loading on the main thread.
     //
     // FIXME: This does mostly same as WebSharedWorkerImpl::initializeLoader.
     // This code, and probably most of the code in this class should be shared
     // with SharedWorker.
     ASSERT(!m_webView);
     m_webView = WebView::create(0);
@@ skipping 127 matching lines @@
             m_mainScriptLoader->script(),
             startMode,
             document->contentSecurityPolicy()->deprecatedHeader(),
             document->contentSecurityPolicy()->deprecatedHeaderType(),
             starterOrigin,
             workerClients.release());
 
     m_mainScriptLoader.clear();
 
     m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *document, *m_workerContextClient);
-    m_loaderProxy = LoaderProxy::create(*this);
-    m_workerThread = ServiceWorkerThread::create(*m_loaderProxy, *m_workerGlobalScopeProxy, startupData.release());
+    m_loaderProxy = WorkerLoaderProxy::create(this);
+    m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy, startupData.release());
     m_workerThread->start();
     m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), scriptURL);
 }
 
 } // namespace blink