From 79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 25 Jun 2012 13:35:59 +0200 Subject: Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc (http://svn.webkit.org/repository/webkit/trunk@121147) New snapshot that includes Win32 debug build fix (use SVGAllInOne) --- Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h') diff --git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h index 53a24d666..b3c94fe58 100644 --- a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h +++ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h @@ -186,10 +186,10 @@ private: static void getSupportedTypes(WTF::HashSet&); #if ENABLE(ENCRYPTED_MEDIA) static WebCore::MediaPlayer::SupportsType supportsType( - const WTF::String& type, const WTF::String& codecs, const String& keySystem); + const WTF::String& type, const WTF::String& codecs, const String& keySystem, const WebCore::KURL&); #else static WebCore::MediaPlayer::SupportsType supportsType( - const WTF::String& type, const WTF::String& codecs); + const WTF::String& type, const WTF::String& codecs, const WebCore::KURL&); #endif #if USE(ACCELERATED_COMPOSITING) bool acceleratedRenderingInUse(); -- cgit v1.2.1