| Index: Source/core/workers/WorkerThread.cpp
|
| diff --git a/Source/core/workers/WorkerThread.cpp b/Source/core/workers/WorkerThread.cpp
|
| index 5be4464d3cd23ed3aab1fb1704f5741ad391f8c2..93d28e27d0dde7737159a5f87c36e361a29b9efb 100644
|
| --- a/Source/core/workers/WorkerThread.cpp
|
| +++ b/Source/core/workers/WorkerThread.cpp
|
| @@ -117,7 +117,7 @@ public:
|
| : m_workerThread(workerThread)
|
| , m_nextFireTime(0.0)
|
| , m_running(false)
|
| - , m_lastQueuedTask(0)
|
| + , m_lastQueuedTask(nullptr)
|
| { }
|
|
|
| typedef void (*SharedTimerFunction)();
|
| @@ -447,11 +447,11 @@ void WorkerThread::terminateAndWaitForAllWorkers()
|
| // Keep this lock to prevent WorkerThread instances from being destroyed.
|
| MutexLocker lock(threadSetMutex());
|
| HashSet<WorkerThread*> threads = workerThreads();
|
| - for (HashSet<WorkerThread*>::iterator itr = threads.begin(); itr != threads.end(); ++itr)
|
| - (*itr)->stopInShutdownSequence();
|
| + for (WorkerThread* thread : threads)
|
| + thread->stopInShutdownSequence();
|
|
|
| - for (HashSet<WorkerThread*>::iterator itr = threads.begin(); itr != threads.end(); ++itr)
|
| - (*itr)->terminationEvent()->wait();
|
| + for (WorkerThread* thread : threads)
|
| + thread->terminationEvent()->wait();
|
| }
|
|
|
| bool WorkerThread::isCurrentThread() const
|
|
|