Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / exported / WebMediaStreamSource.cpp

diff --git a/src/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp b/src/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp
index 8be20e9..b7db6a8 100644 (file)
--- a/src/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp
+++ b/src/third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp
@@ -166,11 +166,11 @@ bool WebMediaStreamSource::requiresAudioConsumer() const
     return m_private->requiresAudioConsumer();
 }
 
-class ConsumerWrapper : public AudioDestinationConsumer {
+class ConsumerWrapper FINAL : public AudioDestinationConsumer {
 public:
-    static PassRefPtr<ConsumerWrapper> create(WebAudioDestinationConsumer* consumer)
+    static ConsumerWrapper* create(WebAudioDestinationConsumer* consumer)
     {
-        return adoptRef(new ConsumerWrapper(consumer));
+        return new ConsumerWrapper(consumer);
     }
 
     virtual void setFormat(size_t numberOfChannels, float sampleRate) OVERRIDE;
@@ -217,8 +217,8 @@ bool WebMediaStreamSource::removeAudioConsumer(WebAudioDestinationConsumer* cons
     ASSERT(isMainThread());
     ASSERT(!m_private.isNull() && consumer);
 
-    const Vector<RefPtr<AudioDestinationConsumer> >& consumers = m_private->audioConsumers();
-    for (Vector<RefPtr<AudioDestinationConsumer> >::const_iterator it = consumers.begin(); it != consumers.end(); ++it) {
+    const HeapHashSet<Member<AudioDestinationConsumer> >& consumers = m_private->audioConsumers();
+    for (HeapHashSet<Member<AudioDestinationConsumer> >::const_iterator it = consumers.begin(); it != consumers.end(); ++it) {
         ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get());
         if (wrapper->consumer() == consumer) {
             m_private->removeAudioConsumer(wrapper);