summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc7
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h2
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*);