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

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: 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
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 2446 matching lines...) Expand 10 before | Expand all | Expand 10 after
2457 media::WebMediaPlayerParams params( 2457 media::WebMediaPlayerParams params(
2458 base::Bind(&ContentRendererClient::DeferMediaLoad, 2458 base::Bind(&ContentRendererClient::DeferMediaLoad,
2459 base::Unretained(GetContentClient()->renderer()), 2459 base::Unretained(GetContentClient()->renderer()),
2460 static_cast<RenderFrame*>(this), 2460 static_cast<RenderFrame*>(this),
2461 GetWebMediaPlayerDelegate()->has_played_media()), 2461 GetWebMediaPlayerDelegate()->has_played_media()),
2462 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(), 2462 audio_renderer_sink, media_log, render_thread->GetMediaThreadTaskRunner(),
2463 render_thread->GetWorkerTaskRunner(), 2463 render_thread->GetWorkerTaskRunner(),
2464 render_thread->compositor_task_runner(), context_3d_cb, 2464 render_thread->compositor_task_runner(), context_3d_cb,
2465 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, 2465 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory,
2466 base::Unretained(blink::mainThreadIsolate())), 2466 base::Unretained(blink::mainThreadIsolate())),
2467 GetMediaPermission(), initial_cdm); 2467 GetMediaPermission(), initial_cdm, media_session);
2468 2468
2469 #if defined(OS_ANDROID) 2469 #if defined(OS_ANDROID)
2470 if (!CanUseWebMediaPlayerImpl(load_type, url)) { 2470 if (!CanUseWebMediaPlayerImpl(load_type, url)) {
2471 return CreateAndroidWebMediaPlayer(client, encrypted_client, params); 2471 return CreateAndroidWebMediaPlayer(client, encrypted_client, params);
2472 } else if (!MustUseWebMediaPlayerImpl(load_type, url)) { 2472 } else if (!MustUseWebMediaPlayerImpl(load_type, url)) {
2473 // TODO(dalecurtis): This experiment is temporary and should be removed once 2473 // TODO(dalecurtis): This experiment is temporary and should be removed once
2474 // we have enough data to support the primacy of the unified media pipeline; 2474 // we have enough data to support the primacy of the unified media pipeline;
2475 // see http://crbug.com/533190 for details. 2475 // see http://crbug.com/533190 for details.
2476 // 2476 //
2477 // Note: It's important to query the field trial state first, to ensure that 2477 // Note: It's important to query the field trial state first, to ensure that
(...skipping 3607 matching lines...) Expand 10 before | Expand all | Expand 10 after
6085 int match_count, 6085 int match_count,
6086 int ordinal, 6086 int ordinal,
6087 const WebRect& selection_rect, 6087 const WebRect& selection_rect,
6088 bool final_status_update) { 6088 bool final_status_update) {
6089 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6089 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6090 selection_rect, ordinal, 6090 selection_rect, ordinal,
6091 final_status_update)); 6091 final_status_update));
6092 } 6092 }
6093 6093
6094 } // namespace content 6094 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698