Add srcObject attribute of type MediaStream to HTMLMediaElement.

content/renderer/media/media_stream_renderer_factory_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/renderer/media/media_stream.h"
 #include "content/renderer/media/media_stream_audio_track.h"
 #include "content/renderer/media/media_stream_video_renderer_sink.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/track_audio_renderer.h"
 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
 #include "content/renderer/media/webrtc_audio_renderer.h"
 #include "content/renderer/render_thread_impl.h"
 #include "media/base/audio_hardware_config.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
-#include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
 #include "third_party/webrtc/api/mediastreaminterface.h"
 
 namespace content {
 
 namespace {
 
 PeerConnectionDependencyFactory* GetPeerConnectionDependencyFactory() {
   return RenderThreadImpl::current()->GetPeerConnectionDependencyFactory();
 }
 
@@ skipping 23 matching lines @@
 
 
 MediaStreamRendererFactoryImpl::MediaStreamRendererFactoryImpl() {
 }
 
 MediaStreamRendererFactoryImpl::~MediaStreamRendererFactoryImpl() {
 }
 
 scoped_refptr<VideoFrameProvider>
 MediaStreamRendererFactoryImpl::GetVideoFrameProvider(
-    const GURL& url,
+    const blink::WebMediaStream& web_stream,
     const base::Closure& error_cb,
     const VideoFrameProvider::RepaintCB& repaint_cb,
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
     const scoped_refptr<base::TaskRunner>& worker_task_runner,
     media::GpuVideoAcceleratorFactories* gpu_factories) {
-  blink::WebMediaStream web_stream =
-      blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url);
   DCHECK(!web_stream.isNull());
 
   DVLOG(1) << "MediaStreamRendererFactoryImpl::GetVideoFrameProvider stream:"
            << base::UTF16ToUTF8(base::StringPiece16(web_stream.id()));
 
   blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
   web_stream.videoTracks(video_tracks);
   if (video_tracks.isEmpty() ||
       !MediaStreamVideoTrack::GetTrack(video_tracks[0])) {
     return NULL;
   }
 
   return new MediaStreamVideoRendererSink(video_tracks[0], error_cb, repaint_cb,
                                           media_task_runner, worker_task_runner,
                                           gpu_factories);
 }
 
 scoped_refptr<MediaStreamAudioRenderer>
 MediaStreamRendererFactoryImpl::GetAudioRenderer(
-    const GURL& url,
+    const blink::WebMediaStream& web_stream,
     int render_frame_id,
     const std::string& device_id,
     const url::Origin& security_origin) {
-  blink::WebMediaStream web_stream =
-      blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url);
-
+  DCHECK(!web_stream.isNull());
   blink::WebVector<blink::WebMediaStreamTrack> audio_tracks;
   web_stream.audioTracks(audio_tracks);
   if (audio_tracks.isEmpty())
     return NULL;
 
   DVLOG(1) << "MediaStreamRendererFactoryImpl::GetAudioRenderer stream:"
            << base::UTF16ToUTF8(base::StringPiece16(web_stream.id()));
 
   // TODO(tommi): We need to fix the data flow so that
   // it works the same way for all track implementations, local, remote or what
@@ skipping 45 matching lines @@
         device_id, security_origin);
 
     if (!audio_device->SetAudioRenderer(renderer.get()))
       return nullptr;
   }
 
   return renderer->CreateSharedAudioRendererProxy(web_stream);
 }
 
 }  // namespace content