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

Unified Diff: Source/modules/webaudio/AudioSummingJunction.cpp

Issue 460303003: Merge m_didCallDispose and m_isMarkedForDeletion flags into one flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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
« no previous file with comments | « Source/modules/webaudio/AudioSummingJunction.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webaudio/AudioSummingJunction.cpp
diff --git a/Source/modules/webaudio/AudioSummingJunction.cpp b/Source/modules/webaudio/AudioSummingJunction.cpp
index 251133082de8e818f98e33d8cebcf76a84d906c9..35e2e59c305c9b6a497504a5f5a4e558a2421019 100644
--- a/Source/modules/webaudio/AudioSummingJunction.cpp
+++ b/Source/modules/webaudio/AudioSummingJunction.cpp
@@ -60,11 +60,7 @@ void AudioSummingJunction::trace(Visitor* visitor)
void AudioSummingJunction::changedOutputs()
{
ASSERT(context()->isGraphOwner());
-#if ENABLE(OILPAN)
- if (!m_renderingStateNeedUpdating) {
-#else
if (!m_renderingStateNeedUpdating && canUpdateState()) {
-#endif
context()->markSummingJunctionDirty(this);
m_renderingStateNeedUpdating = true;
}
@@ -73,11 +69,7 @@ void AudioSummingJunction::changedOutputs()
void AudioSummingJunction::updateRenderingState()
{
ASSERT(context()->isAudioThread() && context()->isGraphOwner());
-#if ENABLE(OILPAN)
- if (m_renderingStateNeedUpdating) {
-#else
if (m_renderingStateNeedUpdating && canUpdateState()) {
-#endif
// Copy from m_outputs to m_renderingOutputs.
m_renderingOutputs.resize(m_outputs.size());
unsigned j = 0;
« no previous file with comments | « Source/modules/webaudio/AudioSummingJunction.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698