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

Unified Diff: Source/modules/mediastream/MediaStream.cpp

Issue 14188039: MediaStream API: Remove LocalMediaStream (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: Source/modules/mediastream/MediaStream.cpp
diff --git a/Source/modules/mediastream/MediaStream.cpp b/Source/modules/mediastream/MediaStream.cpp
index ecf4c19f3daae8e7524190b303406ee99c6cd3f6..b8e41537ac729f4869ca0798b2a7b7755f32e772 100644
--- a/Source/modules/mediastream/MediaStream.cpp
+++ b/Source/modules/mediastream/MediaStream.cpp
@@ -33,7 +33,6 @@
#include "MediaStreamCenter.h"
#include "MediaStreamSource.h"
#include "MediaStreamTrackEvent.h"
-#include "UUID.h"
namespace WebCore {
@@ -58,7 +57,7 @@ static void processTrack(MediaStreamTrack* track, MediaStreamSourceVector& sourc
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());
@@ -221,6 +220,16 @@ MediaStreamTrack* MediaStream::getTrackById(String id)
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)

Powered by Google App Engine
This is Rietveld 408576698