<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172211] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172211">172211</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-07 07:58:11 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Use WebKitNavigationAction also for WebKitNavigationPolicyDecision
https://bugs.webkit.org/show_bug.cgi?id=135695
Reviewed by Gustavo Noronha Silva.
Source/WebKit2:
WebKitNavigationAction was introduced to extend WebKitWebView::create signal
and its API is mostly duplicated in WebKitNavigationPolicyDecision.
Use WebKitNavigationAction insternally in WebKitNavigationPolicyDecision and
deprecated all the duplicated API in favor of a single property navigation-action.
* UIProcess/API/gtk/WebKitDefines.h: Remove unused macro
WEBKIT_OBSOLETE and add WEBKIT_DEPRECATED and WEBKIT_DEPRECATED_FOR.
* UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp:
(_WebKitNavigationPolicyDecisionPrivate::~_WebKitNavigationPolicyDecisionPrivate):
Free the WebKitNavigationAction.
(webkitNavigationPolicyDecisionGetProperty): Add getter for
navigation-action and use WebKitNavigationAction in all other getters.
(webkit_navigation_policy_decision_class_init): Add navigation-action
property and deprecated all others except frame-name.
(webkit_navigation_policy_decision_get_navigation_action): Return the WebKitNavigationAction.
(webkit_navigation_policy_decision_get_navigation_type): Use WebKitNavigationAction.
(webkit_navigation_policy_decision_get_mouse_button): Ditto.
(webkit_navigation_policy_decision_get_modifiers): Ditto.
(webkit_navigation_policy_decision_get_request): Ditto.
(webkitNavigationPolicyDecisionCreate):
(webkitNewWindowPolicyDecisionCreate):
* UIProcess/API/gtk/WebKitNavigationPolicyDecision.h:
* UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h:
* UIProcess/API/gtk/WebKitPolicyClient.cpp: Use a custom
PolicyClient class so that we receive a NavigationActionData in
the callbacks.
(attachPolicyClientToView):
(toWebKitNavigationType): Deleted.
(decidePolicyForNavigationAction): Deleted.
(decidePolicyForNewWindowAction): Deleted.
(decidePolicyForResponse): Deleted.
* UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:
(webkitResponsePolicyDecisionCreate):
* UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h:
* UIProcess/API/gtk/docs/webkit2gtk-docs.sgml: Add new section for
deprecated symbols.
* UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new symbols.
Tools:
Use WebKitNavigationAction API.
* MiniBrowser/gtk/BrowserWindow.c:
(webViewDecidePolicy):
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp:
(testNavigationPolicy):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitDefinesh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationPolicyDecisioncpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationPolicyDecisionh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationPolicyDecisionPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPolicyClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitResponsePolicyDecisioncpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitResponsePolicyDecisionPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkdocswebkit2gtkdocssgml">trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkdocswebkit2gtksectionstxt">trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsergtkBrowserWindowc">trunk/Tools/MiniBrowser/gtk/BrowserWindow.c</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitPolicyClientcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-08-07 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Use WebKitNavigationAction also for WebKitNavigationPolicyDecision
+ https://bugs.webkit.org/show_bug.cgi?id=135695
+
+ Reviewed by Gustavo Noronha Silva.
+
+ WebKitNavigationAction was introduced to extend WebKitWebView::create signal
+ and its API is mostly duplicated in WebKitNavigationPolicyDecision.
+ Use WebKitNavigationAction insternally in WebKitNavigationPolicyDecision and
+ deprecated all the duplicated API in favor of a single property navigation-action.
+
+ * UIProcess/API/gtk/WebKitDefines.h: Remove unused macro
+ WEBKIT_OBSOLETE and add WEBKIT_DEPRECATED and WEBKIT_DEPRECATED_FOR.
+ * UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp:
+ (_WebKitNavigationPolicyDecisionPrivate::~_WebKitNavigationPolicyDecisionPrivate):
+ Free the WebKitNavigationAction.
+ (webkitNavigationPolicyDecisionGetProperty): Add getter for
+ navigation-action and use WebKitNavigationAction in all other getters.
+ (webkit_navigation_policy_decision_class_init): Add navigation-action
+ property and deprecated all others except frame-name.
+ (webkit_navigation_policy_decision_get_navigation_action): Return the WebKitNavigationAction.
+ (webkit_navigation_policy_decision_get_navigation_type): Use WebKitNavigationAction.
+ (webkit_navigation_policy_decision_get_mouse_button): Ditto.
+ (webkit_navigation_policy_decision_get_modifiers): Ditto.
+ (webkit_navigation_policy_decision_get_request): Ditto.
+ (webkitNavigationPolicyDecisionCreate):
+ (webkitNewWindowPolicyDecisionCreate):
+ * UIProcess/API/gtk/WebKitNavigationPolicyDecision.h:
+ * UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h:
+ * UIProcess/API/gtk/WebKitPolicyClient.cpp: Use a custom
+ PolicyClient class so that we receive a NavigationActionData in
+ the callbacks.
+ (attachPolicyClientToView):
+ (toWebKitNavigationType): Deleted.
+ (decidePolicyForNavigationAction): Deleted.
+ (decidePolicyForNewWindowAction): Deleted.
+ (decidePolicyForResponse): Deleted.
+ * UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:
+ (webkitResponsePolicyDecisionCreate):
+ * UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h:
+ * UIProcess/API/gtk/docs/webkit2gtk-docs.sgml: Add new section for
+ deprecated symbols.
+ * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new symbols.
+
</ins><span class="cx"> 2014-08-06 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Move Soup specific code out of WebCoreArgumentCoders.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -38,10 +38,11 @@
</span><span class="cx"> # else
</span><span class="cx"> # define WEBKIT_API __declspec(dllimport)
</span><span class="cx"> # endif
</span><del>-# define WEBKIT_OBSOLETE_API WEBKIT_API
</del><span class="cx"> #else
</span><span class="cx"> # define WEBKIT_API __attribute__((visibility("default")))
</span><del>-# define WEBKIT_OBSOLETE_API WEBKIT_API __attribute__((deprecated))
</del><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#define WEBKIT_DEPRECATED WEBKIT_API G_DEPRECATED
+#define WEBKIT_DEPRECATED_FOR(f) WEBKIT_API G_DEPRECATED_FOR(f)
+
</ins><span class="cx"> #endif // WebKitDefines_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationPolicyDecisioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -20,9 +20,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitNavigationPolicyDecision.h"
</span><span class="cx">
</span><del>-#include "APIURLRequest.h"
-#include "WebEvent.h"
</del><span class="cx"> #include "WebKitEnumTypes.h"
</span><ins>+#include "WebKitNavigationActionPrivate.h"
+#include "WebKitNavigationPolicyDecisionPrivate.h"
</ins><span class="cx"> #include "WebKitPolicyDecisionPrivate.h"
</span><span class="cx"> #include "WebKitURIRequestPrivate.h"
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="lines">@@ -44,10 +44,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> struct _WebKitNavigationPolicyDecisionPrivate {
</span><del>- WebKitNavigationType navigationType;
- unsigned modifiers;
- unsigned mouseButton;
- GRefPtr<WebKitURIRequest> request;
</del><ins>+ ~_WebKitNavigationPolicyDecisionPrivate()
+ {
+ webkit_navigation_action_free(navigationAction);
+ }
+
+ WebKitNavigationAction* navigationAction;
</ins><span class="cx"> CString frameName;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -55,6 +57,7 @@
</span><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> PROP_0,
</span><ins>+ PROP_NAVIGATION_ACTION,
</ins><span class="cx"> PROP_NAVIGATION_TYPE,
</span><span class="cx"> PROP_MOUSE_BUTTON,
</span><span class="cx"> PROP_MODIFIERS,
</span><span class="lines">@@ -66,17 +69,20 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitNavigationPolicyDecision* decision = WEBKIT_NAVIGATION_POLICY_DECISION(object);
</span><span class="cx"> switch (propId) {
</span><ins>+ case PROP_NAVIGATION_ACTION:
+ g_value_set_boxed(value, webkit_navigation_policy_decision_get_navigation_action(decision));
+ break;
</ins><span class="cx"> case PROP_NAVIGATION_TYPE:
</span><del>- g_value_set_enum(value, webkit_navigation_policy_decision_get_navigation_type(decision));
</del><ins>+ g_value_set_enum(value, webkit_navigation_action_get_navigation_type(decision->priv->navigationAction));
</ins><span class="cx"> break;
</span><span class="cx"> case PROP_MOUSE_BUTTON:
</span><del>- g_value_set_enum(value, webkit_navigation_policy_decision_get_mouse_button(decision));
</del><ins>+ g_value_set_enum(value, webkit_navigation_action_get_mouse_button(decision->priv->navigationAction));
</ins><span class="cx"> break;
</span><span class="cx"> case PROP_MODIFIERS:
</span><del>- g_value_set_uint(value, webkit_navigation_policy_decision_get_modifiers(decision));
</del><ins>+ g_value_set_uint(value, webkit_navigation_action_get_modifiers(decision->priv->navigationAction));
</ins><span class="cx"> break;
</span><span class="cx"> case PROP_REQUEST:
</span><del>- g_value_set_object(value, webkit_navigation_policy_decision_get_request(decision));
</del><ins>+ g_value_set_object(value, webkit_navigation_action_get_request(decision->priv->navigationAction));
</ins><span class="cx"> break;
</span><span class="cx"> case PROP_FRAME_NAME:
</span><span class="cx"> g_value_set_string(value, webkit_navigation_policy_decision_get_frame_name(decision));
</span><span class="lines">@@ -93,11 +99,30 @@
</span><span class="cx"> objectClass->get_property = webkitNavigationPolicyDecisionGetProperty;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * WebKitNavigationPolicyDecision:navigation-action:
+ *
+ * The #WebKitNavigationAction that triggered this policy decision.
+ *
+ * Since: 2.6
+ */
+ g_object_class_install_property(
+ objectClass,
+ PROP_NAVIGATION_ACTION,
+ g_param_spec_boxed(
+ "navigation-action",
+ _("Navigation action"),
+ _("The WebKitNavigationAction triggering this decision"),
+ WEBKIT_TYPE_NAVIGATION_ACTION,
+ WEBKIT_PARAM_READABLE));
+
+ /**
</ins><span class="cx"> * WebKitNavigationPolicyDecision:navigation-type:
</span><span class="cx"> *
</span><span class="cx"> * The type of navigation that triggered this policy decision. This is
</span><span class="cx"> * useful for enacting different policies depending on what type of user
</span><span class="cx"> * action caused the navigation.
</span><ins>+ *
+ * Deprecated: 2.6: Use #WebKitNavigationPolicyDecision:navigation-action instead
</ins><span class="cx"> */
</span><span class="cx"> g_object_class_install_property(objectClass,
</span><span class="cx"> PROP_NAVIGATION_TYPE,
</span><span class="lines">@@ -116,6 +141,8 @@
</span><span class="cx"> * of the button triggering that event. The button numbers match those from GDK.
</span><span class="cx"> * If the navigation was not triggered by a mouse event, the value of this
</span><span class="cx"> * property will be 0.
</span><ins>+ *
+ * Deprecated: 2.6: Use #WebKitNavigationPolicyDecision:navigation-action instead
</ins><span class="cx"> */
</span><span class="cx"> g_object_class_install_property(objectClass,
</span><span class="cx"> PROP_MOUSE_BUTTON,
</span><span class="lines">@@ -133,6 +160,8 @@
</span><span class="cx"> * #GdkModifierType values describing the modifiers used for that click.
</span><span class="cx"> * If the navigation was not triggered by a mouse event or no modifiers
</span><span class="cx"> * were active, the value of this property will be zero.
</span><ins>+ *
+ * Deprecated: 2.6: Use #WebKitNavigationPolicyDecision:navigation-action instead
</ins><span class="cx"> */
</span><span class="cx"> g_object_class_install_property(objectClass,
</span><span class="cx"> PROP_MODIFIERS,
</span><span class="lines">@@ -147,6 +176,8 @@
</span><span class="cx"> *
</span><span class="cx"> * This property contains the #WebKitURIRequest associated with this
</span><span class="cx"> * navigation.
</span><ins>+ *
+ * Deprecated: 2.6: Use #WebKitNavigationPolicyDecision:navigation-action instead
</ins><span class="cx"> */
</span><span class="cx"> g_object_class_install_property(objectClass,
</span><span class="cx"> PROP_REQUEST,
</span><span class="lines">@@ -174,17 +205,35 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * webkit_navigation_policy_decision_get_navigation_action:
+ * @decision: a #WebKitNavigationPolicyDecision
+ *
+ * Gets the value of the #WebKitNavigationPolicyDecision:navigation-action property.
+ *
+ * Returns: (transfer none): The #WebKitNavigationAction triggering this policy decision.
+ *
+ * Since: 2.6
+ */
+WebKitNavigationAction* webkit_navigation_policy_decision_get_navigation_action(WebKitNavigationPolicyDecision* decision)
+{
+ g_return_val_if_fail(WEBKIT_IS_NAVIGATION_POLICY_DECISION(decision), nullptr);
+ return decision->priv->navigationAction;
+}
+
+/**
</ins><span class="cx"> * webkit_navigation_policy_decision_get_navigation_type:
</span><span class="cx"> * @decision: a #WebKitNavigationPolicyDecision
</span><span class="cx"> *
</span><span class="cx"> * Gets the value of the #WebKitNavigationPolicyDecision:navigation-type property.
</span><span class="cx"> *
</span><span class="cx"> * Returns: The type of navigation triggering this policy decision.
</span><ins>+ *
+ * Deprecated: 2.6: Use webkit_navigation_policy_decision_get_navigation_action() instead.
</ins><span class="cx"> */
</span><span class="cx"> WebKitNavigationType webkit_navigation_policy_decision_get_navigation_type(WebKitNavigationPolicyDecision* decision)
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_NAVIGATION_POLICY_DECISION(decision), WEBKIT_NAVIGATION_TYPE_OTHER);
</span><del>- return decision->priv->navigationType;
</del><ins>+ return webkit_navigation_action_get_navigation_type(decision->priv->navigationAction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -194,11 +243,13 @@
</span><span class="cx"> * Gets the value of the #WebKitNavigationPolicyDecision:mouse-button property.
</span><span class="cx"> *
</span><span class="cx"> * Returns: The mouse button used if this decision was triggered by a mouse event or 0 otherwise
</span><ins>+ *
+ * Deprecated: 2.6: Use webkit_navigation_policy_decision_get_navigation_action() instead.
</ins><span class="cx"> */
</span><span class="cx"> guint webkit_navigation_policy_decision_get_mouse_button(WebKitNavigationPolicyDecision* decision)
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_NAVIGATION_POLICY_DECISION(decision), 0);
</span><del>- return decision->priv->mouseButton;
</del><ins>+ return webkit_navigation_action_get_mouse_button(decision->priv->navigationAction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -208,11 +259,13 @@
</span><span class="cx"> * Gets the value of the #WebKitNavigationPolicyDecision:modifiers property.
</span><span class="cx"> *
</span><span class="cx"> * Returns: The modifiers active if this decision was triggered by a mouse event
</span><ins>+ *
+ * Deprecated: 2.6: Use webkit_navigation_policy_decision_get_navigation_action() instead.
</ins><span class="cx"> */
</span><span class="cx"> unsigned webkit_navigation_policy_decision_get_modifiers(WebKitNavigationPolicyDecision* decision)
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_NAVIGATION_POLICY_DECISION(decision), 0);
</span><del>- return decision->priv->modifiers;
</del><ins>+ return webkit_navigation_action_get_modifiers(decision->priv->navigationAction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -222,11 +275,13 @@
</span><span class="cx"> * Gets the value of the #WebKitNavigationPolicyDecision:request property.
</span><span class="cx"> *
</span><span class="cx"> * Returns: (transfer none): The URI request that is associated with this navigation
</span><ins>+ *
+ * Deprecated: 2.6: Use webkit_navigation_policy_decision_get_navigation_action() instead.
</ins><span class="cx"> */
</span><span class="cx"> WebKitURIRequest* webkit_navigation_policy_decision_get_request(WebKitNavigationPolicyDecision* decision)
</span><span class="cx"> {
</span><del>- g_return_val_if_fail(WEBKIT_IS_NAVIGATION_POLICY_DECISION(decision), 0);
- return decision->priv->request.get();
</del><ins>+ g_return_val_if_fail(WEBKIT_IS_NAVIGATION_POLICY_DECISION(decision), nullptr);
+ return webkit_navigation_action_get_request(decision->priv->navigationAction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -243,14 +298,19 @@
</span><span class="cx"> return decision->priv->frameName.data();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitNavigationPolicyDecision* webkitNavigationPolicyDecisionCreate(WebKitNavigationType navigationType, unsigned mouseButton, unsigned modifiers, API::URLRequest* request, const char* frameName, WebFramePolicyListenerProxy* listener)
</del><ins>+WebKitPolicyDecision* webkitNavigationPolicyDecisionCreate(const NavigationActionData& navigationActionData, const ResourceRequest& request, WebFramePolicyListenerProxy* listener)
</ins><span class="cx"> {
</span><del>- WebKitNavigationPolicyDecision* decision = WEBKIT_NAVIGATION_POLICY_DECISION(g_object_new(WEBKIT_TYPE_NAVIGATION_POLICY_DECISION, NULL));
- decision->priv->navigationType = navigationType;
- decision->priv->mouseButton = mouseButton;
- decision->priv->modifiers = modifiers;
- decision->priv->request = adoptGRef(webkitURIRequestCreateForResourceRequest(request->resourceRequest()));
- decision->priv->frameName = frameName;
- webkitPolicyDecisionSetListener(WEBKIT_POLICY_DECISION(decision), listener);
</del><ins>+ WebKitNavigationPolicyDecision* navigationDecision = WEBKIT_NAVIGATION_POLICY_DECISION(g_object_new(WEBKIT_TYPE_NAVIGATION_POLICY_DECISION, nullptr));
+ GRefPtr<WebKitURIRequest> uriRequest = adoptGRef(webkitURIRequestCreateForResourceRequest(request));
+ navigationDecision->priv->navigationAction = webkitNavigationActionCreate(uriRequest.get(), navigationActionData);
+ WebKitPolicyDecision* decision = WEBKIT_POLICY_DECISION(navigationDecision);
+ webkitPolicyDecisionSetListener(decision, listener);
</ins><span class="cx"> return decision;
</span><span class="cx"> }
</span><ins>+
+WebKitPolicyDecision* webkitNewWindowPolicyDecisionCreate(const NavigationActionData& navigationActionData, const ResourceRequest& request, const String& frameName, WebFramePolicyListenerProxy* listener)
+{
+ WebKitPolicyDecision* decision = webkitNavigationPolicyDecisionCreate(navigationActionData, request, listener);
+ WEBKIT_NAVIGATION_POLICY_DECISION(decision)->priv->frameName = frameName.utf8().data();
+ return decision;
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationPolicyDecisionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.h (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.h 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.h 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -62,16 +62,24 @@
</span><span class="cx"> WEBKIT_API GType
</span><span class="cx"> webkit_navigation_policy_decision_get_type (void);
</span><span class="cx">
</span><del>-WEBKIT_API WebKitNavigationType
-webkit_navigation_policy_decision_get_navigation_type (WebKitNavigationPolicyDecision *decision);
-WEBKIT_API guint
-webkit_navigation_policy_decision_get_mouse_button (WebKitNavigationPolicyDecision *decision);
-WEBKIT_API guint
-webkit_navigation_policy_decision_get_modifiers (WebKitNavigationPolicyDecision *decision);
-WEBKIT_API WebKitURIRequest *
-webkit_navigation_policy_decision_get_request (WebKitNavigationPolicyDecision *decision);
</del><ins>+WEBKIT_API WebKitNavigationAction *
+webkit_navigation_policy_decision_get_navigation_action (WebKitNavigationPolicyDecision *decision);
+
+WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) WebKitNavigationType
+webkit_navigation_policy_decision_get_navigation_type (WebKitNavigationPolicyDecision *decision);
+
+WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) guint
+webkit_navigation_policy_decision_get_mouse_button (WebKitNavigationPolicyDecision *decision);
+
+WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) guint
+webkit_navigation_policy_decision_get_modifiers (WebKitNavigationPolicyDecision *decision);
+
+WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) WebKitURIRequest *
+webkit_navigation_policy_decision_get_request (WebKitNavigationPolicyDecision *decision);
+
</ins><span class="cx"> WEBKIT_API const gchar *
</span><del>-webkit_navigation_policy_decision_get_frame_name (WebKitNavigationPolicyDecision *decision);
</del><ins>+webkit_navigation_policy_decision_get_frame_name (WebKitNavigationPolicyDecision *decision);
+
</ins><span class="cx"> G_END_DECLS
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationPolicyDecisionPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -20,9 +20,11 @@
</span><span class="cx"> #ifndef WebKitNavigationPolicyDecisionPrivate_h
</span><span class="cx"> #define WebKitNavigationPolicyDecisionPrivate_h
</span><span class="cx">
</span><ins>+#include "NavigationActionData.h"
</ins><span class="cx"> #include "WebKitNavigationPolicyDecision.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx">
</span><del>-WebKitNavigationPolicyDecision* webkitNavigationPolicyDecisionCreate(WebKitNavigationType, unsigned mouseButton, unsigned modifiers, API::URLRequest*, const char* frameName, WebKit::WebFramePolicyListenerProxy*);
</del><ins>+WebKitPolicyDecision* webkitNavigationPolicyDecisionCreate(const WebKit::NavigationActionData&, const WebCore::ResourceRequest&, WebKit::WebFramePolicyListenerProxy*);
+WebKitPolicyDecision* webkitNewWindowPolicyDecisionCreate(const WebKit::NavigationActionData&, const WebCore::ResourceRequest&, const String& frameName, WebKit::WebFramePolicyListenerProxy*);
</ins><span class="cx">
</span><span class="cx"> #endif // WebKitNavigationPolicyDecisionPrivate_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPolicyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitPolicyClient.h"
</span><span class="cx">
</span><ins>+#include "APIPolicyClient.h"
</ins><span class="cx"> #include "WebKitNavigationPolicyDecisionPrivate.h"
</span><span class="cx"> #include "WebKitResponsePolicyDecisionPrivate.h"
</span><span class="cx"> #include "WebKitWebViewBasePrivate.h"
</span><span class="lines">@@ -29,77 +30,37 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-static inline WebKitNavigationType toWebKitNavigationType(WKFrameNavigationType type)
-{
- switch (type) {
- case kWKFrameNavigationTypeLinkClicked:
- return WEBKIT_NAVIGATION_TYPE_LINK_CLICKED;
- case kWKFrameNavigationTypeFormSubmitted:
- return WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED;
- case kWKFrameNavigationTypeBackForward:
- return WEBKIT_NAVIGATION_TYPE_BACK_FORWARD;
- case kWKFrameNavigationTypeReload:
- return WEBKIT_NAVIGATION_TYPE_RELOAD;
- case kWKFrameNavigationTypeFormResubmitted:
- return WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED;
- case kWKFrameNavigationTypeOther:
- return WEBKIT_NAVIGATION_TYPE_OTHER;
- default:
- ASSERT_NOT_REACHED();
- return WEBKIT_NAVIGATION_TYPE_LINK_CLICKED;
</del><ins>+class PolicyClient: public API::PolicyClient {
+public:
+ explicit PolicyClient(WebKitWebView* webView)
+ : m_webView(webView)
+ {
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-static void decidePolicyForNavigationAction(WKPageRef, WKFrameRef, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef /* userData */, const void* clientInfo)
-{
- GRefPtr<WebKitNavigationPolicyDecision> decision =
- adoptGRef(webkitNavigationPolicyDecisionCreate(toWebKitNavigationType(navigationType),
- wkEventMouseButtonToWebKitMouseButton(mouseButton),
- wkEventModifiersToGdkModifiers(modifiers),
- toImpl(request),
- 0, /* frame name */
- toImpl(listener)));
- webkitWebViewMakePolicyDecision(WEBKIT_WEB_VIEW(clientInfo),
- WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION,
- WEBKIT_POLICY_DECISION(decision.get()));
-}
</del><ins>+private:
+ virtual void decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy*, const NavigationActionData& navigationActionData, WebFrameProxy* /*originatingFrame*/, const WebCore::ResourceRequest& /*originalRequest*/, const WebCore::ResourceRequest& request, RefPtr<WebFramePolicyListenerProxy> listener, API::Object* /*userData*/) override
+ {
+ GRefPtr<WebKitPolicyDecision> decision = adoptGRef(webkitNavigationPolicyDecisionCreate(navigationActionData, request, listener.get()));
+ webkitWebViewMakePolicyDecision(m_webView, WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION, decision.get());
+ }
</ins><span class="cx">
</span><del>-static void decidePolicyForNewWindowAction(WKPageRef, WKFrameRef, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef /* userData */, const void* clientInfo)
-{
- GRefPtr<WebKitNavigationPolicyDecision> decision =
- adoptGRef(webkitNavigationPolicyDecisionCreate(toWebKitNavigationType(navigationType),
- wkEventMouseButtonToWebKitMouseButton(mouseButton),
- wkEventModifiersToGdkModifiers(modifiers),
- toImpl(request),
- toImpl(frameName)->string().utf8().data(),
- toImpl(listener)));
- webkitWebViewMakePolicyDecision(WEBKIT_WEB_VIEW(clientInfo),
- WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION,
- WEBKIT_POLICY_DECISION(decision.get()));
-}
</del><ins>+ virtual void decidePolicyForNewWindowAction(WebPageProxy*, WebFrameProxy*, const NavigationActionData& navigationActionData, const WebCore::ResourceRequest& request, const String& frameName, RefPtr<WebFramePolicyListenerProxy> listener, API::Object* /*userData*/) override
+ {
+ GRefPtr<WebKitPolicyDecision> decision = adoptGRef(webkitNewWindowPolicyDecisionCreate(navigationActionData, request, frameName, listener.get()));
+ webkitWebViewMakePolicyDecision(m_webView, WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION, decision.get());
+ }
</ins><span class="cx">
</span><del>-static void decidePolicyForResponse(WKPageRef, WKFrameRef, WKURLResponseRef response, WKURLRequestRef request, bool canShowMIMEType, WKFramePolicyListenerRef listener, WKTypeRef /* userData */, const void* clientInfo)
-{
- GRefPtr<WebKitResponsePolicyDecision> decision =
- adoptGRef(webkitResponsePolicyDecisionCreate(toImpl(request), toImpl(response), canShowMIMEType, toImpl(listener)));
- webkitWebViewMakePolicyDecision(WEBKIT_WEB_VIEW(clientInfo),
- WEBKIT_POLICY_DECISION_TYPE_RESPONSE,
- WEBKIT_POLICY_DECISION(decision.get()));
-}
</del><ins>+ virtual void decidePolicyForResponse(WebPageProxy*, WebFrameProxy*, const WebCore::ResourceResponse& response, const WebCore::ResourceRequest& request, bool canShowMIMEType, RefPtr<WebFramePolicyListenerProxy> listener, API::Object* /*userData*/) override
+ {
+ GRefPtr<WebKitPolicyDecision> decision = adoptGRef(webkitResponsePolicyDecisionCreate(request, response, canShowMIMEType, listener.get()));
+ webkitWebViewMakePolicyDecision(m_webView, WEBKIT_POLICY_DECISION_TYPE_RESPONSE, decision.get());
+ }
</ins><span class="cx">
</span><ins>+ WebKitWebView* m_webView;
+};
+
</ins><span class="cx"> void attachPolicyClientToView(WebKitWebView* webView)
</span><span class="cx"> {
</span><del>- WKPagePolicyClientV1 policyClient = {
- {
- 1, // version
- webView, // clientInfo
- },
- 0, // decidePolicyForNavigationAction_deprecatedForUseWithV0
- decidePolicyForNewWindowAction,
- 0, // decidePolicyForResponse_deprecatedForUseWithV0
- 0, // unableToImplementPolicy
- decidePolicyForNavigationAction,
- decidePolicyForResponse
- };
- WKPageSetPagePolicyClient(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))), &policyClient.base);
</del><ins>+ WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
+ page->setPolicyClient(std::make_unique<PolicyClient>(webView));
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitResponsePolicyDecisioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitResponsePolicyDecision.h"
</span><span class="cx">
</span><del>-#include "APIURLRequest.h"
-#include "APIURLResponse.h"
</del><span class="cx"> #include "WebKitPolicyDecisionPrivate.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx"> #include "WebKitURIRequestPrivate.h"
</span><span class="lines">@@ -31,6 +29,7 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><ins>+using namespace WebCore;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * SECTION: WebKitResponsePolicyDecision
</span><span class="lines">@@ -155,12 +154,13 @@
</span><span class="cx"> return decision->priv->canShowMIMEType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebKitResponsePolicyDecision* webkitResponsePolicyDecisionCreate(API::URLRequest* request, API::URLResponse* response, bool canShowMIMEType, WebFramePolicyListenerProxy* listener)
</del><ins>+WebKitPolicyDecision* webkitResponsePolicyDecisionCreate(const ResourceRequest& request, const ResourceResponse& response, bool canShowMIMEType, WebFramePolicyListenerProxy* listener)
</ins><span class="cx"> {
</span><del>- WebKitResponsePolicyDecision* decision = WEBKIT_RESPONSE_POLICY_DECISION(g_object_new(WEBKIT_TYPE_RESPONSE_POLICY_DECISION, NULL));
- decision->priv->request = adoptGRef(webkitURIRequestCreateForResourceRequest(request->resourceRequest()));
- decision->priv->response = adoptGRef(webkitURIResponseCreateForResourceResponse(response->resourceResponse()));
- decision->priv->canShowMIMEType = canShowMIMEType;
- webkitPolicyDecisionSetListener(WEBKIT_POLICY_DECISION(decision), listener);
</del><ins>+ WebKitResponsePolicyDecision* responseDecision = WEBKIT_RESPONSE_POLICY_DECISION(g_object_new(WEBKIT_TYPE_RESPONSE_POLICY_DECISION, nullptr));
+ responseDecision->priv->request = adoptGRef(webkitURIRequestCreateForResourceRequest(request));
+ responseDecision->priv->response = adoptGRef(webkitURIResponseCreateForResourceResponse(response));
+ responseDecision->priv->canShowMIMEType = canShowMIMEType;
+ WebKitPolicyDecision* decision = WEBKIT_POLICY_DECISION(responseDecision);
+ webkitPolicyDecisionSetListener(decision, listener);
</ins><span class="cx"> return decision;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitResponsePolicyDecisionPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -23,6 +23,6 @@
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx"> #include "WebKitResponsePolicyDecision.h"
</span><span class="cx">
</span><del>-WebKitResponsePolicyDecision* webkitResponsePolicyDecisionCreate(API::URLRequest*, API::URLResponse*, bool canShowMIMEType, WebKit::WebFramePolicyListenerProxy*);
</del><ins>+WebKitPolicyDecision* webkitResponsePolicyDecisionCreate(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, bool canShowMIMEType, WebKit::WebFramePolicyListenerProxy*);
</ins><span class="cx">
</span><span class="cx"> #endif // WebKitResponsePolicyDecisionPrivate_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkdocswebkit2gtkdocssgml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -58,11 +58,16 @@
</span><span class="cx"> <index id="index-all">
</span><span class="cx"> <title>Index</title>
</span><span class="cx"> </index>
</span><del>-
</del><ins>+
+ <index id="api-index-deprecated" role="deprecated">
+ <title>Index of deprecated symbols</title>
+ <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+ </index>
+
</ins><span class="cx"> <index id="api-index-2-2" role="2.2">
</span><span class="cx"> <title>Index of new symbols in 2.2</title>
</span><span class="cx"> <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
</span><del>- </index>
</del><ins>+ </index>
</ins><span class="cx">
</span><span class="cx"> <index id="api-index-2-4" role="2.4">
</span><span class="cx"> <title>Index of new symbols in 2.4</title>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkdocswebkit2gtksectionstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -16,7 +16,8 @@
</span><span class="cx"> webkit_web_view_base_get_type
</span><span class="cx"> WebKitWebViewBasePrivate
</span><span class="cx"> WEBKIT_API
</span><del>-WEBKIT_OBSOLETE_API
</del><ins>+WEBKIT_DEPRECATED
+WEBKIT_DEPRECATED_FOR
</ins><span class="cx"> </SECTION>
</span><span class="cx">
</span><span class="cx"> <SECTION>
</span><span class="lines">@@ -613,6 +614,7 @@
</span><span class="cx"> <FILE>WebKitNavigationPolicyDecision</FILE>
</span><span class="cx"> WebKitNavigationPolicyDecision
</span><span class="cx"> WebKitNavigationType
</span><ins>+webkit_navigation_policy_decision_get_navigation_action
</ins><span class="cx"> webkit_navigation_policy_decision_get_frame_name
</span><span class="cx"> webkit_navigation_policy_decision_get_modifiers
</span><span class="cx"> webkit_navigation_policy_decision_get_mouse_button
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Tools/ChangeLog 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-08-07 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Use WebKitNavigationAction also for WebKitNavigationPolicyDecision
+ https://bugs.webkit.org/show_bug.cgi?id=135695
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Use WebKitNavigationAction API.
+
+ * MiniBrowser/gtk/BrowserWindow.c:
+ (webViewDecidePolicy):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp:
+ (testNavigationPolicy):
+
+2014-08-07 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Test /webkit2/WebKitUserContentManager/injected-script fails
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135696
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsergtkBrowserWindowc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -370,15 +370,15 @@
</span><span class="cx"> {
</span><span class="cx"> switch (decisionType) {
</span><span class="cx"> case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: {
</span><del>- WebKitNavigationPolicyDecision *navigationDecision = WEBKIT_NAVIGATION_POLICY_DECISION(decision);
- if (webkit_navigation_policy_decision_get_navigation_type(navigationDecision) != WEBKIT_NAVIGATION_TYPE_LINK_CLICKED
- || webkit_navigation_policy_decision_get_mouse_button(navigationDecision) != GDK_BUTTON_MIDDLE)
</del><ins>+ WebKitNavigationAction *navigationAction = webkit_navigation_policy_decision_get_navigation_action(WEBKIT_NAVIGATION_POLICY_DECISION(decision));
+ if (webkit_navigation_action_get_navigation_type(navigationAction) != WEBKIT_NAVIGATION_TYPE_LINK_CLICKED
+ || webkit_navigation_action_get_mouse_button(navigationAction) != GDK_BUTTON_MIDDLE)
</ins><span class="cx"> return FALSE;
</span><span class="cx">
</span><span class="cx"> // Opening a new window if link clicked with the middle button.
</span><span class="cx"> WebKitWebView *newWebView = WEBKIT_WEB_VIEW(webkit_web_view_new_with_context(webkit_web_view_get_context(webView)));
</span><span class="cx"> GtkWidget *newWindow = browser_window_new(newWebView, GTK_WINDOW(window));
</span><del>- webkit_web_view_load_request(newWebView, webkit_navigation_policy_decision_get_request(navigationDecision));
</del><ins>+ webkit_web_view_load_request(newWebView, webkit_navigation_action_get_request(navigationAction));
</ins><span class="cx"> gtk_widget_show(newWindow);
</span><span class="cx">
</span><span class="cx"> webkit_policy_decision_ignore(decision);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitPolicyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp (172210 => 172211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp 2014-08-07 14:11:12 UTC (rev 172210)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp 2014-08-07 14:58:11 UTC (rev 172211)
</span><span class="lines">@@ -117,11 +117,12 @@
</span><span class="cx"> // Ideally we'd like to have a more intensive test here, but it's still pretty tricky
</span><span class="cx"> // to trigger different types of navigations with the GTK+ WebKit2 API.
</span><span class="cx"> WebKitNavigationPolicyDecision* decision = WEBKIT_NAVIGATION_POLICY_DECISION(test->m_previousPolicyDecision.get());
</span><del>- g_assert_cmpint(webkit_navigation_policy_decision_get_navigation_type(decision), ==, WEBKIT_NAVIGATION_TYPE_OTHER);
- g_assert_cmpint(webkit_navigation_policy_decision_get_mouse_button(decision), ==, 0);
- g_assert_cmpint(webkit_navigation_policy_decision_get_modifiers(decision), ==, 0);
- g_assert_cmpstr(webkit_navigation_policy_decision_get_frame_name(decision), ==, 0);
- WebKitURIRequest* request = webkit_navigation_policy_decision_get_request(decision);
</del><ins>+ WebKitNavigationAction* navigationAction = webkit_navigation_policy_decision_get_navigation_action(decision);
+ g_assert_cmpint(webkit_navigation_action_get_navigation_type(navigationAction), ==, WEBKIT_NAVIGATION_TYPE_OTHER);
+ g_assert_cmpint(webkit_navigation_action_get_mouse_button(navigationAction), ==, 0);
+ g_assert_cmpint(webkit_navigation_action_get_modifiers(navigationAction), ==, 0);
+ g_assert(!webkit_navigation_policy_decision_get_frame_name(decision));
+ WebKitURIRequest* request = webkit_navigation_action_get_request(navigationAction);
</ins><span class="cx"> g_assert_cmpstr(webkit_uri_request_get_uri(request), ==, "http://webkitgtk.org/");
</span><span class="cx">
</span><span class="cx"> test->m_policyDecisionResponse = PolicyClientTest::Use;
</span></span></pre>
</div>
</div>
</body>
</html>