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

Unified Diff: Source/core/platform/mediastream/MediaStreamDescriptor.h

Issue 14188039: MediaStream API: Remove LocalMediaStream (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed tests 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
« no previous file with comments | « Source/core/dom/EventTargetFactory.in ('k') | Source/modules/mediastream/LocalMediaStream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/mediastream/MediaStreamDescriptor.h
diff --git a/Source/core/platform/mediastream/MediaStreamDescriptor.h b/Source/core/platform/mediastream/MediaStreamDescriptor.h
index 619ffd3d8a045e392c9448e6544be91c27ed10cf..be4d0c232b742029018720fce0ca3122297a0206 100644
--- a/Source/core/platform/mediastream/MediaStreamDescriptor.h
+++ b/Source/core/platform/mediastream/MediaStreamDescriptor.h
@@ -34,9 +34,10 @@
#if ENABLE(MEDIA_STREAM)
-#include "MediaStreamComponent.h"
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
+#include "core/platform/UUID.h"
+#include "core/platform/mediastream/MediaStreamComponent.h"
+#include "wtf/RefCounted.h"
+#include "wtf/Vector.h"
namespace WebCore {
@@ -57,9 +58,9 @@ public:
virtual ~ExtraData() { }
};
- static PassRefPtr<MediaStreamDescriptor> create(const String& id, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
+ static PassRefPtr<MediaStreamDescriptor> create(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
{
- return adoptRef(new MediaStreamDescriptor(id, audioSources, videoSources));
+ return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audioSources, videoSources));
}
static PassRefPtr<MediaStreamDescriptor> create(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents)
« no previous file with comments | « Source/core/dom/EventTargetFactory.in ('k') | Source/modules/mediastream/LocalMediaStream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698