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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2849043002: Send AndroidOverlay routing token from WMPI to AVDA. (Closed)
Patch Set: rebased Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | media/base/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 54598cb8dadb195aa88a7c1211c8384b771aacdc..6d279fe3fdb9fc05d2fec083b84e0b2317cf816d 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2974,8 +2974,10 @@ blink::WebMediaPlayer* RenderFrameImpl::CreateMediaPlayer(
render_thread->compositor_task_runner(), context_3d_cb,
base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory,
base::Unretained(blink::MainThreadIsolate())),
- initial_cdm, media_surface_manager_, media_observer,
- max_keyframe_distance_to_disable_background_video,
+ initial_cdm, media_surface_manager_,
+ base::Bind(&RenderFrameImpl::RequestOverlayRoutingToken,
+ base::Unretained(this)),
+ media_observer, max_keyframe_distance_to_disable_background_video,
max_keyframe_distance_to_disable_background_video_mse,
GetWebkitPreferences().enable_instant_source_buffer_gc,
GetContentClient()->renderer()->AllowMediaSuspend(),
@@ -5919,7 +5921,7 @@ void RenderFrameImpl::OnSetOverlayRoutingToken(
}
void RenderFrameImpl::RequestOverlayRoutingToken(
- const media::RoutingTokenCallback& callback) {
+ media::RoutingTokenCallback callback) {
if (overlay_routing_token_.has_value()) {
callback.Run(overlay_routing_token_.value());
return;
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698