From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebKit2/UIProcess/WebPolicyClient.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'Source/WebKit2/UIProcess/WebPolicyClient.cpp') diff --git a/Source/WebKit2/UIProcess/WebPolicyClient.cpp b/Source/WebKit2/UIProcess/WebPolicyClient.cpp index 6296664..c57c896 100644 --- a/Source/WebKit2/UIProcess/WebPolicyClient.cpp +++ b/Source/WebKit2/UIProcess/WebPolicyClient.cpp @@ -26,6 +26,7 @@ #include "config.h" #include "WebPolicyClient.h" +#include "APIObject.h" #include "WKAPICast.h" #include "WebURLRequest.h" @@ -55,15 +56,24 @@ bool WebPolicyClient::decidePolicyForNewWindowAction(WebPageProxy* page, WebFram return true; } -bool WebPolicyClient::decidePolicyForMIMEType(WebPageProxy* page, WebFrameProxy* frame, const String& MIMEType, const ResourceRequest& resourceRequest, WebFramePolicyListenerProxy* listener, APIObject* userData) +bool WebPolicyClient::decidePolicyForResponse(WebPageProxy* page, WebFrameProxy* frame, const ResourceResponse& resourceResponse, const ResourceRequest& resourceRequest, WebFramePolicyListenerProxy* listener, APIObject* userData) { - if (!m_client.decidePolicyForMIMEType) + if (!m_client.decidePolicyForResponse) return false; + RefPtr response = WebURLResponse::create(resourceResponse); RefPtr request = WebURLRequest::create(resourceRequest); - m_client.decidePolicyForMIMEType(toAPI(page), toAPI(frame), toAPI(MIMEType.impl()), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client.clientInfo); + m_client.decidePolicyForResponse(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), toAPI(listener), toAPI(userData), m_client.clientInfo); return true; } +void WebPolicyClient::unableToImplementPolicy(WebPageProxy* page, WebFrameProxy* frame, const ResourceError& error, APIObject* userData) +{ + if (!m_client.unableToImplementPolicy) + return; + + m_client.unableToImplementPolicy(toAPI(page), toAPI(frame), toAPI(error), toAPI(userData), m_client.clientInfo); +} + } // namespace WebKit -- cgit v1.1