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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1648653002: Carry WebMediaSession in WebMediaPlayerParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase; add const to getter 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 | « no previous file | media/blink/webmediaplayer_params.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 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 2478 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 media::WebMediaPlayerParams params( 2489 media::WebMediaPlayerParams params(
2490 base::Bind(&ContentRendererClient::DeferMediaLoad, 2490 base::Bind(&ContentRendererClient::DeferMediaLoad,
2491 base::Unretained(GetContentClient()->renderer()), 2491 base::Unretained(GetContentClient()->renderer()),
2492 static_cast<RenderFrame*>(this), 2492 static_cast<RenderFrame*>(this),
2493 GetWebMediaPlayerDelegate()->has_played_media()), 2493 GetWebMediaPlayerDelegate()->has_played_media()),
2494 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), 2494 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(),
2495 render_thread->GetWorkerTaskRunner(), 2495 render_thread->GetWorkerTaskRunner(),
2496 render_thread->compositor_task_runner(), context_3d_cb, 2496 render_thread->compositor_task_runner(), context_3d_cb,
2497 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, 2497 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory,
2498 base::Unretained(blink::mainThreadIsolate())), 2498 base::Unretained(blink::mainThreadIsolate())),
2499 GetMediaPermission(), initial_cdm, media_surface_manager_); 2499 GetMediaPermission(), initial_cdm, media_surface_manager_, media_session);
2500 2500
2501 #if defined(OS_ANDROID) 2501 #if defined(OS_ANDROID)
2502 if (!CanUseWebMediaPlayerImpl(load_type, url)) { 2502 if (!CanUseWebMediaPlayerImpl(load_type, url)) {
2503 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); 2503 return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
2504 } else if (!MustUseWebMediaPlayerImpl(load_type, url)) { 2504 } else if (!MustUseWebMediaPlayerImpl(load_type, url)) {
2505 // TODO(dalecurtis): This experiment is temporary and should be removed once 2505 // TODO(dalecurtis): This experiment is temporary and should be removed once
2506 // we have enough data to support the primacy of the unified media pipeline; 2506 // we have enough data to support the primacy of the unified media pipeline;
2507 // see http://crbug.com/533190 for details. 2507 // see http://crbug.com/533190 for details.
2508 // 2508 //
2509 // Note: It's important to query the field trial state first, to ensure that 2509 // Note: It's important to query the field trial state first, to ensure that
(...skipping 3588 matching lines...) Expand 10 before | Expand all | Expand 10 after
6098 int match_count, 6098 int match_count,
6099 int ordinal, 6099 int ordinal,
6100 const WebRect& selection_rect, 6100 const WebRect& selection_rect,
6101 bool final_status_update) { 6101 bool final_status_update) {
6102 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6102 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6103 selection_rect, ordinal, 6103 selection_rect, ordinal,
6104 final_status_update)); 6104 final_status_update));
6105 } 6105 }
6106 6106
6107 } // namespace content 6107 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/blink/webmediaplayer_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698