Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(571)

Unified Diff: third_party/WebKit/Source/core/workers/WorkerThread.cpp

Issue 1902683005: Worker: Replace ASSERT macros with DCHECK macros (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 280d0848771dddb9cecc3bcd1d7d249447f4aae3..3c1725dfca3127a8a6f2673e8eccca2f33128244 100644
--- a/third_party/WebKit/Source/core/workers/WorkerThread.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerThread.cpp
@@ -63,8 +63,7 @@ public:
void willProcessTask() override
{
// No tasks should get executed after we have closed.
- WorkerGlobalScope* globalScope = m_workerThread->workerGlobalScope();
- ASSERT_UNUSED(globalScope, !globalScope || !globalScope->isClosing());
+ DCHECK(!m_workerThread->workerGlobalScope() || !m_workerThread->workerGlobalScope()->isClosing());
}
void didProcessTask() override
@@ -106,12 +105,12 @@ unsigned WorkerThread::workerThreadCount()
void WorkerThread::performTask(PassOwnPtr<ExecutionContextTask> task, bool isInstrumented)
{
- ASSERT(isCurrentThread());
+ DCHECK(isCurrentThread());
WorkerGlobalScope* globalScope = workerGlobalScope();
// If the thread is terminated before it had a chance initialize (see
// WorkerThread::Initialize()), we mustn't run any of the posted tasks.
if (!globalScope) {
- ASSERT(terminated());
+ DCHECK(terminated());
return;
}
@@ -124,7 +123,7 @@ PassOwnPtr<CrossThreadClosure> WorkerThread::createWorkerThreadTask(PassOwnPtr<E
if (isInstrumented)
isInstrumented = !task->taskNameForInstrumentation().isEmpty();
if (isInstrumented) {
- ASSERT(isCurrentThread());
+ DCHECK(isCurrentThread());
InspectorInstrumentation::asyncTaskScheduled(workerGlobalScope(), "Worker task", task.get());
}
return threadSafeBind(&WorkerThread::performTask, AllowCrossThreadAccess(this), task, isInstrumented);
@@ -155,13 +154,13 @@ WorkerThread::WorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, Work
WorkerThread::~WorkerThread()
{
MutexLocker lock(threadSetMutex());
- ASSERT(workerThreads().contains(this));
+ DCHECK(workerThreads().contains(this));
workerThreads().remove(this);
}
void WorkerThread::start(PassOwnPtr<WorkerThreadStartupData> startupData)
{
- ASSERT(isMainThread());
+ DCHECK(isMainThread());
if (m_started)
return;
@@ -236,7 +235,7 @@ void WorkerThread::initialize(PassOwnPtr<WorkerThreadStartupData> startupData)
void WorkerThread::shutdown()
{
- ASSERT(isCurrentThread());
+ DCHECK(isCurrentThread());
{
MutexLocker lock(m_threadStateMutex);
if (m_shutdown)
@@ -288,7 +287,7 @@ void WorkerThread::terminateAndWait()
WorkerGlobalScope* WorkerThread::workerGlobalScope()
{
- ASSERT(isCurrentThread());
+ DCHECK(isCurrentThread());
return m_workerGlobalScope.get();
}
@@ -300,7 +299,7 @@ bool WorkerThread::terminated()
void WorkerThread::terminateInternal()
{
- ASSERT(isMainThread());
+ DCHECK(isMainThread());
// Protect against this method, initialize() or termination via the global scope racing each other.
MutexLocker lock(m_threadStateMutex);
@@ -404,7 +403,7 @@ void WorkerThread::appendDebuggerTask(PassOwnPtr<CrossThreadClosure> task)
void WorkerThread::runDebuggerTask(PassOwnPtr<CrossThreadClosure> task)
{
- ASSERT(isCurrentThread());
+ DCHECK(isCurrentThread());
InspectorTaskRunner::IgnoreInterruptsScope scope(m_inspectorTaskRunner.get());
{
MutexLocker lock(m_threadStateMutex);
« no previous file with comments | « third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698