create a separate WebMediaPlayer for URL derived from media stream

webkit/support/webkit_support.cc

Index: webkit/support/webkit_support.cc
===================================================================
--- webkit/support/webkit_support.cc	(revision 154837)
+++ webkit/support/webkit_support.cc	(working copy)
@@ -61,7 +61,9 @@
 #include "webkit/media/android/webmediaplayer_android.h"
 #include "webkit/media/android/webmediaplayer_manager_android.h"
 #endif
+#include "webkit/media/media_stream_client.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_impl.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
@@ -400,16 +402,25 @@
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
 
-  return new webkit_media::WebMediaPlayerImpl(
-      frame,
-      client,
-      base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
-      collection.release(),
-      NULL,
-      NULL,
-      message_loop_factory.release(),
-      media_stream_client,
-      new media::MediaLog());
+  if (media_stream_client && media_stream_client->IsMediaStream(url)) {
+    return new webkit_media::WebMediaPlayerMS(
+        frame,
+        client,
+        base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
+        media_stream_client,
+        new media::MediaLog());
+  } else {

[scherkus (not reviewing), 2012/09/07 11:44:03]

no need for else

[wjia(left Chromium), 2012/09/13 01:22:07]

Done.

+    return new webkit_media::WebMediaPlayerImpl(
+        frame,
+        client,
+        base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
+        collection.release(),
+        NULL,
+        NULL,
+        message_loop_factory.release(),
+        media_stream_client,
+        new media::MediaLog());
+  }
 #endif
 }