Index: content/renderer/render_view_impl.cc |
=================================================================== |
--- content/renderer/render_view_impl.cc (revision 155219) |
+++ content/renderer/render_view_impl.cc (working copy) |
@@ -192,6 +192,7 @@ |
#include "webkit/glue/weburlresponse_extradata_impl.h" |
#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" |
#include "webkit/media/webmediaplayer_impl.h" |
+#include "webkit/media/webmediaplayer_ms.h" |
#include "webkit/plugins/npapi/plugin_list.h" |
#include "webkit/plugins/npapi/webplugin_delegate.h" |
#include "webkit/plugins/npapi/webplugin_delegate_impl.h" |
@@ -2523,6 +2524,16 @@ |
audio_source_provider, message_loop_factory, media_stream_impl_, |
render_media_log); |
if (!media_player) { |
+ EnsureMediaStreamImpl(); |
+ const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
scherkus (not reviewing)
2012/09/20 19:27:00
nit: this is already declared at line 2486
wjia(left Chromium)
2012/09/21 19:47:27
Done.
|
+ if (cmd_line->HasSwitch(switches::kEnableMediaPlayerSwitch) && |
+ media_stream_impl_ && media_stream_impl_->IsMediaStream(url)) { |
+ // TODO(wjia): when all patches related to WebMediaPlayerMS have been |
scherkus (not reviewing)
2012/09/20 19:27:00
indent looks wrong here
wjia(left Chromium)
2012/09/21 19:47:27
Done.
|
+ // landed, remove the switch. Refer to crbug.com/142988. |
+ return new webkit_media::WebMediaPlayerMS( |
+ frame, client, AsWeakPtr(), media_stream_impl_, render_media_log); |
+ } |
+ |
media_player = new webkit_media::WebMediaPlayerImpl( |
frame, client, AsWeakPtr(), collection, audio_source_provider, |
audio_source_provider, message_loop_factory, media_stream_impl_, |