| Index: chrome/renderer/render_view.cc
|
| ===================================================================
|
| --- chrome/renderer/render_view.cc (revision 68125)
|
| +++ chrome/renderer/render_view.cc (working copy)
|
| @@ -2818,10 +2818,29 @@
|
| MessageLoop::current(), context->context()));
|
| }
|
|
|
| - // TODO(annacc): do we still need appcache_host? http://crbug.com/65135
|
| - // WebApplicationCacheHostImpl* appcache_host =
|
| - // WebApplicationCacheHostImpl::FromFrame(frame);
|
| + WebApplicationCacheHostImpl* appcache_host =
|
| + WebApplicationCacheHostImpl::FromFrame(frame);
|
|
|
| + // TODO(hclam): obtain the following parameters from |client|.
|
| + // Create two bridge factory for two data sources.
|
| + webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_simple =
|
| + new webkit_glue::MediaResourceLoaderBridgeFactory(
|
| + GURL(frame->url()), // referrer
|
| + "null", // frame origin
|
| + "null", // main_frame_origin
|
| + base::GetCurrentProcId(),
|
| + appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
|
| + routing_id());
|
| +
|
| + webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_buffered =
|
| + new webkit_glue::MediaResourceLoaderBridgeFactory(
|
| + GURL(frame->url()), // referrer
|
| + "null", // frame origin
|
| + "null", // main_frame_origin
|
| + base::GetCurrentProcId(),
|
| + appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
|
| + routing_id());
|
| +
|
| scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer;
|
| bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging);
|
| scoped_refptr<webkit_glue::VideoRendererImpl> renderer(
|
| @@ -2831,7 +2850,8 @@
|
|
|
| scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
|
| new webkit_glue::WebMediaPlayerImpl(client, collection.release()));
|
| - if (!result->Initialize(frame,
|
| + if (!result->Initialize(bridge_factory_simple,
|
| + bridge_factory_buffered,
|
| cmd_line->HasSwitch(switches::kSimpleDataSource),
|
| video_renderer)) {
|
| return NULL;
|
|
|