summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 03:49:25 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 03:49:25 +0000
commitda952fdc5f0de04fba3add0bd90a9c7ca7c02afb (patch)
treec0eb59700cc8f45633ca971c824177ea17f5e466 /webkit/support
parent9a142c10e11ffcb972b3ec969c8d2b95939cfb02 (diff)
downloadchromium_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/support')
-rw-r--r--webkit/support/webkit_support.cc20
1 files changed, 9 insertions, 11 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index fd46091..267e24c 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -316,17 +316,15 @@ WebKit::WebMediaPlayer* 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(),
- media_stream_client,
- 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(),
+ media_stream_client,
+ new media::MediaLog());
#endif
}