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/WebKitPolicyDecision.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/WebKitPolicyDecision.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp index 6b6759012..3e9ef3fbf 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp @@ -20,9 +20,10 @@ #include "config.h" #include "WebKitPolicyDecision.h" +#include "WebFramePolicyListenerProxy.h" #include "WebKitPolicyDecisionPrivate.h" -#include "WebKitPrivate.h" +using namespace WebKit; /** * SECTION: WebKitPolicyDecision @@ -43,7 +44,7 @@ G_DEFINE_ABSTRACT_TYPE(WebKitPolicyDecision, webkit_policy_decision, G_TYPE_OBJECT) struct _WebKitPolicyDecisionPrivate { - WKRetainPtr<WKFramePolicyListenerRef> listener; + RefPtr<WebFramePolicyListenerProxy> listener; bool madePolicyDecision; }; @@ -60,13 +61,13 @@ static void webkitPolicyDecisionFinalize(GObject* object) // This is the default choice for all policy decisions in WebPageProxy.cpp. if (!priv->madePolicyDecision) - WKFramePolicyListenerUse(priv->listener.get()); + priv->listener->use(); priv->~WebKitPolicyDecisionPrivate(); G_OBJECT_CLASS(webkit_policy_decision_parent_class)->finalize(object); } -void webkitPolicyDecisionSetListener(WebKitPolicyDecision* decision, WKFramePolicyListenerRef listener) +void webkitPolicyDecisionSetListener(WebKitPolicyDecision* decision, WebFramePolicyListenerProxy* listener) { decision->priv->listener = listener; } @@ -87,7 +88,7 @@ static void webkit_policy_decision_class_init(WebKitPolicyDecisionClass* decisio void webkit_policy_decision_use(WebKitPolicyDecision* decision) { g_return_if_fail(WEBKIT_IS_POLICY_DECISION(decision)); - WKFramePolicyListenerUse(decision->priv->listener.get()); + decision->priv->listener->use(); decision->priv->madePolicyDecision = true; } @@ -101,7 +102,7 @@ void webkit_policy_decision_use(WebKitPolicyDecision* decision) void webkit_policy_decision_ignore(WebKitPolicyDecision* decision) { g_return_if_fail(WEBKIT_IS_POLICY_DECISION(decision)); - WKFramePolicyListenerIgnore(decision->priv->listener.get()); + decision->priv->listener->ignore(); decision->priv->madePolicyDecision = true; } @@ -114,6 +115,6 @@ void webkit_policy_decision_ignore(WebKitPolicyDecision* decision) void webkit_policy_decision_download(WebKitPolicyDecision* decision) { g_return_if_fail(WEBKIT_IS_POLICY_DECISION(decision)); - WKFramePolicyListenerDownload(decision->priv->listener.get()); + decision->priv->listener->download(); decision->priv->madePolicyDecision = true; } |