Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/modules/mediastream/MediaStream.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Ericsson AB. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 10 matching lines @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/mediastream/MediaStream.h"
 
 #include "core/dom/Event.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/platform/UUID.h"
 #include "core/platform/mediastream/MediaStreamCenter.h"
 #include "core/platform/mediastream/MediaStreamSource.h"
 #include "modules/mediastream/MediaStreamRegistry.h"
 #include "modules/mediastream/MediaStreamTrackEvent.h"
-#include "public/platform/WebMediaStream.h"
-#include "public/platform/WebMediaStreamSource.h"
-#include "public/platform/WebMediaStreamTrack.h"
 
 namespace WebCore {
 
 static bool containsSource(MediaStreamSourceVector& sourceVector, MediaStreamSource* source)
 {
     for (size_t i = 0; i < sourceVector.size(); ++i) {
         if (source->id() == sourceVector[i]->id())
             return true;
     }
     return false;
 }
 
 static void processTrack(MediaStreamTrack* track, MediaStreamSourceVector& sourceVector)
 {
     if (track->ended())
         return;
 
     MediaStreamSource* source = track->component()->source();
     if (!containsSource(sourceVector, source))
         sourceVector.append(source);
 }
 
 static PassRefPtr<MediaStream> createFromSourceVectors(ScriptExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
 {
-    WebKit::WebMediaStream webStream = WebKit::WebMediaStream(createCanonicalUUIDString(), audioSources, videoSources);
-    MediaStreamCenter::instance().didCreateMediaStream(webStream);
+    RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(audioSources, videoSources);
+    MediaStreamCenter::instance().didCreateMediaStream(descriptor.get());
 
-    return MediaStream::create(context, webStream);
+    return MediaStream::create(context, descriptor.release());
 }
 
 PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext* context)
 {
     MediaStreamSourceVector audioSources;
     MediaStreamSourceVector videoSources;
 
     return createFromSourceVectors(context, audioSources, videoSources);
 }
 
@@ skipping 17 matching lines @@
 {
     MediaStreamSourceVector audioSources;
     MediaStreamSourceVector videoSources;
 
     for (size_t i = 0; i < tracks.size(); ++i)
         processTrack(tracks[i].get(), tracks[i]->kind() == "audio" ? audioSources : videoSources);
 
     return createFromSourceVectors(context, audioSources, videoSources);
 }
 
-PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext* context, WebKit::WebMediaStream webStream)
+PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
 {
-    return adoptRef(new MediaStream(context, webStream));
+    return adoptRef(new MediaStream(context, streamDescriptor));
 }
 
