From 4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 29 Nov 2012 12:18:48 +0100 Subject: Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119) New snapshot that includes the fix for installing the QtWebProcess into libexec Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7 Reviewed-by: Simon Hausmann --- Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp') diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp index ff36a0b18..42939dd2d 100644 --- a/Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKit2/AboutBlankLoad.cpp @@ -31,11 +31,10 @@ namespace TestWebKitAPI { static bool done; -static void decidePolicyForResponse(WKPageRef, WKFrameRef, WKURLResponseRef response, WKURLRequestRef, WKFramePolicyListenerRef listener, WKTypeRef, const void*) +static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo) { - EXPECT_WK_STREQ("text/html", Util::MIMETypeForWKURLResponse(response)); - - WKFramePolicyListenerUse(listener); + WKRetainPtr mimeType = adoptWK(WKFrameCopyMIMEType(frame)); + EXPECT_WK_STREQ("text/html", mimeType); done = true; } @@ -44,11 +43,10 @@ TEST(WebKit2, AboutBlankLoad) WKRetainPtr context = adoptWK(WKContextCreate()); PlatformWebView webView(context.get()); - WKPagePolicyClient policyClient; - memset(&policyClient, 0, sizeof(policyClient)); - - policyClient.decidePolicyForResponse = decidePolicyForResponse; - WKPageSetPagePolicyClient(webView.page(), &policyClient); + WKPageLoaderClient loaderClient; + memset(&loaderClient, 0 , sizeof(loaderClient)); + loaderClient.didFinishLoadForFrame = didFinishLoadForFrame; + WKPageSetPageLoaderClient(webView.page(), &loaderClient); WKPageLoadURL(webView.page(), adoptWK(WKURLCreateWithUTF8CString("about:blank")).get()); -- cgit v1.2.1