Index: third_party/WebKit/Source/core/workers/WorkerThread.cpp |
diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.cpp b/third_party/WebKit/Source/core/workers/WorkerThread.cpp |
index f9897d6fd64c0b86189f3ace65db4e990b7dcadd..9588cd07371729bf75118303720b776d55716a71 100644 |
--- a/third_party/WebKit/Source/core/workers/WorkerThread.cpp |
+++ b/third_party/WebKit/Source/core/workers/WorkerThread.cpp |
@@ -102,7 +102,7 @@ private: |
return; |
} |
- m_workerThread->forciblyTerminateExecution(); |
+ m_workerThread->isolate()->TerminateExecution(); |
DCHECK_EQ(WorkerThread::ExitCode::NotTerminated, m_workerThread->m_exitCode); |
m_workerThread->m_exitCode = WorkerThread::ExitCode::AsyncForciblyTerminated; |
} |
@@ -382,7 +382,7 @@ void WorkerThread::terminateInternal(TerminationMode mode) |
if (mode == TerminationMode::Forcible && m_exitCode == ExitCode::NotTerminated) { |
DCHECK(m_scheduledForceTerminationTask); |
m_scheduledForceTerminationTask.reset(); |
- forciblyTerminateExecution(); |
+ isolate()->TerminateExecution(); |
DCHECK_EQ(ExitCode::NotTerminated, m_exitCode); |
m_exitCode = ExitCode::SyncForciblyTerminated; |
} |
@@ -419,7 +419,7 @@ void WorkerThread::terminateInternal(TerminationMode mode) |
if (shouldScheduleToTerminateExecution) { |
if (mode == TerminationMode::Forcible) { |
- forciblyTerminateExecution(); |
+ isolate()->TerminateExecution(); |
DCHECK_EQ(ExitCode::NotTerminated, m_exitCode); |
m_exitCode = ExitCode::SyncForciblyTerminated; |
} else { |
@@ -441,13 +441,6 @@ void WorkerThread::terminateInternal(TerminationMode mode) |
workerBackingThread().backingThread().postTask(BLINK_FROM_HERE, crossThreadBind(&WorkerThread::performShutdownOnWorkerThread, crossThreadUnretained(this))); |
} |
-void WorkerThread::forciblyTerminateExecution() |
-{ |
- DCHECK(m_globalScope); |
- m_globalScope->scriptController()->willScheduleExecutionTermination(); |
- isolate()->TerminateExecution(); |
-} |
- |
bool WorkerThread::isInShutdown() |
{ |
// Check if we've started termination or shutdown sequence. Avoid acquiring |