-MediaStream::MediaStream(ScriptExecutionContext* context, WebKit::WebMediaStream webStream)
+MediaStream::MediaStream(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
     : ContextDestructionObserver(context)
     , m_stopped(false)
-    , m_webStream(webStream)
+    , m_descriptor(streamDescriptor)
     , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired)
 {
     ScriptWrappable::init(this);
-    m_webStream.setClient(this);
+    m_descriptor->setClient(this);
 
-    size_t numberOfAudioTracks = m_webStream.numberOfAudioComponents();
+    size_t numberOfAudioTracks = m_descriptor->numberOfAudioComponents();
     m_audioTracks.reserveCapacity(numberOfAudioTracks);
     for (size_t i = 0; i < numberOfAudioTracks; i++)
-        m_audioTracks.append(MediaStreamTrack::create(context, m_webStream.audioComponent(i)));
+        m_audioTracks.append(MediaStreamTrack::create(context, m_descriptor->audioComponent(i)));
 
-    size_t numberOfVideoTracks = m_webStream.numberOfVideoComponents();
+    size_t numberOfVideoTracks = m_descriptor->numberOfVideoComponents();
     m_videoTracks.reserveCapacity(numberOfVideoTracks);
     for (size_t i = 0; i < numberOfVideoTracks; i++)
-        m_videoTracks.append(MediaStreamTrack::create(context, m_webStream.videoComponent(i)));
+        m_videoTracks.append(MediaStreamTrack::create(context, m_descriptor->videoComponent(i)));
 }
 
 MediaStream::~MediaStream()
 {
-    m_webStream.setClient(0);
+    m_descriptor->setClient(0);
 }
 
 bool MediaStream::ended() const
 {
-    return m_stopped || m_webStream.ended();
+    return m_stopped || m_descriptor->ended();
 }
 
 void MediaStream::addTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
 {
     if (ended()) {
         ec = INVALID_STATE_ERR;
         return;
     }
 
     if (!prpTrack) {
         ec = TYPE_MISMATCH_ERR;
         return;
     }
 
     RefPtr<MediaStreamTrack> track = prpTrack;
 
     if (getTrackById(track->id()))
         return;
 
-    RefPtr<MediaStreamComponent> component = MediaStreamComponent::create(m_webStream, track->component()->source());
+    RefPtr<MediaStreamComponent> component = MediaStreamComponent::create(m_descriptor.get(), track->component()->source());
     RefPtr<MediaStreamTrack> newTrack = MediaStreamTrack::create(scriptExecutionContext(), component.get());
 
     switch (component->source()->type()) {
     case MediaStreamSource::TypeAudio:
         m_audioTracks.append(newTrack);
         break;
     case MediaStreamSource::TypeVideo:
         m_videoTracks.append(newTrack);
         break;
     }
 
-    m_webStream.addComponent(component.get());
+    m_descriptor->addComponent(component.release());
 
-    MediaStreamCenter::instance().didAddMediaStreamTrack(m_webStream, newTrack->component());
+    MediaStreamCenter::instance().didAddMediaStreamTrack(m_descriptor.get(), newTrack->component());
 }
 
 void MediaStream::removeTrack(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionCode& ec)
 {
     if (ended()) {
         ec = INVALID_STATE_ERR;
         return;
     }
 
     if (!prpTrack) {
@@ skipping 13 matching lines @@
     case MediaStreamSource::TypeVideo:
         pos = m_videoTracks.find(track);
         if (pos != notFound)
             m_videoTracks.remove(pos);
         break;
     }
 
     if (pos == notFound)
         return;
 
-    m_webStream.removeComponent(track->component());
+    m_descriptor->removeComponent(track->component());
 
     if (!m_audioTracks.size() && !m_videoTracks.size())
-        m_webStream.setEnded();
+        m_descriptor->setEnded();
 
-    MediaStreamCenter::instance().didRemoveMediaStreamTrack(m_webStream, track->component());
+    MediaStreamCenter::instance().didRemoveMediaStreamTrack(m_descriptor.get(), track->component());
 }
 
 MediaStreamTrack* MediaStream::getTrackById(String id)
 {
     for (MediaStreamTrackVector::iterator iter = m_audioTracks.begin(); iter != m_audioTracks.end(); ++iter) {
         if ((*iter)->id() == id)
             return (*iter).get();
     }
 
     for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); iter != m_videoTracks.end(); ++iter) {
         if ((*iter)->id() == id)
             return (*iter).get();
     }
 
     return 0;
 }
 
 void MediaStream::stop()
 {
     if (ended())
         return;
 
-    MediaStreamCenter::instance().didStopLocalMediaStream(webStream());
+    MediaStreamCenter::instance().didStopLocalMediaStream(descriptor());
 
     streamEnded();
 }
 
 void MediaStream::trackEnded()
 {
     for (size_t i = 0; i < m_audioTracks.size(); ++i)
         if (!m_audioTracks[i]->ended())
             return;
 
     for (size_t i = 0; i < m_videoTracks.size(); ++i)
         if (!m_videoTracks[i]->ended())
             return;
 
     streamEnded();
 }
 
 void MediaStream::streamEnded()
 {
     if (ended())
         return;
 
-    m_webStream.setEnded();
+    m_descriptor->setEnded();
     scheduleDispatchEvent(Event::create(eventNames().endedEvent, false, false));
 }
 
 void MediaStream::contextDestroyed()
 {
     ContextDestructionObserver::contextDestroyed();
     m_stopped = true;
 }
 
 const AtomicString& MediaStream::interfaceName() const
@@ skipping 11 matching lines @@
     return &m_eventTargetData;
 }
 
 EventTargetData* MediaStream::ensureEventTargetData()
 {
     return &m_eventTargetData;
 }
 
 void MediaStream::addRemoteTrack(MediaStreamComponent* component)
 {
-    ASSERT(component && !(component->stream().isNull()));
+    ASSERT(component && !component->stream());
     if (ended())
         return;
 
-    component->setStream(webStream());
+    component->setStream(descriptor());
 
     RefPtr<MediaStreamTrack> track = MediaStreamTrack::create(scriptExecutionContext(), component);
     switch (component->source()->type()) {
     case MediaStreamSource::TypeAudio:
         m_audioTracks.append(track);
         break;
     case MediaStreamSource::TypeVideo:
         m_videoTracks.append(track);
         break;
     }
-    m_webStream.addComponent(component);
+    m_descriptor->addComponent(component);
 
     scheduleDispatchEvent(MediaStreamTrackEvent::create(eventNames().addtrackEvent, false, false, track));
 }
 
 void MediaStream::removeRemoteTrack(MediaStreamComponent* component)
 {
     if (ended())
         return;
 
     MediaStreamTrackVector* tracks = 0;
     switch (component->source()->type()) {
     case MediaStreamSource::TypeAudio:
         tracks = &m_audioTracks;
         break;
     case MediaStreamSource::TypeVideo:
         tracks = &m_videoTracks;
         break;
     }
 
     size_t index = notFound;
     for (size_t i = 0; i < tracks->size(); ++i) {
         if ((*tracks)[i]->component() == component) {
             index = i;
             break;
         }
     }
     if (index == notFound)
         return;
 
-    m_webStream.removeComponent(component);
+    m_descriptor->removeComponent(component);
 
     RefPtr<MediaStreamTrack> track = (*tracks)[index];
     tracks->remove(index);
     scheduleDispatchEvent(MediaStreamTrackEvent::create(eventNames().removetrackEvent, false, false, track));
 }
 
 void MediaStream::scheduleDispatchEvent(PassRefPtr<Event> event)
 {
     m_scheduledEvents.append(event);
 
@@ skipping 15 matching lines @@
 
     events.clear();
 }
 
 URLRegistry& MediaStream::registry() const
 {
     return MediaStreamRegistry::registry();
 }
 
 } // namespace WebCore