Index: Source/core/workers/WorkerThread.cpp |
diff --git a/Source/core/workers/WorkerThread.cpp b/Source/core/workers/WorkerThread.cpp |
index ed92be4ec832025b560f11b7cb8201380bc9f4c2..ff101dd1e8a5f4749ca24b0bb1e505e6c8bed7e5 100644 |
--- a/Source/core/workers/WorkerThread.cpp |
+++ b/Source/core/workers/WorkerThread.cpp |
@@ -314,8 +314,8 @@ |
} |
m_microtaskRunner = adoptPtr(new WorkerMicrotaskRunner(this)); |
- initializeBackingThread(); |
backingThread().addTaskObserver(m_microtaskRunner.get()); |
+ backingThread().initialize(); |
m_isolate = initializeIsolate(); |
m_workerGlobalScope = createWorkerGlobalScope(startupData); |
@@ -373,9 +373,8 @@ |
m_workerGlobalScope = nullptr; |
backingThread().removeTaskObserver(m_microtaskRunner.get()); |
- shutdownBackingThread(); |
+ backingThread().shutdown(); |
destroyIsolate(); |
- m_isolate = nullptr; |
m_microtaskRunner = nullptr; |
@@ -439,7 +438,6 @@ |
} |
// Ensure that tasks are being handled by thread event loop. If script execution weren't forbidden, a while(1) loop in JS could keep the thread alive forever. |
- m_workerGlobalScope->script()->willScheduleExecutionTermination(); |
terminateV8Execution(); |
InspectorInstrumentation::didKillAllExecutionContextTasks(m_workerGlobalScope.get()); |
@@ -509,18 +507,6 @@ |
backingThread().postDelayedTask(location, WorkerThreadTask::create(*this, task, true).leakPtr(), delayMs); |
} |
-void WorkerThread::initializeBackingThread() |
-{ |
- ASSERT(isCurrentThread()); |
- backingThread().initialize(); |
-} |
- |
-void WorkerThread::shutdownBackingThread() |
-{ |
- ASSERT(isCurrentThread()); |
- backingThread().shutdown(); |
-} |
- |
v8::Isolate* WorkerThread::initializeIsolate() |
{ |
ASSERT(isCurrentThread()); |
@@ -547,11 +533,13 @@ |
{ |
ASSERT(isCurrentThread()); |
V8PerIsolateData::destroy(m_isolate); |
+ m_isolate = nullptr; |
} |
void WorkerThread::terminateV8Execution() |
{ |
ASSERT(isMainThread()); |
+ m_workerGlobalScope->script()->willScheduleExecutionTermination(); |
v8::V8::TerminateExecution(m_isolate); |
} |