Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: webkit/support/webkit_support.cc

Issue 9195001: Remove --simple-data-source and convert WebMediaPlayerImpl::Initialize() to a void function. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: no dcheck Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/webmediaplayer_impl.cc ('k') | webkit/tools/test_shell/test_webview_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/webkit_support.cc
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 4b0c317d4388a0656254b00f2572a38cafdbee1e..fd46091f4b142a69c98f27f109707a99aa014152 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -316,7 +316,7 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
scoped_ptr<media::FilterCollection> collection(
new media::FilterCollection());
- scoped_ptr<webkit_media::WebMediaPlayerImpl> result(
+ webkit_media::WebMediaPlayerImpl* media_player =
new webkit_media::WebMediaPlayerImpl(
client,
base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
@@ -324,11 +324,9 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
NULL,
message_loop_factory.release(),
media_stream_client,
- new media::MediaLog()));
- if (!result->Initialize(frame, false)) {
- return NULL;
- }
- return result.release();
+ new media::MediaLog());
+ media_player->Initialize(frame);
+ return media_player;
#endif
}
« no previous file with comments | « webkit/media/webmediaplayer_impl.cc ('k') | webkit/tools/test_shell/test_webview_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698