Implement HTMLMediaElement::srcObject.

Source/modules/mediastream/MediaStream.cpp

Index: Source/modules/mediastream/MediaStream.cpp
diff --git a/Source/modules/mediastream/MediaStream.cpp b/Source/modules/mediastream/MediaStream.cpp
index ac6ca8c77d5dee34c93bf72ce7d1fc9c97b3845b..6347410e99443e51d3ce3c4e38ffdb31685856b6 100644
--- a/Source/modules/mediastream/MediaStream.cpp
+++ b/Source/modules/mediastream/MediaStream.cpp
@@ -27,7 +27,9 @@
 #include "modules/mediastream/MediaStream.h"
 
 #include "bindings/core/v8/ExceptionState.h"
+#include "core/dom/DOMURL.h"
 #include "core/dom/ExceptionCode.h"
+#include "modules/mediastream/MediaStreamMediaProviderConverter.h"
 #include "modules/mediastream/MediaStreamRegistry.h"
 #include "modules/mediastream/MediaStreamTrackEvent.h"
 #include "platform/mediastream/MediaStreamCenter.h"
@@ -95,7 +97,8 @@ MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStre
 }
 
 MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
-    : ContextLifecycleObserver(context)
+    : MediaProvider(MediaStreamMediaProviderConverter::converter())
+    , ContextLifecycleObserver(context)
     , m_stopped(false)
     , m_descriptor(streamDescriptor)
     , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired)
@@ -121,7 +124,8 @@ MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescri
 }
 
 MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks)
-    : ContextLifecycleObserver(context)
+    : MediaProvider(MediaStreamMediaProviderConverter::converter())
+    , ContextLifecycleObserver(context)
     , m_stopped(false)
     , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired)
 {
@@ -150,6 +154,8 @@ MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector
 
 MediaStream::~MediaStream()
 {
+    if (!m_objectUrl.isEmpty())
+        DOMURL::revokeObjectURL(executionContext(), m_objectUrl);
     m_descriptor->setClient(0);
 }
 
@@ -390,6 +396,13 @@ URLRegistry& MediaStream::registry() const
     return MediaStreamRegistry::registry();
 }
 
+const String& MediaStream::getObjectUrl()
+{
+    if (m_objectUrl.isEmpty())
+        m_objectUrl = m_objectUrl = DOMURL::createPublicURL(executionContext(), this);
+    return m_objectUrl;
+}
+
 void MediaStream::trace(Visitor* visitor)
 {
     visitor->trace(m_audioTracks);