OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/html_viewer/html_frame.h" | 5 #include "components/html_viewer/html_frame.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <limits> | 9 #include <limits> |
10 #include <utility> | 10 #include <utility> |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 blink::WebMediaPlayer* HTMLFrame::createMediaPlayer( | 312 blink::WebMediaPlayer* HTMLFrame::createMediaPlayer( |
313 blink::WebLocalFrame* frame, | 313 blink::WebLocalFrame* frame, |
314 blink::WebMediaPlayer::LoadType load_type, | 314 blink::WebMediaPlayer::LoadType load_type, |
315 const blink::WebURL& url, | 315 const blink::WebURL& url, |
316 blink::WebMediaPlayerClient* client, | 316 blink::WebMediaPlayerClient* client, |
317 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, | 317 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, |
318 blink::WebContentDecryptionModule* initial_cdm, | 318 blink::WebContentDecryptionModule* initial_cdm, |
319 const blink::WebString& sink_id, | 319 const blink::WebString& sink_id, |
320 blink::WebMediaSession* media_session) { | 320 blink::WebMediaSession* media_session) { |
321 return global_state()->media_factory()->CreateMediaPlayer( | 321 return global_state()->media_factory()->CreateMediaPlayer( |
322 frame, url, client, encrypted_client, initial_cdm, GetApp()->shell()); | 322 frame, url, client, encrypted_client, initial_cdm, media_session, |
| 323 GetApp()->shell()); |
323 } | 324 } |
324 | 325 |
325 blink::WebFrame* HTMLFrame::createChildFrame( | 326 blink::WebFrame* HTMLFrame::createChildFrame( |
326 blink::WebLocalFrame* parent, | 327 blink::WebLocalFrame* parent, |
327 blink::WebTreeScopeType scope, | 328 blink::WebTreeScopeType scope, |
328 const blink::WebString& frame_name, | 329 const blink::WebString& frame_name, |
329 blink::WebSandboxFlags sandbox_flags, | 330 blink::WebSandboxFlags sandbox_flags, |
330 const blink::WebFrameOwnerProperties& frame_owner_properties) { | 331 const blink::WebFrameOwnerProperties& frame_owner_properties) { |
331 DCHECK(IsLocal()); // Can't create children of remote frames. | 332 DCHECK(IsLocal()); // Can't create children of remote frames. |
332 DCHECK_EQ(parent, web_frame_); | 333 DCHECK_EQ(parent, web_frame_); |
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1041 | 1042 |
1042 if (!surface_layer_) | 1043 if (!surface_layer_) |
1043 return; | 1044 return; |
1044 | 1045 |
1045 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()), | 1046 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()), |
1046 global_state()->device_pixel_ratio(), | 1047 global_state()->device_pixel_ratio(), |
1047 owned_window_->window()->bounds().size()); | 1048 owned_window_->window()->bounds().size()); |
1048 } | 1049 } |
1049 | 1050 |
1050 } // namespace mojo | 1051 } // namespace mojo |
OLD | NEW |