[Worker] Call prepareForShutdown ASAP when terminated forcibly

third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp

Index: third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
index 1bd3110db62fd7c7ba77ed16b894b06683bf8405..b49170d9b2b2245a223f4114f3f9475c8b1c3376 100644
--- a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
+++ b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
@@ -256,6 +256,9 @@ public:
     void onTearDown() override
     {
         postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&WorkerThreadableLoaderTestHelper::clearLoader, crossThreadUnretained(this)));

[nhiroki, 2016/09/05 03:26:45]

How about passing WaitableEvent object to clearLoader() and making it call
WaitableEvent::signal()? It's used only from here.

[yhirano, 2016/09/06 04:29:51]

That will change clearLoader's signature in for ThreadableLoaderTestHelper and
it will affect DocumentThreadableLoaderTestHelper as well. Do you think it's
better than the current code?

[nhiroki, 2016/09/06 05:06:40]

Ah, I missed the interface is shared with DocumentThreadableLoaderTestHelper.
Then, I'm ok with keeping the code as is :)

+        WaitableEvent event;
+        postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&signal, crossThreadUnretained(&event)));
+        event.wait();
         m_workerThread->terminateAndWait();
 
         // Needed to clean up the things on the main thread side and
@@ -328,6 +331,11 @@ private:
         m_workerThread->postTask(location, std::move(task));
     }
 
+    static void signal(WaitableEvent* event)
+    {
+        event->signal();
+    }
+
     RefPtr<SecurityOrigin> m_securityOrigin;
     std::unique_ptr<MockWorkerReportingProxy> m_mockWorkerReportingProxy;
     std::unique_ptr<WorkerThreadForTest> m_workerThread;