Index: third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp |
diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp b/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp |
index e1ba1aa00146af9ef646cfbe6d55ba9e7f1bcf2a..da4b301ee37423105f552f9fc934d130b04c7792 100644 |
--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp |
+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp |
@@ -85,8 +85,7 @@ bool MediaStreamSource::removeAudioConsumer( |
AudioDestinationConsumer* consumer) { |
ASSERT(m_requiresConsumer); |
MutexLocker locker(m_audioConsumersLock); |
- HeapHashSet<Member<AudioDestinationConsumer>>::iterator it = |
- m_audioConsumers.find(consumer); |
+ auto it = m_audioConsumers.find(consumer); |
if (it == m_audioConsumers.end()) |
return false; |
m_audioConsumers.erase(it); |
@@ -101,24 +100,19 @@ void MediaStreamSource::setAudioFormat(size_t numberOfChannels, |
float sampleRate) { |
ASSERT(m_requiresConsumer); |
MutexLocker locker(m_audioConsumersLock); |
- for (HeapHashSet<Member<AudioDestinationConsumer>>::iterator it = |
- m_audioConsumers.begin(); |
- it != m_audioConsumers.end(); ++it) |
- (*it)->setFormat(numberOfChannels, sampleRate); |
+ for (AudioDestinationConsumer* consumer : m_audioConsumers) |
+ consumer->setFormat(numberOfChannels, sampleRate); |
} |
void MediaStreamSource::consumeAudio(AudioBus* bus, size_t numberOfFrames) { |
ASSERT(m_requiresConsumer); |
MutexLocker locker(m_audioConsumersLock); |
- for (HeapHashSet<Member<AudioDestinationConsumer>>::iterator it = |
- m_audioConsumers.begin(); |
- it != m_audioConsumers.end(); ++it) |
- (*it)->consumeAudio(bus, numberOfFrames); |
+ for (AudioDestinationConsumer* consumer : m_audioConsumers) |
+ consumer->consumeAudio(bus, numberOfFrames); |
} |
DEFINE_TRACE(MediaStreamSource) { |
visitor->trace(m_observers); |
- visitor->trace(m_audioConsumers); |
} |
} // namespace blink |