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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2338223003: Unassociating MediaSession from media players (in blink & content) (Closed)
Patch Set: fixed tests Created 4 years, 3 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/android/media_player_android.h » ('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 0e5d2db40d4cc6944d6f8638a608358e88bb0190..c0ce014ed370771e5230af5f04262054d96a764f 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2625,8 +2625,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
WebMediaPlayerClient* client,
WebMediaPlayerEncryptedMediaClient* encrypted_client,
WebContentDecryptionModule* initial_cdm,
- const blink::WebString& sink_id,
- WebMediaSession* media_session) {
+ const blink::WebString& sink_id) {
blink::WebMediaStream web_stream =
GetWebMediaStreamFromWebMediaPlayerSource(source);
if (!web_stream.isNull())
@@ -2670,7 +2669,7 @@ 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_session);
+ initial_cdm, media_surface_manager_);
#if defined(OS_ANDROID)
if (!UseWebMediaPlayerImpl(url)) {
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | media/base/android/media_player_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698