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

Unified Diff: third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.cpp

Issue 2159403002: Replace ASSERT with DCHECK in WebAudio (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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
Index: third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.cpp
diff --git a/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.cpp b/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.cpp
index 89358182b59b4a6e413f362bf00243aba4535ac2..659be155fbd995e8dc6c7982925d553656ccb4f2 100644
--- a/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/DeferredTaskHandler.cpp
@@ -34,7 +34,7 @@ namespace blink {
void DeferredTaskHandler::lock()
{
// Don't allow regular lock in real-time audio thread.
- ASSERT(!isAudioThread());
+ DCHECK(!isAudioThread());
m_contextGraphMutex.lock();
}
@@ -42,10 +42,10 @@ bool DeferredTaskHandler::tryLock()
{
// Try to catch cases of using try lock on main thread
// - it should use regular lock.
- ASSERT(isAudioThread());
+ DCHECK(isAudioThread());
if (!isAudioThread()) {
// In release build treat tryLock() as lock() (since above
- // ASSERT(isAudioThread) never fires) - this is the best we can do.
+ // DCHECK(isAudioThread) never fires) - this is the best we can do.
lock();
return true;
}
@@ -77,13 +77,13 @@ bool DeferredTaskHandler::isGraphOwner()
void DeferredTaskHandler::addDeferredBreakConnection(AudioHandler& node)
{
- ASSERT(isAudioThread());
+ DCHECK(isAudioThread());
m_deferredBreakConnectionList.append(&node);
}
void DeferredTaskHandler::breakConnections()
{
- ASSERT(isAudioThread());
+ DCHECK(isAudioThread());
ASSERT(isGraphOwner());
for (unsigned i = 0; i < m_deferredBreakConnectionList.size(); ++i)
@@ -99,7 +99,7 @@ void DeferredTaskHandler::markSummingJunctionDirty(AudioSummingJunction* summing
void DeferredTaskHandler::removeMarkedSummingJunction(AudioSummingJunction* summingJunction)
{
- ASSERT(isMainThread());
+ DCHECK(isMainThread());
AutoLocker locker(*this);
m_dirtySummingJunctions.remove(summingJunction);
}
@@ -107,14 +107,14 @@ void DeferredTaskHandler::removeMarkedSummingJunction(AudioSummingJunction* summ
void DeferredTaskHandler::markAudioNodeOutputDirty(AudioNodeOutput* output)
{
ASSERT(isGraphOwner());
- ASSERT(isMainThread());
+ DCHECK(isMainThread());
m_dirtyAudioNodeOutputs.add(output);
}
void DeferredTaskHandler::removeMarkedAudioNodeOutput(AudioNodeOutput* output)
{
ASSERT(isGraphOwner());
- ASSERT(isMainThread());
+ DCHECK(isMainThread());
m_dirtyAudioNodeOutputs.remove(output);
}
@@ -173,7 +173,7 @@ void DeferredTaskHandler::updateAutomaticPullNodes()
void DeferredTaskHandler::processAutomaticPullNodes(size_t framesToProcess)
{
- ASSERT(isAudioThread());
+ DCHECK(isAudioThread());
for (unsigned i = 0; i < m_renderingAutomaticPullNodes.size(); ++i)
m_renderingAutomaticPullNodes[i]->processIfNecessary(framesToProcess);
@@ -192,10 +192,10 @@ PassRefPtr<DeferredTaskHandler> DeferredTaskHandler::create()
DeferredTaskHandler::~DeferredTaskHandler()
{
- ASSERT(!m_automaticPullNodes.size());
+ DCHECK(!m_automaticPullNodes.size());
if (m_automaticPullNodesNeedUpdating)
m_renderingAutomaticPullNodes.resize(m_automaticPullNodes.size());
- ASSERT(!m_renderingAutomaticPullNodes.size());
+ DCHECK(!m_renderingAutomaticPullNodes.size());
}
void DeferredTaskHandler::handleDeferredTasks()
@@ -229,15 +229,15 @@ DeferredTaskHandler::OfflineGraphAutoLocker::OfflineGraphAutoLocker(OfflineAudio
void DeferredTaskHandler::addRenderingOrphanHandler(PassRefPtr<AudioHandler> handler)
{
- ASSERT(handler);
- ASSERT(!m_renderingOrphanHandlers.contains(handler));
+ DCHECK(handler);
+ DCHECK(!m_renderingOrphanHandlers.contains(handler));
m_renderingOrphanHandlers.append(handler);
}
void DeferredTaskHandler::requestToDeleteHandlersOnMainThread()
{
ASSERT(isGraphOwner());
- ASSERT(isAudioThread());
+ DCHECK(isAudioThread());
if (m_renderingOrphanHandlers.isEmpty())
return;
m_deletableOrphanHandlers.appendVector(m_renderingOrphanHandlers);
@@ -247,14 +247,14 @@ void DeferredTaskHandler::requestToDeleteHandlersOnMainThread()
void DeferredTaskHandler::deleteHandlersOnMainThread()
{
- ASSERT(isMainThread());
+ DCHECK(isMainThread());
AutoLocker locker(*this);
m_deletableOrphanHandlers.clear();
}
void DeferredTaskHandler::clearHandlersToBeDeleted()
{
- ASSERT(isMainThread());
+ DCHECK(isMainThread());
AutoLocker locker(*this);
m_renderingOrphanHandlers.clear();
m_deletableOrphanHandlers.clear();
@@ -262,7 +262,7 @@ void DeferredTaskHandler::clearHandlersToBeDeleted()
void DeferredTaskHandler::setAudioThreadToCurrentThread()
{
- ASSERT(!isMainThread());
+ DCHECK(!isMainThread());
ThreadIdentifier thread = currentThread();
releaseStore(&m_audioThread, thread);
}

Powered by Google App Engine
This is Rietveld 408576698