diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Tools/TestWebKitAPI/mac | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Tools/TestWebKitAPI/mac')
-rw-r--r-- | Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm | 8 |
1 files changed, 8 insertions, 0 deletions
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 <WebKit2/WKRetainPtr.h> #include <WebKit2/WKStringCF.h> #include <WebKit2/WKURLCF.h> +#include <WebKit2/WKURLResponseNS.h> #include <WebKit2/WebKit2.h> +#include <wtf/RetainPtr.h> namespace TestWebKitAPI { namespace Util { @@ -62,6 +64,12 @@ WKURLRef URLForNonExistentResource() return WKURLCreateWithCFURL((CFURLRef)nsURL); } +WKRetainPtr<WKStringRef> MIMETypeForWKURLResponse(WKURLResponseRef wkResponse) +{ + RetainPtr<NSURLResponse> response(AdoptNS, WKURLResponseCopyNSURLResponse(wkResponse)); + return adoptWK(WKStringCreateWithCFString((CFStringRef)[response.get() MIMEType])); +} + bool isKeyDown(WKNativeEventPtr event) { return [event type] == NSKeyDown; |