diff options
Diffstat (limited to 'webkit/tools/test_shell/test_webview_delegate.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 0fb610f..8b0b4bc 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -716,15 +716,14 @@ WebWorker* TestWebViewDelegate::createWorker( WebMediaPlayer* TestWebViewDelegate::createMediaPlayer( WebFrame* frame, WebMediaPlayerClient* client) { - scoped_refptr<media::FilterFactoryCollection> factory = - new media::FilterFactoryCollection(); + media::MediaFilterCollection collection; appcache::WebApplicationCacheHostImpl* appcache_host = appcache::WebApplicationCacheHostImpl::FromFrame(frame); // TODO(hclam): this is the same piece of code as in RenderView, maybe they // should be grouped together. - webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory = + webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_simple = new webkit_glue::MediaResourceLoaderBridgeFactory( GURL(frame->url()), // referrer "null", // frame origin @@ -732,10 +731,22 @@ WebMediaPlayer* TestWebViewDelegate::createMediaPlayer( base::GetCurrentProcId(), appcache_host ? appcache_host->host_id() : appcache::kNoHostId, 0); + 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, + 0); + + scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer = + new webkit_glue::VideoRendererImpl(false); + collection.push_back(video_renderer); return new webkit_glue::WebMediaPlayerImpl( - client, factory, bridge_factory, false, - new webkit_glue::VideoRendererImpl::FactoryFactory(false)); + client, collection, bridge_factory_simple, bridge_factory_buffered, + false, video_renderer); } WebApplicationCacheHost* TestWebViewDelegate::createApplicationCacheHost( |