Index: content/renderer/render_view_impl.cc |
=================================================================== |
--- content/renderer/render_view_impl.cc (revision 154837) |
+++ 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" |
@@ -2514,10 +2515,16 @@ |
audio_source_provider, message_loop_factory, media_stream_impl_, |
render_media_log); |
if (!media_player) { |
- media_player = new webkit_media::WebMediaPlayerImpl( |
- frame, client, AsWeakPtr(), collection, audio_source_provider, |
- audio_source_provider, message_loop_factory, media_stream_impl_, |
- render_media_log); |
+ EnsureMediaStreamImpl(); |
+ if (media_stream_impl_ && media_stream_impl_->IsMediaStream(url)) { |
scherkus (not reviewing)
2012/09/07 11:44:03
despite calling EnsureMediaStreamImpl() we still n
scherkus (not reviewing)
2012/09/07 11:44:03
You should disable this new code path here instead
wjia(left Chromium)
2012/09/13 01:22:07
yes, inside EnsureMediaStreamImpl(), the creation
wjia(left Chromium)
2012/09/13 01:22:07
Done.
|
+ media_player = new webkit_media::WebMediaPlayerMS( |
scherkus (not reviewing)
2012/09/07 11:44:03
this can be an early return
wjia(left Chromium)
2012/09/13 01:22:07
Done.
|
+ frame, client, AsWeakPtr(), media_stream_impl_, render_media_log); |
+ } else { |
+ media_player = new webkit_media::WebMediaPlayerImpl( |
+ frame, client, AsWeakPtr(), collection, audio_source_provider, |
+ audio_source_provider, message_loop_factory, media_stream_impl_, |
+ render_media_log); |
+ } |
} |
return media_player; |
} |