diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 17:14:40 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 17:14:40 +0000 |
| commit | 21aac7ca45e56ae51b50840b5d1fbd7c97b01af4 (patch) | |
| tree | 17b17145329fb6d735db9349d65990048230d336 /webkit | |
| parent | edeb8e66fe2b6390fa72c283c48e86f88ec7b3da (diff) | |
| download | chromium_src-21aac7ca45e56ae51b50840b5d1fbd7c97b01af4.zip chromium_src-21aac7ca45e56ae51b50840b5d1fbd7c97b01af4.tar.gz chromium_src-21aac7ca45e56ae51b50840b5d1fbd7c97b01af4.tar.bz2 | |
Support media stream layout test on all platforms.
This patch is to get prepared for enabling media stream in WebKit for Chromium on Android.
BUG=161417
TEST=enable MEDIA_STREAM in webkit, the test video-capture-preview.html passed on Android.
Review URL: https://codereview.chromium.org/11420026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/webkit_support.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 96f507b..f2f6a55 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -401,6 +401,15 @@ WebKit::WebMediaPlayer* CreateMediaPlayer( const WebURL& url, WebMediaPlayerClient* client, webkit_media::MediaStreamClient* media_stream_client) { + if (media_stream_client && media_stream_client->IsMediaStream(url)) { + return new webkit_media::WebMediaPlayerMS( + frame, + client, + base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), + media_stream_client, + new media::MediaLog()); + } + #if defined(OS_ANDROID) return new webkit_media::WebMediaPlayerInProcessAndroid( frame, @@ -417,15 +426,6 @@ WebKit::WebMediaPlayer* CreateMediaPlayer( scoped_ptr<media::FilterCollection> collection( new media::FilterCollection()); - if (media_stream_client && media_stream_client->IsMediaStream(url)) { - return new webkit_media::WebMediaPlayerMS( - frame, - client, - base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), - media_stream_client, - new media::MediaLog()); - } - return new webkit_media::WebMediaPlayerImpl( frame, client, |