Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| =================================================================== |
| --- content/renderer/render_view_impl.cc (revision 114311) |
| +++ content/renderer/render_view_impl.cc (working copy) |
| @@ -1939,9 +1939,13 @@ |
| // Add in any custom filter factories first. |
| const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
| + |
| + AudioRendererImpl* audio_renderer = NULL; |
| if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
| // Add the chrome specific audio renderer. |
| - collection->AddAudioRenderer(new AudioRendererImpl()); |
| + // collection->AddAudioRenderer(new AudioRendererImpl()); |
|
tommi (sloooow) - chröme
2011/12/19 15:26:24
remove this?
Chris Rogers
2011/12/19 21:40:35
Done.
|
| + audio_renderer = new AudioRendererImpl( /*MessageLoop::current()*/ ); |
|
tommi (sloooow) - chröme
2011/12/19 15:26:24
remove /**/ bit?
Chris Rogers
2011/12/19 21:40:35
Done.
|
| + collection->AddAudioRenderer(audio_renderer); |
| } |
| #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) |
| @@ -1963,12 +1967,20 @@ |
| } |
| #endif |
| + // scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( |
|
tommi (sloooow) - chröme
2011/12/19 15:26:24
remove?
Chris Rogers
2011/12/19 21:40:35
Done.
|
| + // new webkit_glue::WebMediaPlayerImpl(client, |
| + // AsWeakPtr(), |
| + // collection.release(), |
| + // audio_renderer, |
| + // message_loop_factory.release(), |
| + // media_stream_impl_.get(), |
| + // new RenderMediaLog())); |
| webkit_media::WebMediaPlayerImpl* result_ptr; |
| if (!content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( |
| this, client, AsWeakPtr(), collection, message_loop_factory, |
| media_stream_impl_.get(), render_media_log, &result_ptr)) { |
| result_ptr = new webkit_media::WebMediaPlayerImpl( |
| - client, AsWeakPtr(), collection, message_loop_factory, |
| + client, AsWeakPtr(), collection, audio_renderer, message_loop_factory, |
| media_stream_impl_.get(), render_media_log); |
| } |