create a separate WebMediaPlayer for URL derived from media stream

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 174 matching lines @@
 #include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/web_intent_service_data.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/webkit_glue.h"
 #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"
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 
 #if defined(OS_ANDROID)
 #include "content/common/android/device_info.h"
 #include "content/renderer/android/address_detector.h"
 #include "content/renderer/android/content_detector.h"
@@ skipping 2302 matching lines @@
         new RendererGpuVideoDecoderFactories(
             gpu_channel_host, factories_loop, context3d)));
   }
 
   WebMediaPlayer* media_player =
       content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
           this, frame, client, AsWeakPtr(), collection, audio_source_provider,
           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 need to check for
media_stream_impl_ != NULL?

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

You should disable this new code path here instead of inside IsMediaStream()
returning false

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

yes, inside EnsureMediaStreamImpl(), the creation of media_stream_impl is under
macro ENABLE_WEBRTC. 

[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;
 }
 
 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(
     WebFrame* frame, WebApplicationCacheHostClient* client) {
   if (!frame || !frame->view())
     return NULL;
   return new RendererWebApplicationCacheHostImpl(
       FromWebView(frame->view()), client,
@@ skipping 3528 matching lines @@
 
   updating_frame_tree_ = true;
   active_frame_id_map_.clear();
 
   target_process_id_ = process_id;
   target_routing_id_ = route_id;
   CreateFrameTree(webview()->mainFrame(), frames);
 
   updating_frame_tree_ = false;
 }