diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
| commit | 43a42f108af6bcbd91f2672731c3047c26213af1 (patch) | |
| tree | 7fa092e5f5d873c72f2486a70e26be26f7a38bec /Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp | |
| parent | d9cf437c840c6eb7417bdd97e6c40979255d3158 (diff) | |
| download | qtwebkit-43a42f108af6bcbd91f2672731c3047c26213af1.tar.gz | |
Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067)
New snapshot that fixes build without QtWidgets
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp index 87fe90799..72a5266cc 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp @@ -21,24 +21,23 @@ #include "WebKitPolicyClient.h" #include "WebKitNavigationPolicyDecisionPrivate.h" -#include "WebKitPolicyDecision.h" -#include "WebKitPrivate.h" #include "WebKitResponsePolicyDecisionPrivate.h" #include "WebKitWebViewBasePrivate.h" #include "WebKitWebViewPrivate.h" #include <wtf/gobject/GRefPtr.h> +#include <wtf/text/CString.h> using namespace WebKit; static void decidePolicyForNavigationActionCallback(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo) { GRefPtr<WebKitNavigationPolicyDecision> decision = - adoptGRef(webkitNavigationPolicyDecisionCreate(navigationType, - mouseButton, - modifiers, - request, + adoptGRef(webkitNavigationPolicyDecisionCreate(static_cast<WebKitNavigationType>(navigationType), + wkEventMouseButtonToWebKitMouseButton(mouseButton), + wkEventModifiersToGdkModifiers(modifiers), + toImpl(request), 0, /* frame name */ - listener)); + toImpl(listener))); webkitWebViewMakePolicyDecision(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION, WEBKIT_POLICY_DECISION(decision.get())); @@ -47,12 +46,12 @@ static void decidePolicyForNavigationActionCallback(WKPageRef page, WKFrameRef f static void decidePolicyForNewWindowActionCallback(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo) { GRefPtr<WebKitNavigationPolicyDecision> decision = - adoptGRef(webkitNavigationPolicyDecisionCreate(navigationType, - mouseButton, - modifiers, - request, + adoptGRef(webkitNavigationPolicyDecisionCreate(static_cast<WebKitNavigationType>(navigationType), + wkEventMouseButtonToWebKitMouseButton(mouseButton), + wkEventModifiersToGdkModifiers(modifiers), + toImpl(request), toImpl(frameName)->string().utf8().data(), - listener)); + toImpl(listener))); webkitWebViewMakePolicyDecision(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION, WEBKIT_POLICY_DECISION(decision.get())); @@ -61,13 +60,13 @@ static void decidePolicyForNewWindowActionCallback(WKPageRef page, WKFrameRef fr static void decidePolicyForResponseCallback(WKPageRef page, WKFrameRef frame, WKURLResponseRef response, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo) { GRefPtr<WebKitResponsePolicyDecision> decision = - adoptGRef(webkitResponsePolicyDecisionCreate(request, response, listener)); + adoptGRef(webkitResponsePolicyDecisionCreate(toImpl(request), toImpl(response), toImpl(listener))); webkitWebViewMakePolicyDecision(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_POLICY_DECISION_TYPE_RESPONSE, WEBKIT_POLICY_DECISION(decision.get())); } -void attachPolicyClientToPage(WebKitWebView* webView) +void attachPolicyClientToView(WebKitWebView* webView) { WKPagePolicyClient policyClient = { kWKPagePolicyClientCurrentVersion, |