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 2370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2381 #endif // defined(ENABLE_PLUGINS) | 2381 #endif // defined(ENABLE_PLUGINS) |
2382 } | 2382 } |
2383 | 2383 |
2384 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( | 2384 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( |
2385 blink::WebLocalFrame* frame, | 2385 blink::WebLocalFrame* frame, |
2386 blink::WebMediaPlayer::LoadType load_type, | 2386 blink::WebMediaPlayer::LoadType load_type, |
2387 const blink::WebURL& url, | 2387 const blink::WebURL& url, |
2388 WebMediaPlayerClient* client, | 2388 WebMediaPlayerClient* client, |
2389 WebMediaPlayerEncryptedMediaClient* encrypted_client, | 2389 WebMediaPlayerEncryptedMediaClient* encrypted_client, |
2390 WebContentDecryptionModule* initial_cdm, | 2390 WebContentDecryptionModule* initial_cdm, |
2391 const blink::WebString& sink_id) { | 2391 const blink::WebString& sink_id, |
| 2392 WebMediaSession* media_session) { |
2392 #if defined(VIDEO_HOLE) | 2393 #if defined(VIDEO_HOLE) |
2393 if (!contains_media_player_) { | 2394 if (!contains_media_player_) { |
2394 render_view_->RegisterVideoHoleFrame(this); | 2395 render_view_->RegisterVideoHoleFrame(this); |
2395 contains_media_player_ = true; | 2396 contains_media_player_ = true; |
2396 } | 2397 } |
2397 #endif // defined(VIDEO_HOLE) | 2398 #endif // defined(VIDEO_HOLE) |
2398 | 2399 |
2399 blink::WebMediaStream web_stream( | 2400 blink::WebMediaStream web_stream( |
2400 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); | 2401 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); |
2401 if (!web_stream.isNull()) | 2402 if (!web_stream.isNull()) |
(...skipping 3647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6049 int match_count, | 6050 int match_count, |
6050 int ordinal, | 6051 int ordinal, |
6051 const WebRect& selection_rect, | 6052 const WebRect& selection_rect, |
6052 bool final_status_update) { | 6053 bool final_status_update) { |
6053 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6054 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6054 selection_rect, ordinal, | 6055 selection_rect, ordinal, |
6055 final_status_update)); | 6056 final_status_update)); |
6056 } | 6057 } |
6057 | 6058 |
6058 } // namespace content | 6059 } // namespace content |
OLD | NEW |