diff options
Diffstat (limited to 'WebKit/gtk/webkit')
| -rw-r--r-- | WebKit/gtk/webkit/webkitdownload.cpp | 4 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitnetworkrequest.cpp | 4 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitnetworkresponse.cpp | 4 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitsecurityorigin.cpp | 3 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebdatabase.cpp | 2 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebdatasource.cpp | 33 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebframe.cpp | 16 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebhistoryitem.cpp | 4 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebinspector.cpp | 4 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebresource.cpp | 5 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebsettings.cpp | 28 | ||||
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebview.cpp | 29 |
12 files changed, 88 insertions, 48 deletions
diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp index 1e45250..1472cb5 100644 --- a/WebKit/gtk/webkit/webkitdownload.cpp +++ b/WebKit/gtk/webkit/webkitdownload.cpp @@ -559,7 +559,7 @@ const gchar* webkit_download_get_uri(WebKitDownload* download) * Retrieves the #WebKitNetworkRequest object that backs the download * process. * - * Returns: the #WebKitNetworkRequest instance + * Returns: (transfer none): the #WebKitNetworkRequest instance * * Since: 1.1.2 */ @@ -578,7 +578,7 @@ WebKitNetworkRequest* webkit_download_get_network_request(WebKitDownload* downlo * Retrieves the #WebKitNetworkResponse object that backs the download * process. * - * Returns: the #WebKitNetworkResponse instance + * Returns: (transfer none): the #WebKitNetworkResponse instance * * Since: 1.1.16 */ diff --git a/WebKit/gtk/webkit/webkitnetworkrequest.cpp b/WebKit/gtk/webkit/webkitnetworkrequest.cpp index 8b50948..6180efa 100644 --- a/WebKit/gtk/webkit/webkitnetworkrequest.cpp +++ b/WebKit/gtk/webkit/webkitnetworkrequest.cpp @@ -241,7 +241,7 @@ G_CONST_RETURN gchar* webkit_network_request_get_uri(WebKitNetworkRequest* reque } /** - * webkit_network_request_get_soup_message: + * webkit_network_request_get_message: * @request: a #WebKitNetworkRequest * * Obtains the #SoupMessage held and used by the given request. Notice @@ -249,7 +249,7 @@ G_CONST_RETURN gchar* webkit_network_request_get_uri(WebKitNetworkRequest* reque * handlers is only supported (as in, will only affect what is * actually sent to the server) where explicitly documented. * - * Returns: the #SoupMessage + * Returns: (transfer none): the #SoupMessage * Since: 1.1.9 */ SoupMessage* webkit_network_request_get_message(WebKitNetworkRequest* request) diff --git a/WebKit/gtk/webkit/webkitnetworkresponse.cpp b/WebKit/gtk/webkit/webkitnetworkresponse.cpp index d4dd562..0aca6d8 100644 --- a/WebKit/gtk/webkit/webkitnetworkresponse.cpp +++ b/WebKit/gtk/webkit/webkitnetworkresponse.cpp @@ -241,14 +241,14 @@ G_CONST_RETURN gchar* webkit_network_response_get_uri(WebKitNetworkResponse* res } /** - * webkit_network_response_get_soup_message: + * webkit_network_response_get_message: * @response: a #WebKitNetworkResponse * * Obtains the #SoupMessage that represents the given response. Notice * that only the response side of the HTTP conversation is * represented. * - * Returns: the #SoupMessage + * Returns: (transfer none): the #SoupMessage * Since: 1.1.14 */ SoupMessage* webkit_network_response_get_message(WebKitNetworkResponse* response) diff --git a/WebKit/gtk/webkit/webkitsecurityorigin.cpp b/WebKit/gtk/webkit/webkitsecurityorigin.cpp index de074ae..67ad0cf 100644 --- a/WebKit/gtk/webkit/webkitsecurityorigin.cpp +++ b/WebKit/gtk/webkit/webkitsecurityorigin.cpp @@ -353,7 +353,8 @@ void webkit_security_origin_set_web_database_quota(WebKitSecurityOrigin* securit * * Returns a list of all Web Databases in the security origin. * - * Returns: a #GList of databases in the security origin. + * Returns: (transfer container) (element-type WebKitWebDatabase): a + * #GList of databases in the security origin. * * Since: 1.1.14 **/ diff --git a/WebKit/gtk/webkit/webkitwebdatabase.cpp b/WebKit/gtk/webkit/webkitwebdatabase.cpp index d4f6198..cd85e73 100644 --- a/WebKit/gtk/webkit/webkitwebdatabase.cpp +++ b/WebKit/gtk/webkit/webkitwebdatabase.cpp @@ -284,7 +284,7 @@ static void webkit_web_database_set_name(WebKitWebDatabase* webDatabase, const g * * Returns the security origin of the #WebKitWebDatabase. * - * Returns: the security origin of the database + * Returns: (transfer none): the security origin of the database * * Since: 1.1.14 **/ diff --git a/WebKit/gtk/webkit/webkitwebdatasource.cpp b/WebKit/gtk/webkit/webkitwebdatasource.cpp index 9b755ad..38c9c48 100644 --- a/WebKit/gtk/webkit/webkitwebdatasource.cpp +++ b/WebKit/gtk/webkit/webkitwebdatasource.cpp @@ -194,14 +194,15 @@ WebKitWebDataSource* webkit_web_data_source_new_with_request(WebKitNetworkReques } /** - * webkit_web_data_source_get_web_frame + * webkit_web_data_source_get_web_frame: * @data_source: a #WebKitWebDataSource * * Returns the #WebKitWebFrame that represents this data source * - * Return value: the #WebKitWebFrame that represents the @data_source. The - * #WebKitWebFrame is owned by WebKit and should not be freed or destroyed. - * This will return %NULL of the @data_source is not attached to a frame. + * Return value: (transfer none): the #WebKitWebFrame that represents + * the @data_source. The #WebKitWebFrame is owned by WebKit and should + * not be freed or destroyed. This will return %NULL if the + * @data_source is not attached to a frame. * * Since: 1.1.14 */ @@ -227,7 +228,7 @@ WebKitWebFrame* webkit_web_data_source_get_web_frame(WebKitWebDataSource* webDat * prior to the "committed" load state. See webkit_web_data_source_get_request * for getting the "committed" request. * - * Return value: the original #WebKitNetworkRequest + * Return value: (transfer none): the original #WebKitNetworkRequest * * Since: 1.1.14 */ @@ -254,9 +255,9 @@ WebKitNetworkRequest* webkit_web_data_source_get_initial_request(WebKitWebDataSo * the request that was "committed", and hence, different from the request you * get from the webkit_web_data_source_get_initial_request method. * - * Return value: the #WebKitNetworkRequest that created the @data_source or - * %NULL if the @data_source is not attached to the frame or the frame hasn't - * been loaded. + * Return value: (transfer none): the #WebKitNetworkRequest that + * created the @data_source or %NULL if the @data_source is not + * attached to the frame or the frame hasn't been loaded. * * Since: 1.1.14 */ @@ -333,8 +334,9 @@ gboolean webkit_web_data_source_is_loading(WebKitWebDataSource* webDataSource) * frame hasn't loaded any data. Use webkit_web_data_source_is_loading to test * if data source is in the process of loading. * - * Return value: a #GString which contains the raw data that represents the @data_source or %NULL if the - * @data_source hasn't loaded any data. + * Return value: (transfer none): a #GString which contains the raw + * data that represents the @data_source or %NULL if the @data_source + * hasn't loaded any data. * * Since: 1.1.14 */ @@ -364,8 +366,8 @@ GString* webkit_web_data_source_get_data(WebKitWebDataSource* webDataSource) * * Returns the main resource of the @data_source * - * Return value: a new #WebKitWebResource representing the main resource of - * the @data_source. + * Return value: (transfer none): a new #WebKitWebResource + * representing the main resource of the @data_source. * * Since: 1.1.14 */ @@ -414,14 +416,15 @@ G_CONST_RETURN gchar* webkit_web_data_source_get_unreachable_uri(WebKitWebDataSo } /** - * webkit_web_data_source_get_subresources + * webkit_web_data_source_get_subresources: * @data_source: a #WebKitWebDataSource * * Gives you a #GList of #WebKitWebResource objects that compose the * #WebKitWebView to which this #WebKitWebDataSource is attached. * - * Return value: a #GList of #WebKitWebResource objects; the objects are - * owned by WebKit, but the GList must be freed. + * Return value: (element-type WebKitWebResource) (transfer container): + * a #GList of #WebKitWebResource objects; the objects are owned by + * WebKit, but the GList must be freed. * * Since: 1.1.15 */ diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp index 88f0bb7..c581ce6 100644 --- a/WebKit/gtk/webkit/webkitwebframe.cpp +++ b/WebKit/gtk/webkit/webkitwebframe.cpp @@ -449,7 +449,7 @@ G_CONST_RETURN gchar* webkit_web_frame_get_uri(WebKitWebFrame* frame) * The #WebKitWebView returned manages the entire hierarchy of #WebKitWebFrame * objects that contains @frame. * - * Return value: the #WebKitWebView that manages @frame + * Return value: (transfer none): the #WebKitWebView that manages @frame */ WebKitWebView* webkit_web_frame_get_web_view(WebKitWebFrame* frame) { @@ -491,7 +491,7 @@ G_CONST_RETURN gchar* webkit_web_frame_get_name(WebKitWebFrame* frame) * * Returns the @frame's parent frame, or %NULL if it has none. * - * Return value: the parent #WebKitWebFrame or %NULL in case there is none + * Return value: (transfer none): the parent #WebKitWebFrame or %NULL in case there is none */ WebKitWebFrame* webkit_web_frame_get_parent(WebKitWebFrame* frame) { @@ -662,7 +662,7 @@ void webkit_web_frame_reload(WebKitWebFrame* frame) * hierarchy, this function will search for a matching frame in other main * frame hierarchies. Returns %NULL if no match is found. * - * Return value: the found #WebKitWebFrame or %NULL in case none is found + * Return value: (transfer none): the found #WebKitWebFrame or %NULL in case none is found */ WebKitWebFrame* webkit_web_frame_find_frame(WebKitWebFrame* frame, const gchar* name) { @@ -684,7 +684,7 @@ WebKitWebFrame* webkit_web_frame_find_frame(WebKitWebFrame* frame, const gchar* * Gets the global JavaScript execution context. Use this function to bridge * between the WebKit and JavaScriptCore APIs. * - * Return value: the global JavaScript context + * Return value: (transfer none): the global JavaScript context */ JSGlobalContextRef webkit_web_frame_get_global_context(WebKitWebFrame* frame) { @@ -703,7 +703,7 @@ JSGlobalContextRef webkit_web_frame_get_global_context(WebKitWebFrame* frame) * * Returns the committed data source. * - * Return value: the committed #WebKitWebDataSource. + * Return value: (transfer none): the committed #WebKitWebDataSource. * * Since: 1.1.14 */ @@ -724,7 +724,7 @@ WebKitWebDataSource* webkit_web_frame_get_data_source(WebKitWebFrame* frame) * transition to a committed data source once any data has been received. Use * webkit_web_frame_get_data_source to get the committed data source. * - * Return value: the provisional #WebKitWebDataSource or %NULL if a load + * Return value: (transfer none): the provisional #WebKitWebDataSource or %NULL if a load * request is not in progress. * * Since: 1.1.14 @@ -1199,7 +1199,7 @@ GtkPolicyType webkit_web_frame_get_vertical_scrollbar_policy(WebKitWebFrame* fra * * Returns the @frame's security origin. * - * Return value: the security origin of @frame + * Return value: (transfer none): the security origin of @frame * * Since: 1.1.14 */ @@ -1241,7 +1241,7 @@ void webkit_web_frame_layout(WebKitWebFrame* frame) * frame was not created by a load. You must unref the object when you * are done with it. * - * Return value: a #WebKitNetworkResponse object + * Return value: (transfer full): a #WebKitNetworkResponse object * * Since: 1.1.18 */ diff --git a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp index 8a9153c..ce30704 100644 --- a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp +++ b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp @@ -433,14 +433,14 @@ gdouble webkit_web_history_item_get_last_visited_time(WebKitWebHistoryItem* webH } /** - * webkit_web_history_item_copy : + * webkit_web_history_item_copy: * @web_history_item: a #WebKitWebHistoryItem * * Makes a copy of the item for use with other WebView objects. * * Since: 1.1.18 * - * Return value: the new #WebKitWebHistoryItem. + * Return value: (transfer full): the new #WebKitWebHistoryItem. */ WebKitWebHistoryItem* webkit_web_history_item_copy(WebKitWebHistoryItem* self) { diff --git a/WebKit/gtk/webkit/webkitwebinspector.cpp b/WebKit/gtk/webkit/webkitwebinspector.cpp index 2dc9315..ee3c8cd 100644 --- a/WebKit/gtk/webkit/webkitwebinspector.cpp +++ b/WebKit/gtk/webkit/webkitwebinspector.cpp @@ -426,8 +426,8 @@ void webkit_web_inspector_set_web_view(WebKitWebInspector *web_inspector, WebKit * that this method may return %NULL if the user hasn't inspected * anything. * - * Returns: the #WebKitWebView instance that is used to render the - * inspector or %NULL if it is not yet created. + * Returns: (transfer none): the #WebKitWebView instance that is used + * to render the inspector or %NULL if it is not yet created. * * Since: 1.0.3 **/ diff --git a/WebKit/gtk/webkit/webkitwebresource.cpp b/WebKit/gtk/webkit/webkitwebresource.cpp index ba9c3af..fb0acfc 100644 --- a/WebKit/gtk/webkit/webkitwebresource.cpp +++ b/WebKit/gtk/webkit/webkitwebresource.cpp @@ -285,8 +285,9 @@ WebKitWebResource* webkit_web_resource_new(const gchar* data, * * Returns the data of the @webResource. * - * Return value: a #GString containing the character data of the @webResource. - * The string is owned by WebKit and should not be freed or destroyed. + * Return value: (transfer none): a #GString containing the character + * data of the @webResource. The string is owned by WebKit and should + * not be freed or destroyed. * * Since: 1.1.14 */ diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp index 767fce1..8a207d9 100644 --- a/WebKit/gtk/webkit/webkitwebsettings.cpp +++ b/WebKit/gtk/webkit/webkitwebsettings.cpp @@ -108,6 +108,7 @@ struct _WebKitWebSettingsPrivate { gboolean enable_page_cache; gboolean auto_resize_window; gboolean enable_java_applet; + gboolean enable_hyperlink_auditing; }; #define WEBKIT_WEB_SETTINGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsPrivate)) @@ -157,7 +158,8 @@ enum { PROP_ENABLE_SITE_SPECIFIC_QUIRKS, PROP_ENABLE_PAGE_CACHE, PROP_AUTO_RESIZE_WINDOW, - PROP_ENABLE_JAVA_APPLET + PROP_ENABLE_JAVA_APPLET, + PROP_ENABLE_HYPERLINK_AUDITING }; // Create a default user agent string @@ -863,6 +865,21 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass) TRUE, flags)); + /** + * WebKitWebSettings:enable-hyperlink-auditing: + * + * Enable or disable support for <a ping>. + * + * Since: 1.2.5 + */ + g_object_class_install_property(gobject_class, + PROP_ENABLE_HYPERLINK_AUDITING, + g_param_spec_boolean("enable-hyperlink-auditing", + _("Enable Hyperlink Auditing"), + _("Whether <a ping> should be able to send pings"), + FALSE, + flags)); + g_type_class_add_private(klass, sizeof(WebKitWebSettingsPrivate)); } @@ -1083,6 +1100,9 @@ static void webkit_web_settings_set_property(GObject* object, guint prop_id, con case PROP_ENABLE_JAVA_APPLET: priv->enable_java_applet = g_value_get_boolean(value); break; + case PROP_ENABLE_HYPERLINK_AUDITING: + priv->enable_hyperlink_auditing = g_value_get_boolean(value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -1224,6 +1244,9 @@ static void webkit_web_settings_get_property(GObject* object, guint prop_id, GVa case PROP_ENABLE_JAVA_APPLET: g_value_set_boolean(value, priv->enable_java_applet); break; + case PROP_ENABLE_HYPERLINK_AUDITING: + g_value_set_boolean(value, priv->enable_hyperlink_auditing); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -1248,7 +1271,7 @@ WebKitWebSettings* webkit_web_settings_new() * * Copies an existing #WebKitWebSettings instance. * - * Returns: a new #WebKitWebSettings instance + * Returns: (transfer full): a new #WebKitWebSettings instance **/ WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings) { @@ -1297,6 +1320,7 @@ WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings) "enable-page-cache", priv->enable_page_cache, "auto-resize-window", priv->auto_resize_window, "enable-java-applet", priv->enable_java_applet, + "enable-hyperlink-auditing", priv->enable_hyperlink_auditing, NULL)); return copy; diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp index 3212450..762888a 100644 --- a/WebKit/gtk/webkit/webkitwebview.cpp +++ b/WebKit/gtk/webkit/webkitwebview.cpp @@ -1503,7 +1503,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) * the new #WebKitWebView. The widget to which the widget is added will * handle that. * - * Return value: a newly allocated #WebKitWebView, or %NULL + * Return value: (transfer full): a newly allocated #WebKitWebView, or %NULL * * Since: 1.0.3 */ @@ -2264,7 +2264,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) * to set the property value of "webkit-widget-is-selected". This can * be used to draw a visual indicator of the selection. * - * Return value: a new #GtkWidget, or %NULL + * Return value: (transfer full): a new #GtkWidget, or %NULL * * Since: 1.1.8 */ @@ -2853,7 +2853,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) javaScriptCanAccessClipboard, enableOfflineWebAppCache, enableUniversalAccessFromFileURI, enableFileAccessFromFileURI, enableDOMPaste, tabKeyCyclesThroughElements, - enableSiteSpecificQuirks, usePageCache, enableJavaApplet; + enableSiteSpecificQuirks, usePageCache, enableJavaApplet, enableHyperlinkAuditing; WebKitEditingBehavior editingBehavior; @@ -2890,6 +2890,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) "enable-site-specific-quirks", &enableSiteSpecificQuirks, "enable-page-cache", &usePageCache, "enable-java-applet", &enableJavaApplet, + "enable-hyperlink-auditing", &enableHyperlinkAuditing, NULL); settings->setDefaultTextEncodingName(defaultEncoding); @@ -2925,6 +2926,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) settings->setNeedsSiteSpecificQuirks(enableSiteSpecificQuirks); settings->setUsesPageCache(usePageCache); settings->setJavaEnabled(enableJavaApplet); + settings->setHyperlinkAuditingEnabled(enableHyperlinkAuditing); Page* page = core(webView); if (page) @@ -3036,6 +3038,8 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar settings->setUsesPageCache(g_value_get_boolean(&value)); else if (name == g_intern_string("enable-java-applet")) settings->setJavaEnabled(g_value_get_boolean(&value)); + else if (name == g_intern_string("enable-hyperlink-auditing")) + settings->setHyperlinkAuditingEnabled(g_value_get_boolean(&value)); else if (!g_object_class_find_property(G_OBJECT_GET_CLASS(webSettings), name)) g_warning("Unexpected setting '%s'", name); g_value_unset(&value); @@ -3217,7 +3221,7 @@ static void webkit_web_view_set_window_features(WebKitWebView* webView, WebKitWe } /** - * webkit_web_view_get_window_features + * webkit_web_view_get_window_features: * @web_view: a #WebKitWebView * * Returns the instance of #WebKitWebWindowFeatures held by the given @@ -3642,12 +3646,19 @@ void webkit_web_view_unmark_text_matches(WebKitWebView* webView) return core(webView)->unmarkAllTextMatches(); } +/** + * webkit_web_view_get_main_frame: + * @webView: a #WebKitWebView + * + * Returns the main frame for the @webView. + * + * Return value: (transfer none): the main #WebKitWebFrame for @webView + */ WebKitWebFrame* webkit_web_view_get_main_frame(WebKitWebView* webView) { g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL); - WebKitWebViewPrivate* priv = webView->priv; - return priv->mainFrame; + return webView->priv->mainFrame; } /** @@ -3656,7 +3667,7 @@ WebKitWebFrame* webkit_web_view_get_main_frame(WebKitWebView* webView) * * Returns the frame that has focus or an active text selection. * - * Return value: The focused #WebKitWebFrame or %NULL if no frame is focused + * Return value: (transfer none): The focused #WebKitWebFrame or %NULL if no frame is focused */ WebKitWebFrame* webkit_web_view_get_focused_frame(WebKitWebView* webView) { @@ -4532,7 +4543,7 @@ void webkit_web_view_set_tooltip_text(WebKitWebView* webView, const char* toolti * Does a 'hit test' in the coordinates specified by @event to figure * out context information about that position in the @webView. * - * Returns: a newly created #WebKitHitTestResult with the context of the + * Returns: (transfer none): a newly created #WebKitHitTestResult with the context of the * specified position. * * Since: 1.1.15 @@ -4574,7 +4585,7 @@ G_CONST_RETURN gchar* webkit_web_view_get_icon_uri(WebKitWebView* webView) * webkit_web_view_get_dom_document: * @webView: a #WebKitWebView * - * Returns: the #WebKitDOMDocument currently loaded in the @webView + * Returns: (transfer none): the #WebKitDOMDocument currently loaded in the @webView * * Since: 1.3.1 **/ |