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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2640573002: Remove WebMediaPlayerDelegate null checks (Closed)
Patch Set: Undo accidental delete of WMPI::delegate_ Created 3 years, 11 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/webmediaplayer_ms_unittest.cc ('k') | media/blink/webmediaplayer_impl.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 11e7198d70cf15b155ba0bac452aacadb0a4cd91..00528edf1da672c1a7334c225ed3e80c5a01eddc 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2892,8 +2892,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
url_index_.reset(new media::UrlIndex(frame_));
media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
- frame_, client, encrypted_client,
- GetWebMediaPlayerDelegate()->AsWeakPtr(),
+ frame_, client, encrypted_client, GetWebMediaPlayerDelegate(),
std::move(media_renderer_factory), url_index_, params);
#if defined(OS_ANDROID) // WMPI_CAST
@@ -6186,7 +6185,7 @@ WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream(
compositor_task_runner = base::ThreadTaskRunnerHandle::Get();
return new WebMediaPlayerMS(
- frame_, client, GetWebMediaPlayerDelegate()->AsWeakPtr(),
+ frame_, client, GetWebMediaPlayerDelegate(),
new RenderMediaLog(url::Origin(security_origin).GetURL()),
CreateRendererFactory(), render_thread->GetIOTaskRunner(),
compositor_task_runner, render_thread->GetMediaThreadTaskRunner(),
@@ -6540,9 +6539,9 @@ WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer(
bool enable_texture_copy =
RenderThreadImpl::current()->EnableStreamTextureCopy();
return new WebMediaPlayerAndroid(
- frame_, client, encrypted_client,
- GetWebMediaPlayerDelegate()->AsWeakPtr(), GetMediaPlayerManager(),
- stream_texture_factory, routing_id_, enable_texture_copy, params);
+ frame_, client, encrypted_client, GetWebMediaPlayerDelegate(),
+ GetMediaPlayerManager(), stream_texture_factory, routing_id_,
+ enable_texture_copy, params);
}
RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
« no previous file with comments | « content/renderer/media/webmediaplayer_ms_unittest.cc ('k') | media/blink/webmediaplayer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698