(WIP) ServiceWorker: Remove unnecessary WorkerThread::terminateAndWait() call

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 55 matching lines @@
 #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"
+#include "wtf/WTF.h"
 #include <memory>
 
 namespace blink {
 
 WebEmbeddedWorker* WebEmbeddedWorker::create(WebServiceWorkerContextClient* client, WebWorkerContentSettingsClientProxy* contentSettingsClient)
 {
     return new WebEmbeddedWorkerImpl(wrapUnique(client), wrapUnique(contentSettingsClient));
 }
 
 static HashSet<WebEmbeddedWorkerImpl*>& runningWorkerInstances()
 {
     DEFINE_STATIC_LOCAL(HashSet<WebEmbeddedWorkerImpl*>, set, ());
     return set;
 }
 
 WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(std::unique_ptr<WebServiceWorkerContextClient> client, std::unique_ptr<WebWorkerContentSettingsClientProxy> contentSettingsClient)
     : m_workerContextClient(std::move(client))
     , m_contentSettingsClient(std::move(contentSettingsClient))
     , m_workerInspectorProxy(WorkerInspectorProxy::create())
     , m_webView(nullptr)
     , m_mainFrame(nullptr)
     , m_loadingShadowPage(false)
     , m_askedToTerminate(false)
     , m_pauseAfterDownloadState(DontPauseAfterDownload)
     , m_waitingForDebuggerState(NotWaitingForDebugger)
 {
+    DCHECK(isMainThread());
     runningWorkerInstances().add(this);
 }
 
 WebEmbeddedWorkerImpl::~WebEmbeddedWorkerImpl()
 {
-    // Prevent onScriptLoaderFinished from deleting 'this'.
-    m_askedToTerminate = true;
+    DCHECK(isMainThread());
 
-    if (m_workerThread)
-        m_workerThread->terminateAndWait();
+    // Worker thread termination must be done before this point.
+    DCHECK(m_askedToTerminate);
 
     DCHECK(runningWorkerInstances().contains(this));
     runningWorkerInstances().remove(this);
     DCHECK(m_webView);
 
     // Detach the client before closing the view to avoid getting called back.
     m_mainFrame->setClient(0);
 
     if (m_workerGlobalScopeProxy) {
         m_workerGlobalScopeProxy->detach();
@@ skipping 32 matching lines @@
     if (data.pauseAfterDownloadMode == WebEmbeddedWorkerStartData::PauseAfterDownload)
         m_pauseAfterDownloadState = DoPauseAfterDownload;
     prepareShadowPageForLoader();
 }
 
 void WebEmbeddedWorkerImpl::terminateWorkerContext()
 {
     if (m_askedToTerminate)
         return;
     m_askedToTerminate = true;
-    if (m_loadingShadowPage) {
-        // This deletes 'this'.
-        m_workerContextClient->workerContextFailedToStart();
+
+    if (m_workerThread) {
+        m_workerThread->terminate();
+        m_workerInspectorProxy->workerThreadTerminated();
+        // WebServiceWorkerContextClient::workerContextDestroyed() that deletes
+        // 'this' will be called after worker thread termination is done.
         return;
     }
+
     if (m_mainScriptLoader) {
         m_mainScriptLoader->cancel();
         m_mainScriptLoader.clear();
-        // This deletes 'this'.
-        m_workerContextClient->workerContextFailedToStart();
-        return;
     }
-    if (!m_workerThread) {
-        // The worker thread has not been created yet if the worker is asked to
-        // terminate during waiting for debugger or paused after download.
-        DCHECK(m_workerStartData.waitForDebuggerMode == WebEmbeddedWorkerStartData::WaitForDebugger || m_pauseAfterDownloadState == IsPausedAfterDownload);
-        // This deletes 'this'.
-        m_workerContextClient->workerContextFailedToStart();
-        return;
-    }
-    m_workerThread->terminate();
-    m_workerInspectorProxy->workerThreadTerminated();
+
+    // This deletes 'this'.
+    m_workerContextClient->workerContextFailedToStart();
 }
 
 void WebEmbeddedWorkerImpl::resumeAfterDownload()
 {
     DCHECK(!m_askedToTerminate);
     DCHECK_EQ(m_pauseAfterDownloadState, IsPausedAfterDownload);
 
     m_pauseAfterDownloadState = DontPauseAfterDownload;
     startWorkerThread();
 }
@@ skipping 248 matching lines @@
     m_mainThreadTaskRunners = ParentFrameTaskRunners::create(nullptr);
 
     m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *document, *m_workerContextClient);
     m_loaderProxy = WorkerLoaderProxy::create(this);
     m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy);
     m_workerThread->start(std::move(startupData));
     m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), scriptURL);
 }
 
 } // namespace blink