| 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 2404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2415 WebMediaPlayerEncryptedMediaClient* encrypted_client, | 2415 WebMediaPlayerEncryptedMediaClient* encrypted_client, |
| 2416 WebContentDecryptionModule* initial_cdm, | 2416 WebContentDecryptionModule* initial_cdm, |
| 2417 const blink::WebString& sink_id, | 2417 const blink::WebString& sink_id, |
| 2418 WebMediaSession* media_session) { | 2418 WebMediaSession* media_session) { |
| 2419 #if defined(VIDEO_HOLE) | 2419 #if defined(VIDEO_HOLE) |
| 2420 if (!contains_media_player_) { | 2420 if (!contains_media_player_) { |
| 2421 render_view_->RegisterVideoHoleFrame(this); | 2421 render_view_->RegisterVideoHoleFrame(this); |
| 2422 contains_media_player_ = true; | 2422 contains_media_player_ = true; |
| 2423 } | 2423 } |
| 2424 #endif // defined(VIDEO_HOLE) | 2424 #endif // defined(VIDEO_HOLE) |
| 2425 | |
| 2426 blink::WebMediaStream web_stream( | 2425 blink::WebMediaStream web_stream( |
| 2427 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); | 2426 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); |
| 2428 if (!web_stream.isNull()) | 2427 if (!web_stream.isNull()) |
| 2429 return CreateWebMediaPlayerForMediaStream(client, sink_id, | 2428 return CreateWebMediaPlayerForMediaStream(client, sink_id, |
| 2430 frame_->getSecurityOrigin()); | 2429 frame_->getSecurityOrigin()); |
| 2431 | 2430 |
| 2432 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 2431 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
| 2433 | 2432 |
| 2434 scoped_refptr<media::RestartableAudioRendererSink> audio_renderer_sink = | 2433 scoped_refptr<media::RestartableAudioRendererSink> audio_renderer_sink = |
| 2435 AudioDeviceFactory::NewRestartableAudioRendererSink( | 2434 AudioDeviceFactory::NewRestartableAudioRendererSink( |
| (...skipping 3636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6072 int match_count, | 6071 int match_count, |
| 6073 int ordinal, | 6072 int ordinal, |
| 6074 const WebRect& selection_rect, | 6073 const WebRect& selection_rect, |
| 6075 bool final_status_update) { | 6074 bool final_status_update) { |
| 6076 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6075 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6077 selection_rect, ordinal, | 6076 selection_rect, ordinal, |
| 6078 final_status_update)); | 6077 final_status_update)); |
| 6079 } | 6078 } |
| 6080 | 6079 |
| 6081 } // namespace content | 6080 } // namespace content |
| OLD | NEW |