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

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

Issue 458923003: Remove AudioNode::isMarkedForDeletion from oilpan builds (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 12e5a300995f4b81a74530d7c2b032255ab0e417..251133082de8e818f98e33d8cebcf76a84d906c9 100644
--- a/Source/modules/webaudio/AudioSummingJunction.cpp
+++ b/Source/modules/webaudio/AudioSummingJunction.cpp
@@ -60,7 +60,11 @@ void AudioSummingJunction::trace(Visitor* visitor)
void AudioSummingJunction::changedOutputs()
zerny-chromium 2014/08/11 07:53:28 I'm not sure if this can be called from a code pat
{
ASSERT(context()->isGraphOwner());
+#if ENABLE(OILPAN)
+ if (!m_renderingStateNeedUpdating) {
+#else
if (!m_renderingStateNeedUpdating && canUpdateState()) {
+#endif
context()->markSummingJunctionDirty(this);
m_renderingStateNeedUpdating = true;
}
@@ -69,8 +73,11 @@ 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