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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/modules/webaudio/AudioSummingJunction.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012, Google Inc. All rights reserved. 2 * Copyright (C) 2012, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 if (m_renderingStateNeedUpdating && m_context.get()) 50 if (m_renderingStateNeedUpdating && m_context.get())
51 m_context->removeMarkedSummingJunction(this); 51 m_context->removeMarkedSummingJunction(this);
52 #endif 52 #endif
53 } 53 }
54 54
55 void AudioSummingJunction::trace(Visitor* visitor) 55 void AudioSummingJunction::trace(Visitor* visitor)
56 { 56 {
57 visitor->trace(m_context); 57 visitor->trace(m_context);
58 } 58 }
59 59
60 void AudioSummingJunction::changedOutputs() 60 void AudioSummingJunction::changedOutputs()
zerny-chromium 2014/08/11 07:53:28 I'm not sure if this can be called from a code pat
61 { 61 {
62 ASSERT(context()->isGraphOwner()); 62 ASSERT(context()->isGraphOwner());
63 #if ENABLE(OILPAN)
64 if (!m_renderingStateNeedUpdating) {
65 #else
63 if (!m_renderingStateNeedUpdating && canUpdateState()) { 66 if (!m_renderingStateNeedUpdating && canUpdateState()) {
67 #endif
64 context()->markSummingJunctionDirty(this); 68 context()->markSummingJunctionDirty(this);
65 m_renderingStateNeedUpdating = true; 69 m_renderingStateNeedUpdating = true;
66 } 70 }
67 } 71 }
68 72
69 void AudioSummingJunction::updateRenderingState() 73 void AudioSummingJunction::updateRenderingState()
70 { 74 {
71 ASSERT(context()->isAudioThread() && context()->isGraphOwner()); 75 ASSERT(context()->isAudioThread() && context()->isGraphOwner());
72 76 #if ENABLE(OILPAN)
77 if (m_renderingStateNeedUpdating) {
78 #else
73 if (m_renderingStateNeedUpdating && canUpdateState()) { 79 if (m_renderingStateNeedUpdating && canUpdateState()) {
80 #endif
74 // Copy from m_outputs to m_renderingOutputs. 81 // Copy from m_outputs to m_renderingOutputs.
75 m_renderingOutputs.resize(m_outputs.size()); 82 m_renderingOutputs.resize(m_outputs.size());
76 unsigned j = 0; 83 unsigned j = 0;
77 for (HashSet<AudioNodeOutput*>::iterator i = m_outputs.begin(); i != m_o utputs.end(); ++i, ++j) { 84 for (HashSet<AudioNodeOutput*>::iterator i = m_outputs.begin(); i != m_o utputs.end(); ++i, ++j) {
78 AudioNodeOutput* output = *i; 85 AudioNodeOutput* output = *i;
79 m_renderingOutputs[j] = output; 86 m_renderingOutputs[j] = output;
80 output->updateRenderingState(); 87 output->updateRenderingState();
81 } 88 }
82 89
83 didUpdate(); 90 didUpdate();
84 91
85 m_renderingStateNeedUpdating = false; 92 m_renderingStateNeedUpdating = false;
86 } 93 }
87 } 94 }
88 95
89 } // namespace blink 96 } // namespace blink
90 97
91 #endif // ENABLE(WEB_AUDIO) 98 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« 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