WorkerThread: drop unnecessary interfaces to simplify

Source/core/workers/WorkerThread.cpp

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 209 matching lines @@
         m_microtaskRunner = adoptPtr(new WorkerMicrotaskRunner(this));
         backingThread().addTaskObserver(m_microtaskRunner.get());
         backingThread().initialize();
 
         m_isolate = initializeIsolate();
         m_workerGlobalScope = createWorkerGlobalScope(startupData);
         m_workerGlobalScope->scriptLoaded(sourceCode.length(), cachedMetaData.get() ? cachedMetaData->size() : 0);
     }
     m_webScheduler = backingThread().platformThread().scheduler();
 
-    // The corresponding call to stopRunLoop() is in ~WorkerScriptController().
+    // The corresponding call to didStopRunLoop() is in ~WorkerScriptController().
     didStartRunLoop();
 
     // Notify proxy that a new WorkerGlobalScope has been created and started.
     m_workerReportingProxy.workerGlobalScopeStarted(m_workerGlobalScope.get());
 
     WorkerScriptController* script = m_workerGlobalScope->script();
     if (!script->isExecutionForbidden())
         script->initializeContextIfNeeded();
     m_workerGlobalScope->workerInspectorController()->workerContextInitialized(startMode == PauseWorkerGlobalScopeOnStart);
 
@@ skipping 37 matching lines @@
 
     m_microtaskRunner = nullptr;
 
     // Notify the proxy that the WorkerGlobalScope has been disposed of.
     // This can free this thread object, hence it must not be touched afterwards.
     workerReportingProxy().workerThreadTerminated();
 
     m_terminationEvent->signal();
 }
 
-
-void WorkerThread::stop()
+void WorkerThread::terminate()
 {
-    // Prevent the deadlock between GC and an attempt to stop a thread.
+    // Prevent the deadlock between GC and an attempt to terminate a thread.
     SafePointScope safePointScope(ThreadState::HeapPointersOnStack);
-    stopInternal();
+    terminateInternal();
 }
 
 void WorkerThread::terminateAndWait()
 {
-    stop();
+    terminate();
     m_terminationEvent->wait();
 }
 
 bool WorkerThread::terminated()
 {
     MutexLocker lock(m_threadStateMutex);
     return m_terminated;
 }
 
-void WorkerThread::stopInternal()
+void WorkerThread::terminateInternal()
 {
     // Protect against this method, initialize() or termination via the global scope racing each other.
     MutexLocker lock(m_threadStateMutex);
 
-    // If stop has already been called, just return.
+    // If terminateInternal has already been called, just return.
     if (m_terminated)
         return;
     m_terminated = true;
 
     // Signal the thread to notify that the thread's stopping.
     if (m_shutdownEvent)
         m_shutdownEvent->signal();
 
     // If the thread has already initiated shut down, just return.
     if (m_shutdown)
@@ skipping 24 matching lines @@
     ASSERT(isCurrentThread());
     Platform::current()->didStopWorkerRunLoop();
 }
 
 void WorkerThread::terminateAndWaitForAllWorkers()
 {
     // Keep this lock to prevent WorkerThread instances from being destroyed.
     MutexLocker lock(threadSetMutex());
     HashSet<WorkerThread*> threads = workerThreads();
     for (WorkerThread* thread : threads)
-        thread->stopInternal();
+        thread->terminateInternal();
 
     for (WorkerThread* thread : threads)
-        thread->terminationEvent()->wait();
+        thread->m_terminationEvent->wait();
 }
 
 bool WorkerThread::isCurrentThread()
 {
     return m_started && backingThread().isCurrentThread();
 }
 
 void WorkerThread::performIdleWork(double deadlineSeconds)
 {
     double gcDeadlineSeconds = deadlineSeconds;
@@ skipping 100 matching lines @@
     InspectorInstrumentation::didLeaveNestedRunLoop(m_workerGlobalScope.get());
 }
 
 void WorkerThread::setWorkerInspectorController(WorkerInspectorController* workerInspectorController)
 {
     MutexLocker locker(m_workerInspectorControllerMutex);
     m_workerInspectorController = workerInspectorController;
 }
 
 } // namespace blink