diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 18:26:02 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 18:26:02 +0000 |
| commit | 97b150db503dcb65ead6d62e6463868e10ac85a2 (patch) | |
| tree | a33e10426d0a9b5dcda0f53a44361adf45c1261c /webkit/tools | |
| parent | 9d594d6345bf4a32b47f4d960aeed7e558bbd485 (diff) | |
| download | chromium_src-97b150db503dcb65ead6d62e6463868e10ac85a2.zip chromium_src-97b150db503dcb65ead6d62e6463868e10ac85a2.tar.gz chromium_src-97b150db503dcb65ead6d62e6463868e10ac85a2.tar.bz2 | |
add url as additional argument to createMediaPlayer.
Since this touches API in WebKit, it takes 3 steps:
1. add a new function createMediaPlayer with url as additional argument (this patch);
2. corresponding change in WebKit;
3. remove the old createMediaPlayer (without url).
This is the second patch to allow render_view_impl to create different WebKit::WebMediaPlayer based on URL.
The new approach (https://docs.google.com/a/chromium.org/document/d/1lH9gzjUzA3L1pEPHWVOae6KpzB4IlIDOM-4lLbwGMgY/edit)
will have a new WebKit::WebMediaPlayer when URL is media stream (refer to prototype patch http://codereview.chromium.org/10382048/,
render_view_impl.cc shows how a different WebKit::WebMediaPlayer is created based on URL).
BUG=142988
Review URL: https://chromiumcodereview.appspot.com/10537091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 7 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 09e59f5..8e90a2c 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -635,6 +635,13 @@ WebPlugin* TestWebViewDelegate::createPlugin(WebFrame* frame, frame, params, plugins.front().path, AsWeakPtr()); } +// TODO(wjia): remove the version without url when WebKit change is done. +// http://webk.it/91301. +WebMediaPlayer* TestWebViewDelegate::createMediaPlayer( + WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) { + return createMediaPlayer(frame, client); +} + WebMediaPlayer* TestWebViewDelegate::createMediaPlayer( WebFrame* frame, WebMediaPlayerClient* client) { scoped_ptr<media::MessageLoopFactory> message_loop_factory( diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index 4fcbaff..019e84e 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -166,6 +166,8 @@ class TestWebViewDelegate : public WebKit::WebViewClient, virtual WebKit::WebPlugin* createPlugin( WebKit::WebFrame*, const WebKit::WebPluginParams&); virtual WebKit::WebMediaPlayer* createMediaPlayer( + WebKit::WebFrame*, const WebKit::WebURL&, WebKit::WebMediaPlayerClient*); + virtual WebKit::WebMediaPlayer* createMediaPlayer( WebKit::WebFrame*, WebKit::WebMediaPlayerClient*); virtual WebKit::WebApplicationCacheHost* createApplicationCacheHost( WebKit::WebFrame*, WebKit::WebApplicationCacheHostClient*); |