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

Unified Diff: content/renderer/media/webmediaplayer_ms.cc

Issue 1417533006: Unit test for WebMediaPlayerMS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolving Trybot Issues Created 5 years 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/media/webmediaplayer_ms.cc
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index b035cdc44dce5bd7224985b2df9bfad3fc6a7675..2fb3e5f1dcd77f0bad014ddc1d05b0090f07a724 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -64,7 +64,9 @@ WebMediaPlayerMS::WebMediaPlayerMS(
gpu_factories_(gpu_factories),
compositor_task_runner_(compositor_task_runner),
initial_audio_output_device_id_(sink_id.utf8()),
- initial_security_origin_(security_origin) {
+ initial_security_origin_(security_origin.isNull()
+ ? url::Origin()
+ : url::Origin(security_origin)) {
DVLOG(1) << __FUNCTION__;
DCHECK(client);
media_log_->AddEvent(
@@ -119,9 +121,12 @@ void WebMediaPlayerMS::load(LoadType load_type,
gpu_factories_);
RenderFrame* const frame = RenderFrame::FromWebFrame(frame_);
- audio_renderer_ = renderer_factory_->GetAudioRenderer(
- url, frame->GetRoutingID(), initial_audio_output_device_id_,
- initial_security_origin_);
+
+ if (frame) {
+ audio_renderer_ = renderer_factory_->GetAudioRenderer(
+ url, frame->GetRoutingID(), initial_audio_output_device_id_,
+ initial_security_origin_);
+ }
if (!video_frame_provider_ && !audio_renderer_) {
SetNetworkState(WebMediaPlayer::NetworkStateNetworkError);
@@ -479,4 +484,5 @@ void WebMediaPlayerMS::ResetCanvasCache() {
DCHECK(thread_checker_.CalledOnValidThread());
video_renderer_.ResetCache();
}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698