Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side Diff: components/html_viewer/html_frame.cc

Issue 1585163002: Media Session: prepare for implicit activation of user created session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add parameter names, also for unused variables Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/html_viewer/html_frame.h ('k') | content/renderer/render_frame_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 } 309 }
310 } 310 }
311 311
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 return global_state()->media_factory()->CreateMediaPlayer( 321 return global_state()->media_factory()->CreateMediaPlayer(
321 frame, url, client, encrypted_client, initial_cdm, GetApp()->shell()); 322 frame, url, client, encrypted_client, initial_cdm, GetApp()->shell());
322 } 323 }
323 324
324 blink::WebFrame* HTMLFrame::createChildFrame( 325 blink::WebFrame* HTMLFrame::createChildFrame(
325 blink::WebLocalFrame* parent, 326 blink::WebLocalFrame* parent,
326 blink::WebTreeScopeType scope, 327 blink::WebTreeScopeType scope,
327 const blink::WebString& frame_name, 328 const blink::WebString& frame_name,
328 blink::WebSandboxFlags sandbox_flags, 329 blink::WebSandboxFlags sandbox_flags,
329 const blink::WebFrameOwnerProperties& frame_owner_properties) { 330 const blink::WebFrameOwnerProperties& frame_owner_properties) {
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 1041
1041 if (!surface_layer_) 1042 if (!surface_layer_)
1042 return; 1043 return;
1043 1044
1044 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()), 1045 surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()),
1045 global_state()->device_pixel_ratio(), 1046 global_state()->device_pixel_ratio(),
1046 owned_window_->window()->bounds().size()); 1047 owned_window_->window()->bounds().size());
1047 } 1048 }
1048 1049
1049 } // namespace mojo 1050 } // namespace mojo
OLDNEW
« no previous file with comments | « components/html_viewer/html_frame.h ('k') | content/renderer/render_frame_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698