From 2e2ba8ff45915f40ed3e014101269c175f2a89a0 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 24 Aug 2012 08:29:43 +0200 Subject: Imported WebKit commit bf0b0213bbf3886c96610020602012ca7d11b084 (http://svn.webkit.org/repository/webkit/trunk@126545) New snapshot with clang and python build fixes --- Tools/DumpRenderTree/chromium/WebViewHost.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Tools/DumpRenderTree/chromium/WebViewHost.cpp') 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 } -- cgit v1.2.1