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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2460303003: Checking RendererThreadImpl for null when creating media player. (Closed)
Patch Set: addressing review comments Created 4 years, 1 month 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/audio_device_factory.cc ('k') | no next file » | 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 ddaef125f6d1b58a2f9c2635457a48678d8d7bca..f2f52970349917b21e23f8fe396a8bc88227b128 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2735,6 +2735,9 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
blink::WebURL url = source.getAsURL();
RenderThreadImpl* render_thread = RenderThreadImpl::current();
+ // Render thread may not exist in tests, returning nullptr if it does not.
+ if (!render_thread)
+ return nullptr;
scoped_refptr<media::SwitchableAudioRendererSink> audio_renderer_sink =
AudioDeviceFactory::NewSwitchableAudioRendererSink(
« no previous file with comments | « content/renderer/media/audio_device_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698