Implement HTMLMediaElement::srcObject.

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
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  * 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 "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ScriptValue.h"
+#include "bindings/modules/v8/V8MediaStream.h"
+#include "core/dom/DOMURL.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/mediastream/MediaStreamRegistry.h"
 #include "modules/mediastream/MediaStreamTrackEvent.h"
 #include "platform/mediastream/MediaStreamCenter.h"
 #include "platform/mediastream/MediaStreamSource.h"
 
 namespace blink {
 
 static bool containsSource(MediaStreamTrackVector& trackVector, MediaStreamSource* source)
 {
     for (size_t i = 0; i < trackVector.size(); ++i) {
         if (source->id() == trackVector[i]->component()->source()->id())
             return true;
     }
     return false;
 }
 
 static void processTrack(MediaStreamTrack* track, MediaStreamTrackVector& trackVector)
 {
     if (track->ended())
         return;
 
     MediaStreamSource* source = track->component()->source();
     if (!containsSource(trackVector, source))
         trackVector.append(track);
 }
 
+static MediaProvider* MediaProviderConverter(const ScriptValue& value)
+{
+    v8::Handle<v8::Value> v8Value(value.v8Value());
+    MediaStream* stream = V8MediaStream::toImplWithTypeCheck(value.isolate(), v8Value);

[sof, 2014/09/18 07:33:17]

Just return this directly --

  return V8MediaStream::toImplWithTypeCheck(value.isolate(), v8Value);

[perkj_chrome, 2014/09/18 14:47:09]

Done.

+    if (!stream)
+        return nullptr;
+    return stream;
+}
+
 MediaStream* MediaStream::create(ExecutionContext* context)
 {
     MediaStreamTrackVector audioTracks;
     MediaStreamTrackVector videoTracks;
 
     return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, audioTracks, videoTracks));
 }
 
 MediaStream* MediaStream::create(ExecutionContext* context, MediaStream* stream)
 {
@@ skipping 21 matching lines @@
 
     return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, audioTracks, videoTracks));
 }
 
 MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
 {
     return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, streamDescriptor));
 }
 
 MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor)
-    : ContextLifecycleObserver(context)
+    : MediaProvider(EventTargetNames::MediaStream, bind<const ScriptValue&>(MediaProviderConverter))
+    , ContextLifecycleObserver(context)
     , m_stopped(false)
     , m_descriptor(streamDescriptor)
     , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired)
 {
     m_descriptor->setClient(this);
 
     size_t numberOfAudioTracks = m_descriptor->numberOfAudioComponents();
     m_audioTracks.reserveCapacity(numberOfAudioTracks);
     for (size_t i = 0; i < numberOfAudioTracks; i++) {
         MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descriptor->audioComponent(i));
         newTrack->registerMediaStream(this);
         m_audioTracks.append(newTrack);
     }
 
     size_t numberOfVideoTracks = m_descriptor->numberOfVideoComponents();
     m_videoTracks.reserveCapacity(numberOfVideoTracks);
     for (size_t i = 0; i < numberOfVideoTracks; i++) {
         MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descriptor->videoComponent(i));
         newTrack->registerMediaStream(this);
         m_videoTracks.append(newTrack);
     }
 }
 
 MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks)
-    : ContextLifecycleObserver(context)
+    : MediaProvider(EventTargetNames::MediaStream, bind<const ScriptValue&>(MediaProviderConverter))
+    , ContextLifecycleObserver(context)
     , m_stopped(false)
     , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired)
 {
     MediaStreamComponentVector audioComponents;
     MediaStreamComponentVector videoComponents;
 
     MediaStreamTrackVector::const_iterator iter;
     for (iter = audioTracks.begin(); iter != audioTracks.end(); ++iter) {
         (*iter)->registerMediaStream(this);
         audioComponents.append((*iter)->component());
     }
     for (iter = videoTracks.begin(); iter != videoTracks.end(); ++iter) {
         (*iter)->registerMediaStream(this);
         videoComponents.append((*iter)->component());
     }
 
     m_descriptor = MediaStreamDescriptor::create(audioComponents, videoComponents);
     m_descriptor->setClient(this);
     MediaStreamCenter::instance().didCreateMediaStream(m_descriptor.get());
 
     m_audioTracks = audioTracks;
     m_videoTracks = videoTracks;
 }
 
 MediaStream::~MediaStream()
 {
+    if (!m_objectUrl.isEmpty())
+        DOMURL::revokeObjectURL(executionContext(), m_objectUrl);
     m_descriptor->setClient(0);
 }
 
 bool MediaStream::ended() const
 {
     return m_stopped || m_descriptor->ended();
 }
 
 MediaStreamTrackVector MediaStream::getTracks()
 {
@@ skipping 220 matching lines @@
         dispatchEvent((*it).release());
 
     events.clear();
 }
 
 URLRegistry& MediaStream::registry() const
 {
     return MediaStreamRegistry::registry();
 }
 
+const String& MediaStream::getObjectUrl()
+{
+    if (m_objectUrl.isEmpty())
+        m_objectUrl = m_objectUrl = DOMURL::createPublicURL(executionContext(), this);

[sof, 2014/09/18 07:33:17]

"m_objectUrl = m_objectUrl" => "m_objectUrl" ?

[sof, 2014/09/18 07:33:17]

Should this be using URLMediaStream::createObjectURL() ?

[perkj_chrome, 2014/09/18 14:47:09]

good question... Sorry. 

[perkj_chrome, 2014/09/18 14:47:09]

It can- but since I use DOMURL::revokeObjectURL I think this is more clear. 

+    return m_objectUrl;
+}
+
 void MediaStream::trace(Visitor* visitor)
 {
     visitor->trace(m_audioTracks);
     visitor->trace(m_videoTracks);
     visitor->trace(m_scheduledEvents);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink