| Index: Source/core/workers/WorkerThread.cpp
|
| diff --git a/Source/core/workers/WorkerThread.cpp b/Source/core/workers/WorkerThread.cpp
|
| index 69d26a5b8871f1dc5d0e94ae47a0381e0592f315..566ce066c9b35978c3e8b5e30190d1bd9c522989 100644
|
| --- a/Source/core/workers/WorkerThread.cpp
|
| +++ b/Source/core/workers/WorkerThread.cpp
|
| @@ -170,7 +170,7 @@
|
| // Now queue the task as a cancellable one.
|
| OwnPtr<WorkerThreadCancelableTask> task = WorkerThreadCancelableTask::create(bind(&WorkerSharedTimer::OnTimeout, this));
|
| m_lastQueuedTask = task->createWeakPtr();
|
| - m_workerThread->postDelayedTask(FROM_HERE, task.release(), delay);
|
| + m_workerThread->postDelayedTask(task.release(), delay);
|
| }
|
|
|
| virtual void stop()
|
| @@ -352,7 +352,7 @@
|
|
|
| postInitialize();
|
|
|
| - postDelayedTask(FROM_HERE, createSameThreadTask(&WorkerThread::idleHandler, this), kShortIdleHandlerDelayMs);
|
| + postDelayedTask(createSameThreadTask(&WorkerThread::idleHandler, this), kShortIdleHandlerDelayMs);
|
| }
|
|
|
| void WorkerThread::cleanup()
|
| @@ -423,7 +423,7 @@
|
|
|
| // Stick a shutdown command at the end of the queue, so that we deal
|
| // with all the cleanup tasks the databases post first.
|
| - workerGlobalScope->postTask(FROM_HERE, WorkerThreadShutdownFinishTask::create());
|
| + workerGlobalScope->postTask(WorkerThreadShutdownFinishTask::create());
|
| }
|
|
|
| virtual bool isCleanupTask() const { return true; }
|
| @@ -474,7 +474,7 @@
|
| m_workerGlobalScope->script()->scheduleExecutionTermination();
|
| InspectorInstrumentation::didKillAllExecutionContextTasks(m_workerGlobalScope.get());
|
| m_debuggerMessageQueue.kill();
|
| - postTask(FROM_HERE, WorkerThreadShutdownStartTask::create());
|
| + postTask(WorkerThreadShutdownStartTask::create());
|
| }
|
|
|
| void WorkerThread::didStartRunLoop()
|
| @@ -519,23 +519,23 @@
|
| delay = kShortIdleHandlerDelayMs;
|
| }
|
|
|
| - postDelayedTask(FROM_HERE, createSameThreadTask(&WorkerThread::idleHandler, this), delay);
|
| -}
|
| -
|
| -void WorkerThread::postTask(const WebTraceLocation& location, PassOwnPtr<ExecutionContextTask> task)
|
| -{
|
| - m_thread->postTask(location, WorkerThreadTask::create(*this, task, true).leakPtr());
|
| -}
|
| -
|
| -void WorkerThread::postDelayedTask(const WebTraceLocation& location, PassOwnPtr<ExecutionContextTask> task, long long delayMs)
|
| -{
|
| - m_thread->postDelayedTask(location, WorkerThreadTask::create(*this, task, true).leakPtr(), delayMs);
|
| -}
|
| -
|
| -void WorkerThread::postDebuggerTask(const WebTraceLocation& location, PassOwnPtr<ExecutionContextTask> task)
|
| + postDelayedTask(createSameThreadTask(&WorkerThread::idleHandler, this), delay);
|
| +}
|
| +
|
| +void WorkerThread::postTask(PassOwnPtr<ExecutionContextTask> task)
|
| +{
|
| + m_thread->postTask(FROM_HERE, WorkerThreadTask::create(*this, task, true).leakPtr());
|
| +}
|
| +
|
| +void WorkerThread::postDelayedTask(PassOwnPtr<ExecutionContextTask> task, long long delayMs)
|
| +{
|
| + m_thread->postDelayedTask(FROM_HERE, WorkerThreadTask::create(*this, task, true).leakPtr(), delayMs);
|
| +}
|
| +
|
| +void WorkerThread::postDebuggerTask(PassOwnPtr<ExecutionContextTask> task)
|
| {
|
| m_debuggerMessageQueue.append(WorkerThreadTask::create(*this, task, false));
|
| - postTask(location, RunDebuggerQueueTask::create(this));
|
| + postTask(RunDebuggerQueueTask::create(this));
|
| }
|
|
|
| MessageQueueWaitResult WorkerThread::runDebuggerTask(WaitMode waitMode)
|
|
|