diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 03:49:25 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 03:49:25 +0000 |
| commit | da952fdc5f0de04fba3add0bd90a9c7ca7c02afb (patch) | |
| tree | c0eb59700cc8f45633ca971c824177ea17f5e466 /webkit/tools | |
| parent | 9a142c10e11ffcb972b3ec969c8d2b95939cfb02 (diff) | |
| download | chromium_src-da952fdc5f0de04fba3add0bd90a9c7ca7c02afb.zip chromium_src-da952fdc5f0de04fba3add0bd90a9c7ca7c02afb.tar.gz chromium_src-da952fdc5f0de04fba3add0bd90a9c7ca7c02afb.tar.bz2 | |
Fold WebMediaPlayerImpl::Initialize() into the constructor.
OverrideCreateWebMediaPlayer() was simplified to return a pointer instead of relying on a bool+out-param since unlike OverrideCreatePlugin() we don't require blocking creation of media players.
BUG=109958
Review URL: http://codereview.chromium.org/9187045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 13b84849..f7a5865 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -647,17 +647,15 @@ WebMediaPlayer* TestWebViewDelegate::createMediaPlayer( scoped_ptr<media::FilterCollection> collection( new media::FilterCollection()); - webkit_media::WebMediaPlayerImpl* media_player = - new webkit_media::WebMediaPlayerImpl( - client, - base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), - collection.release(), - NULL, - message_loop_factory.release(), - NULL, - new media::MediaLog()); - media_player->Initialize(frame); - return media_player; + return new webkit_media::WebMediaPlayerImpl( + frame, + client, + base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), + collection.release(), + NULL, + message_loop_factory.release(), + NULL, + new media::MediaLog()); } WebApplicationCacheHost* TestWebViewDelegate::createApplicationCacheHost( |