diff options
| author | scottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-05 23:26:40 +0000 |
|---|---|---|
| committer | scottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-05 23:26:40 +0000 |
| commit | 090f7313473bb61b6b294f1bfbb3b05f9140dec3 (patch) | |
| tree | 1b576c7618ac4f85a45ab7aa1237a3aff8597276 /webkit/support | |
| parent | d91b48f15b5e550f5e0ff3550d51ef8aeebdd2b1 (diff) | |
| download | chromium_src-090f7313473bb61b6b294f1bfbb3b05f9140dec3.zip chromium_src-090f7313473bb61b6b294f1bfbb3b05f9140dec3.tar.gz chromium_src-090f7313473bb61b6b294f1bfbb3b05f9140dec3.tar.bz2 | |
Plumb media data from renderers up to MediaInternals in the browser process.
Relanding 95542. Reverted due to issue caused by 95496.
BUG=none
TEST=manually
Review URL: http://codereview.chromium.org/7480032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 139c4b4..c0c6766 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -27,6 +27,7 @@ #include "googleurl/src/url_util.h" #include "grit/webkit_chromium_resources.h" #include "media/base/filter_collection.h" +#include "media/base/media_log.h" #include "media/base/message_loop_factory_impl.h" #include "net/base/escape.h" #include "net/base/net_errors.h" @@ -309,7 +310,8 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame, new webkit_glue::WebMediaPlayerImpl(client, collection.release(), message_loop_factory.release(), - NULL)); + NULL, + new media::MediaLog())); if (!result->Initialize(frame, false, video_renderer)) { return NULL; } |