Title: [231416] releases/WebKitGTK/webkit-2.20/Source/WebKit
- Revision
- 231416
- Author
- [email protected]
- Date
- 2018-05-07 01:26:29 -0700 (Mon, 07 May 2018)
Log Message
Merge r230718 - [WPE][GTK] GObject introspection annotation fixes: BackForwardList, NetworkProxySettings
https://bugs.webkit.org/show_bug.cgi?id=184658
Reviewed by Carlos Garcia Campos.
Thanks to Dylan Simon for recommending these annotation fixes.
* UIProcess/API/glib/WebKitBackForwardList.cpp:
* UIProcess/API/glib/WebKitNetworkProxySettings.cpp:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (231415 => 231416)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-07 08:18:48 UTC (rev 231415)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-07 08:26:29 UTC (rev 231416)
@@ -1,3 +1,15 @@
+2018-04-17 Michael Catanzaro <[email protected]>
+
+ [WPE][GTK] GObject introspection annotation fixes: BackForwardList, NetworkProxySettings
+ https://bugs.webkit.org/show_bug.cgi?id=184658
+
+ Reviewed by Carlos Garcia Campos.
+
+ Thanks to Dylan Simon for recommending these annotation fixes.
+
+ * UIProcess/API/glib/WebKitBackForwardList.cpp:
+ * UIProcess/API/glib/WebKitNetworkProxySettings.cpp:
+
2018-04-11 Michael Catanzaro <[email protected]>
[GTK] WaylandCompositorDisplay leaks its wl_display
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitBackForwardList.cpp (231415 => 231416)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitBackForwardList.cpp 2018-05-07 08:18:48 UTC (rev 231415)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitBackForwardList.cpp 2018-05-07 08:26:29 UTC (rev 231416)
@@ -156,7 +156,7 @@
*
* Returns the current item in @back_forward_list.
*
- * Returns: (transfer none): a #WebKitBackForwardListItem
+ * Returns: (nullable) (transfer none): a #WebKitBackForwardListItem
* or %NULL if @back_forward_list is empty.
*/
WebKitBackForwardListItem* webkit_back_forward_list_get_current_item(WebKitBackForwardList* backForwardList)
@@ -172,7 +172,7 @@
*
* Returns the item that precedes the current item.
*
- * Returns: (transfer none): the #WebKitBackForwardListItem
+ * Returns: (nullable) (transfer none): the #WebKitBackForwardListItem
* preceding the current item or %NULL.
*/
WebKitBackForwardListItem* webkit_back_forward_list_get_back_item(WebKitBackForwardList* backForwardList)
@@ -188,7 +188,7 @@
*
* Returns the item that follows the current item.
*
- * Returns: (transfer none): the #WebKitBackForwardListItem
+ * Returns: (nullable) (transfer none): the #WebKitBackForwardListItem
* following the current item or %NULL.
*/
WebKitBackForwardListItem* webkit_back_forward_list_get_forward_item(WebKitBackForwardList* backForwardList)
@@ -205,8 +205,8 @@
*
* Returns the item at a given index relative to the current item.
*
- * Returns: (transfer none): the #WebKitBackForwardListItem
- * located at the specified index relative to the current item.
+ * Returns: (nullable) (transfer none): the #WebKitBackForwardListItem
+ * located at the specified index relative to the current item or %NULL.
*/
WebKitBackForwardListItem* webkit_back_forward_list_get_nth_item(WebKitBackForwardList* backForwardList, gint index)
{
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitNetworkProxySettings.cpp (231415 => 231416)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitNetworkProxySettings.cpp 2018-05-07 08:18:48 UTC (rev 231415)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/glib/WebKitNetworkProxySettings.cpp 2018-05-07 08:26:29 UTC (rev 231416)
@@ -63,7 +63,7 @@
/**
* webkit_network_proxy_settings_new:
* @default_proxy_uri: (allow-none): the default proxy URI to use, or %NULL.
- * @ignore_hosts: (allow-none): an optional list of hosts/IP addresses to not use a proxy for.
+ * @ignore_hosts: (allow-none) (array zero-terminated=1): an optional list of hosts/IP addresses to not use a proxy for.
*
* Create a new #WebKitNetworkProxySettings with the given @default_proxy_uri and @ignore_hosts.
*
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
