| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 2399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2410 WebMediaPlayerEncryptedMediaClient* encrypted_client, | 2410 WebMediaPlayerEncryptedMediaClient* encrypted_client, |
| 2411 WebContentDecryptionModule* initial_cdm, | 2411 WebContentDecryptionModule* initial_cdm, |
| 2412 const blink::WebString& sink_id, | 2412 const blink::WebString& sink_id, |
| 2413 WebMediaSession* media_session) { | 2413 WebMediaSession* media_session) { |
| 2414 #if defined(VIDEO_HOLE) | 2414 #if defined(VIDEO_HOLE) |
| 2415 if (!contains_media_player_) { | 2415 if (!contains_media_player_) { |
| 2416 render_view_->RegisterVideoHoleFrame(this); | 2416 render_view_->RegisterVideoHoleFrame(this); |
| 2417 contains_media_player_ = true; | 2417 contains_media_player_ = true; |
| 2418 } | 2418 } |
| 2419 #endif // defined(VIDEO_HOLE) | 2419 #endif // defined(VIDEO_HOLE) |
| 2420 | |
| 2421 blink::WebMediaStream web_stream( | 2420 blink::WebMediaStream web_stream( |
| 2422 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); | 2421 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); |
| 2423 if (!web_stream.isNull()) | 2422 if (!web_stream.isNull()) |
| 2424 return CreateWebMediaPlayerForMediaStream(client, sink_id, | 2423 return CreateWebMediaPlayerForMediaStream(client, sink_id, |
| 2425 frame_->getSecurityOrigin()); | 2424 frame_->getSecurityOrigin()); |
| 2426 | 2425 |
| 2427 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 2426 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
| 2428 | 2427 |
| 2429 scoped_refptr<media::SwitchableAudioRendererSink> audio_renderer_sink = | 2428 scoped_refptr<media::SwitchableAudioRendererSink> audio_renderer_sink = |
| 2430 AudioDeviceFactory::NewSwitchableAudioRendererSink( | 2429 AudioDeviceFactory::NewSwitchableAudioRendererSink( |
| (...skipping 3598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6029 int match_count, | 6028 int match_count, |
| 6030 int ordinal, | 6029 int ordinal, |
| 6031 const WebRect& selection_rect, | 6030 const WebRect& selection_rect, |
| 6032 bool final_status_update) { | 6031 bool final_status_update) { |
| 6033 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6032 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6034 selection_rect, ordinal, | 6033 selection_rect, ordinal, |
| 6035 final_status_update)); | 6034 final_status_update)); |
| 6036 } | 6035 } |
| 6037 | 6036 |
| 6038 } // namespace content | 6037 } // namespace content |
| OLD | NEW |