diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-24 08:29:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-24 08:29:43 +0200 |
| commit | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (patch) | |
| tree | 3b94a9a9fa83efa384b8dac611cf8c6495532a62 /Tools/DumpRenderTree/chromium/WebViewHost.cpp | |
| parent | f53e6f8e798362ed712d4a51633b0d0b03dbc213 (diff) | |
| download | qtwebkit-2e2ba8ff45915f40ed3e014101269c175f2a89a0.tar.gz | |
Imported WebKit commit bf0b0213bbf3886c96610020602012ca7d11b084 (http://svn.webkit.org/repository/webkit/trunk@126545)
New snapshot with clang and python build fixes
Diffstat (limited to 'Tools/DumpRenderTree/chromium/WebViewHost.cpp')
| -rw-r--r-- | Tools/DumpRenderTree/chromium/WebViewHost.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.cpp b/Tools/DumpRenderTree/chromium/WebViewHost.cpp index 3ab8a8639..62ee93891 100644 --- a/Tools/DumpRenderTree/chromium/WebViewHost.cpp +++ b/Tools/DumpRenderTree/chromium/WebViewHost.cpp @@ -1006,12 +1006,12 @@ WebPlugin* WebViewHost::createPlugin(WebFrame* frame, const WebPluginParams& par return webkit_support::CreateWebPlugin(frame, params); } -WebMediaPlayer* WebViewHost::createMediaPlayer(WebFrame* frame, WebMediaPlayerClient* client) +WebMediaPlayer* WebViewHost::createMediaPlayer(WebFrame* frame, const WebURL& url, WebMediaPlayerClient* client) { #if ENABLE(MEDIA_STREAM) - return webkit_support::CreateMediaPlayer(frame, client, testMediaStreamClient()); + return webkit_support::CreateMediaPlayer(frame, url, client, testMediaStreamClient()); #else - return webkit_support::CreateMediaPlayer(frame, client); + return webkit_support::CreateMediaPlayer(frame, url, client); #endif } |