MediaStream API: Remove LocalMediaStream

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 12 matching lines @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/mediastream/MediaStream.h"
 
 #if ENABLE(MEDIA_STREAM)
 
 #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/MediaStreamTrackEvent.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)
 {
-    RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources);
+    RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(audioSources, videoSources);
     MediaStreamCenter::instance().didCreateMediaStream(descriptor.get());
 
     return MediaStream::create(context, descriptor.release());
 }
 
 PassRefPtr<MediaStream> MediaStream::create(ScriptExecutionContext* context)
 {
     MediaStreamSourceVector audioSources;
     MediaStreamSourceVector videoSources;
 
@@ skipping 142 matching lines @@
     }
 
     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(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;
 
@@ skipping 108 matching lines @@
     Vector<RefPtr<Event> >::iterator it = events.begin();
     for (; it != events.end(); ++it)
         dispatchEvent((*it).release());
 
     events.clear();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(MEDIA_STREAM)