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

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 isRenewalMessage() in browser 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
« no previous file with comments | « content/renderer/media/render_media_client.cc ('k') | content/renderer/renderer_blink_platform_impl.cc » ('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 71b9e1262ec23eb9a62167bbeec4bfa715532d95..262843d888c34d7bb5b40ec2ef83b2cb307be69b 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2488,7 +2488,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_, media_session);
+ initial_cdm, media_surface_manager_, media_session);
#if defined(OS_ANDROID)
if (!UseWebMediaPlayerImpl(load_type, url))
@@ -2516,7 +2516,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());
@@ -5932,11 +5932,10 @@ WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer(
bool enable_texture_copy =
RenderThreadImpl::current()->EnableStreamTextureCopy();
- return new WebMediaPlayerAndroid(frame_, client, encrypted_client,
- GetWebMediaPlayerDelegate()->AsWeakPtr(),
- GetMediaPlayerManager(), GetCdmFactory(),
- stream_texture_factory, routing_id_,
- enable_texture_copy, params);
+ return new WebMediaPlayerAndroid(
+ frame_, client, encrypted_client,
+ GetWebMediaPlayerDelegate()->AsWeakPtr(), GetMediaPlayerManager(),
+ stream_texture_factory, routing_id_, enable_texture_copy, params);
}
RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
« no previous file with comments | « content/renderer/media/render_media_client.cc ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698