diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-06 21:15:46 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-06 21:15:46 +0000 |
| commit | 7968428a96099f945dcd1381aefb60b0a2faa484 (patch) | |
| tree | 55fa6a12e12327243f245c83aaab5676c515a7ec /webkit/support | |
| parent | b8aa9d19922b5e8f9c5ba359daff1c8a94464768 (diff) | |
| download | chromium_src-7968428a96099f945dcd1381aefb60b0a2faa484.zip chromium_src-7968428a96099f945dcd1381aefb60b0a2faa484.tar.gz chromium_src-7968428a96099f945dcd1381aefb60b0a2faa484.tar.bz2 | |
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
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index be3c88a..7183cdb 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -270,27 +270,9 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame, scoped_ptr<media::FilterCollection> collection( new media::FilterCollection()); - 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_simple = - new webkit_glue::MediaResourceLoaderBridgeFactory( - GURL(), // referrer - "null", // frame origin - "null", // main_frame_origin - base::GetCurrentProcId(), - appcache_host ? appcache_host->host_id() : appcache::kNoHostId, - 0); - webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_buffered = - new webkit_glue::MediaResourceLoaderBridgeFactory( - GURL(), // referrer - "null", // frame origin - "null", // main_frame_origin - base::GetCurrentProcId(), - appcache_host ? appcache_host->host_id() : appcache::kNoHostId, - 0); + // TODO(annacc): do we still need appcache_host? http://crbug.com/65135 + // appcache::WebApplicationCacheHostImpl* appcache_host = + // appcache::WebApplicationCacheHostImpl::FromFrame(frame); scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( new webkit_glue::VideoRendererImpl(false)); @@ -298,10 +280,7 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame, scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( new webkit_glue::WebMediaPlayerImpl(client, collection.release())); - if (!result->Initialize(bridge_factory_simple, - bridge_factory_buffered, - false, - video_renderer)) { + if (!result->Initialize(frame, false, video_renderer)) { return NULL; } return result.release(); |