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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix layout tests. 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index bfdbd00b584f1cc29e3d072122a635888e052669..f4e861794d12ad8d6c16c68ff6701202500f12d3 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2496,7 +2496,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
render_thread->compositor_task_runner(), context_3d_cb,
base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory,
base::Unretained(blink::mainThreadIsolate())),
- GetMediaPermission(), initial_cdm, media_surface_manager_);
+ initial_cdm, media_surface_manager_);
#if defined(OS_ANDROID)
if (!CanUseWebMediaPlayerImpl(load_type, url)) {
@@ -2543,7 +2543,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
frame_, client, encrypted_client,
GetWebMediaPlayerDelegate()->AsWeakPtr(),
- std::move(media_renderer_factory), GetCdmFactory(), url_index_, params);
+ std::move(media_renderer_factory), url_index_, params);
#if defined(OS_ANDROID) // WMPI_CAST
media_player->SetMediaPlayerManager(GetMediaPlayerManager());
@@ -5944,7 +5944,7 @@ WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer(
RenderThreadImpl::current()->EnableStreamTextureCopy();
return new WebMediaPlayerAndroid(frame_, client, encrypted_client,
GetWebMediaPlayerDelegate()->AsWeakPtr(),
- GetMediaPlayerManager(), GetCdmFactory(),
+ GetMediaPlayerManager(),
stream_texture_factory, routing_id_,
enable_texture_copy, params);
}

Powered by Google App Engine
This is Rietveld 408576698