From 7968428a96099f945dcd1381aefb60b0a2faa484 Mon Sep 17 00:00:00 2001 From: "scherkus@chromium.org" Date: Mon, 6 Dec 2010 21:15:46 +0000 Subject: Refactoring BufferedDataSource to work with WebURLLoader instead of a MediaResourceLoaderBridge. Attempt #2 after fixing some race conditions between Initialize() and Abort() (see r68363). One thing to notice is that both buffered_data_source_unittest and simple_data_source_unittest need to have a way to inject a MockWebURLLoader into the BufferedResourceLoader and the SimpleDataSource. In order to make sure a new one is not created during a Start(), I introduced the function SetURLLoaderForTest and keep_test_loader flag. Patch by annacc@chromium.org: http://codereview.chromium.org/3863002/ BUG=16751 TEST=src/xcodebuild/Debug/test_shell_tests --gtest_filter=Buffered* src/xcodebuild/Debug/test_shell_tests --gtest_filter=Simple* src/webkit/tools/layout_tests/run_webkit_tests.sh --debug media webkit/tools/layout_tests/run_webkit_tests.sh --debug http/tests/media git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68378 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webmediaplayer_impl.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'webkit/glue/webmediaplayer_impl.h') diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h index a0224b1..d1f73a0 100644 --- a/webkit/glue/webmediaplayer_impl.h +++ b/webkit/glue/webmediaplayer_impl.h @@ -69,6 +69,10 @@ class GURL; +namespace WebKit { +class WebFrame; +} + namespace webkit_glue { class MediaResourceLoaderBridgeFactory; @@ -176,8 +180,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer, // Finalizes initialization of the object. bool Initialize( - MediaResourceLoaderBridgeFactory* bridge_factory_simple, - MediaResourceLoaderBridgeFactory* bridge_factory_buffered, + WebKit::WebFrame* frame, bool use_simple_data_source, scoped_refptr web_video_renderer); -- cgit v1.1