From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Tools/TestWebKitAPI/mac') diff --git a/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm b/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm index 57ec675..234223f 100644 --- a/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm +++ b/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm @@ -28,7 +28,9 @@ #include #include #include +#include #include +#include namespace TestWebKitAPI { namespace Util { @@ -62,6 +64,12 @@ WKURLRef URLForNonExistentResource() return WKURLCreateWithCFURL((CFURLRef)nsURL); } +WKRetainPtr MIMETypeForWKURLResponse(WKURLResponseRef wkResponse) +{ + RetainPtr response(AdoptNS, WKURLResponseCopyNSURLResponse(wkResponse)); + return adoptWK(WKStringCreateWithCFString((CFStringRef)[response.get() MIMEType])); +} + bool isKeyDown(WKNativeEventPtr event) { return [event type] == NSKeyDown; -- cgit v1.1