From 2c350a98d4bf479d0a10e6dffea914916f87ee44 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Fri, 11 Dec 2020 17:50:28 +0100 Subject: [PATCH] webkit2gtk-4.0: Update to 2.30.3 --- vapi/webkit2gtk-4.0.vapi | 137 +++++++++++++++++++++---- vapi/webkit2gtk-web-extension-4.0.vapi | 15 ++- 2 files changed, 127 insertions(+), 25 deletions(-) diff --git a/vapi/webkit2gtk-4.0.vapi b/vapi/webkit2gtk-4.0.vapi index 4860e1b56..b50ca9885 100644 --- a/vapi/webkit2gtk-4.0.vapi +++ b/vapi/webkit2gtk-4.0.vapi @@ -57,14 +57,18 @@ namespace WebKit { public signal void cancelled (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_automation_session_get_type ()")] - [Version (since = "2.18")] public class AutomationSession : GLib.Object { [CCode (has_construct_function = false)] protected AutomationSession (); + [Version (since = "2.18")] public unowned WebKit.ApplicationInfo get_application_info (); + [Version (since = "2.18")] public unowned string get_id (); + [Version (since = "2.18")] public void set_application_info (WebKit.ApplicationInfo info); + [Version (since = "2.18")] public string id { get; construct; } + [Version (since = "2.18")] public signal unowned WebKit.WebView create_web_view (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_back_forward_list_get_type ()")] @@ -197,7 +201,6 @@ namespace WebKit { public bool has_password (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_device_info_permission_request_get_type ()")] - [Version (since = "2.24")] public class DeviceInfoPermissionRequest : GLib.Object, WebKit.PermissionRequest { [CCode (has_construct_function = false)] protected DeviceInfoPermissionRequest (); @@ -231,10 +234,10 @@ namespace WebKit { public signal void received_data (uint64 data_length); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_editor_state_get_type ()")] - [Version (since = "2.10")] public class EditorState : GLib.Object { [CCode (has_construct_function = false)] protected EditorState (); + [Version (since = "2.10")] public uint get_typing_attributes (); [Version (since = "2.20")] public bool is_copy_available (); @@ -246,6 +249,7 @@ namespace WebKit { public bool is_redo_available (); [Version (since = "2.20")] public bool is_undo_available (); + [Version (since = "2.10")] public uint typing_attributes { get; } } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_favicon_database_get_type ()")] @@ -310,15 +314,20 @@ namespace WebKit { public void submit (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_geolocation_manager_get_type ()")] - [Version (since = "2.26")] public class GeolocationManager : GLib.Object { [CCode (has_construct_function = false)] protected GeolocationManager (); + [Version (since = "2.26")] public void failed (string error_message); + [Version (since = "2.26")] public bool get_enable_high_accuracy (); + [Version (since = "2.26")] public void update_position (WebKit.GeolocationPosition position); + [Version (since = "2.26")] public bool enable_high_accuracy { get; } + [Version (since = "2.26")] public signal bool start (); + [Version (since = "2.26")] public signal void stop (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_geolocation_permission_request_get_type ()")] @@ -391,28 +400,43 @@ namespace WebKit { public void unref (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_input_method_context_get_type ()")] - [Version (since = "2.28")] public abstract class InputMethodContext : GLib.Object { [CCode (has_construct_function = false)] protected InputMethodContext (); + [Version (since = "2.28")] public virtual bool filter_key_event (Gdk.EventKey key_event); + [Version (since = "2.28")] public WebKit.InputHints get_input_hints (); + [Version (since = "2.28")] public WebKit.InputPurpose get_input_purpose (); + [Version (since = "2.28")] public virtual void get_preedit (out string? text, out GLib.List? underlines, out uint cursor_offset); + [Version (since = "2.28")] public virtual void notify_cursor_area (int x, int y, int width, int height); + [Version (since = "2.28")] public virtual void notify_focus_in (); + [Version (since = "2.28")] public virtual void notify_focus_out (); + [Version (since = "2.28")] public virtual void notify_surrounding (string text, uint length, uint cursor_index, uint selection_index); + [Version (since = "2.28")] public virtual void reset (); + [Version (since = "2.28")] public virtual void set_enable_preedit (bool enabled); public void set_input_hints (WebKit.InputHints hints); + [Version (since = "2.28")] public void set_input_purpose (WebKit.InputPurpose purpose); public WebKit.InputHints input_hints { get; set; } public WebKit.InputPurpose input_purpose { get; set; } + [Version (since = "2.28")] public virtual signal void committed (string text); + [Version (since = "2.28")] public virtual signal void delete_surrounding (int offset, uint n_chars); + [Version (since = "2.28")] public virtual signal void preedit_changed (); + [Version (since = "2.28")] public virtual signal void preedit_finished (); + [Version (since = "2.28")] public virtual signal void preedit_started (); } [CCode (cheader_filename = "webkit2/webkit2.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "webkit_input_method_underline_get_type ()")] @@ -429,10 +453,10 @@ namespace WebKit { public void set_color (Gdk.RGBA? rgba); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_install_missing_media_plugins_permission_request_get_type ()")] - [Version (since = "2.10")] public class InstallMissingMediaPluginsPermissionRequest : GLib.Object, WebKit.PermissionRequest { [CCode (has_construct_function = false)] protected InstallMissingMediaPluginsPermissionRequest (); + [Version (since = "2.10")] public unowned string get_description (); } [CCode (cheader_filename = "webkit2/webkit2.h", ref_function = "webkit_javascript_result_ref", type_id = "webkit_javascript_result_get_type ()", unref_function = "webkit_javascript_result_unref")] @@ -506,64 +530,84 @@ namespace WebKit { } [CCode (cheader_filename = "webkit2/webkit2.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "webkit_network_proxy_settings_get_type ()")] [Compact] - [Version (since = "2.16")] public class NetworkProxySettings { [CCode (has_construct_function = false)] + [Version (since = "2.16")] public NetworkProxySettings (string? default_proxy_uri, [CCode (array_length = false, array_null_terminated = true)] string[]? ignore_hosts); + [Version (since = "2.16")] public void add_proxy_for_scheme (string scheme, string proxy_uri); + [Version (since = "2.16")] public WebKit.NetworkProxySettings copy (); + [Version (since = "2.16")] public void free (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_notification_get_type ()")] - [Version (since = "2.8")] public class Notification : GLib.Object { [CCode (has_construct_function = false)] protected Notification (); + [Version (since = "2.8")] public void close (); + [Version (since = "2.8")] public unowned string get_body (); + [Version (since = "2.8")] public uint64 get_id (); [Version (since = "2.16")] public unowned string? get_tag (); + [Version (since = "2.8")] public unowned string get_title (); + [Version (since = "2.8")] public string body { get; } + [Version (since = "2.8")] public uint64 id { get; } [Version (since = "2.16")] public string tag { get; } + [Version (since = "2.8")] public string title { get; } [HasEmitter] [Version (since = "2.12")] public signal void clicked (); + [Version (since = "2.8")] public signal void closed (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_notification_permission_request_get_type ()")] - [Version (since = "2.8")] public class NotificationPermissionRequest : GLib.Object, WebKit.PermissionRequest { [CCode (has_construct_function = false)] protected NotificationPermissionRequest (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_option_menu_get_type ()")] - [Version (since = "2.18")] public class OptionMenu : GLib.Object { [CCode (has_construct_function = false)] protected OptionMenu (); + [Version (since = "2.18")] public void activate_item (uint index); + [Version (since = "2.18")] public unowned WebKit.OptionMenuItem get_item (uint index); + [Version (since = "2.18")] public uint get_n_items (); + [Version (since = "2.18")] public void select_item (uint index); [HasEmitter] + [Version (since = "2.18")] public signal void close (); } [CCode (cheader_filename = "webkit2/webkit2.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "webkit_option_menu_item_get_type ()")] [Compact] - [Version (since = "2.18")] public class OptionMenuItem { + [Version (since = "2.18")] public WebKit.OptionMenuItem copy (); + [Version (since = "2.18")] public void free (); + [Version (since = "2.18")] public unowned string get_label (); + [Version (since = "2.18")] public unowned string get_tooltip (); + [Version (since = "2.18")] public bool is_enabled (); + [Version (since = "2.18")] public bool is_group_child (); + [Version (since = "2.18")] public bool is_group_label (); + [Version (since = "2.18")] public bool is_selected (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_plugin_get_type ()")] @@ -576,7 +620,6 @@ namespace WebKit { public unowned string get_path (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_pointer_lock_permission_request_get_type ()")] - [Version (since = "2.28")] public class PointerLockPermissionRequest : GLib.Object, WebKit.PermissionRequest { [CCode (has_construct_function = false)] protected PointerLockPermissionRequest (); @@ -592,15 +635,21 @@ namespace WebKit { public void use_with_policies (WebKit.WebsitePolicies policies); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_print_custom_widget_get_type ()")] - [Version (since = "2.16")] public class PrintCustomWidget : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "2.16")] public PrintCustomWidget (Gtk.Widget widget, string title); + [Version (since = "2.16")] public unowned string get_title (); + [Version (since = "2.16")] public unowned Gtk.Widget get_widget (); + [Version (since = "2.16")] public string title { get; construct; } + [Version (since = "2.16")] public Gtk.Widget widget { get; construct; } + [Version (since = "2.16")] public virtual signal void apply (); + [Version (since = "2.16")] public virtual signal void update (Gtk.PageSetup widget, Gtk.PrintSettings page_setup); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_print_operation_get_type ()")] @@ -667,18 +716,26 @@ namespace WebKit { } [CCode (cheader_filename = "webkit2/webkit2.h", ref_function = "webkit_security_origin_ref", type_id = "webkit_security_origin_get_type ()", unref_function = "webkit_security_origin_unref")] [Compact] - [Version (since = "2.16")] public class SecurityOrigin { [CCode (has_construct_function = false)] + [Version (since = "2.16")] public SecurityOrigin (string protocol, string host, uint16 port); [CCode (has_construct_function = false)] + [Version (since = "2.16")] public SecurityOrigin.for_uri (string uri); + [Version (since = "2.16")] public unowned string? get_host (); + [Version (since = "2.16")] public uint16 get_port (); + [Version (since = "2.16")] public unowned string? get_protocol (); + [Version (since = "2.16")] public bool is_opaque (); + [Version (since = "2.16")] public unowned WebKit.SecurityOrigin @ref (); + [Version (since = "2.16")] public string? to_string (); + [Version (since = "2.16")] public void unref (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_settings_get_type ()")] @@ -972,27 +1029,36 @@ namespace WebKit { public void unref (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_user_content_filter_store_get_type ()")] - [Version (since = "2.24")] public class UserContentFilterStore : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "2.24")] public UserContentFilterStore (string storage_path); [CCode (array_length = false, array_null_terminated = true)] + [Version (since = "2.24")] public async string[] fetch_identifiers (GLib.Cancellable? cancellable = null); + [Version (since = "2.24")] public unowned string get_path (); + [Version (since = "2.24")] public async WebKit.UserContentFilter load (string identifier, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "2.24")] public async bool remove (string identifier, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "2.24")] public async WebKit.UserContentFilter save (string identifier, GLib.Bytes source, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "2.24")] public async WebKit.UserContentFilter save_from_file (string identifier, GLib.File file, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "2.24")] public string path { get; construct; } } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_user_content_manager_get_type ()")] - [Version (since = "2.6")] public class UserContentManager : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "2.6")] public UserContentManager (); [Version (since = "2.24")] public void add_filter (WebKit.UserContentFilter filter); + [Version (since = "2.6")] public void add_script (WebKit.UserScript script); + [Version (since = "2.6")] public void add_style_sheet (WebKit.UserStyleSheet stylesheet); [Version (since = "2.8")] public bool register_script_message_handler (string name); @@ -1000,7 +1066,9 @@ namespace WebKit { public bool register_script_message_handler_in_world (string name, string world_name); [Version (since = "2.24")] public void remove_all_filters (); + [Version (since = "2.6")] public void remove_all_scripts (); + [Version (since = "2.6")] public void remove_all_style_sheets (); public void remove_filter (WebKit.UserContentFilter filter); [Version (since = "2.26")] @@ -1013,7 +1081,6 @@ namespace WebKit { public signal void script_message_received (WebKit.JavascriptResult js_result); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_user_media_permission_request_get_type ()")] - [Version (since = "2.8")] public class UserMediaPermissionRequest : GLib.Object, WebKit.PermissionRequest { [CCode (has_construct_function = false)] protected UserMediaPermissionRequest (); @@ -1023,18 +1090,26 @@ namespace WebKit { public bool is_for_video_device { get; } } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_user_message_get_type ()")] - [Version (since = "2.28")] public class UserMessage : GLib.InitiallyUnowned { [CCode (has_construct_function = false)] + [Version (since = "2.28")] public UserMessage (string name, GLib.Variant? parameters); + [Version (since = "2.28")] public unowned GLib.UnixFDList get_fd_list (); + [Version (since = "2.28")] public unowned string get_name (); + [Version (since = "2.28")] public unowned GLib.Variant get_parameters (); + [Version (since = "2.28")] public void send_reply (WebKit.UserMessage reply); [CCode (has_construct_function = false)] + [Version (since = "2.28")] public UserMessage.with_fd_list (string name, GLib.Variant? parameters, GLib.UnixFDList? fd_list); + [Version (since = "2.28")] public GLib.UnixFDList fd_list { get; construct; } + [Version (since = "2.28")] public string name { get; construct; } + [Version (since = "2.28")] public GLib.Variant parameters { get; construct; } } [CCode (cheader_filename = "webkit2/webkit2.h", ref_function = "webkit_user_script_ref", type_id = "webkit_user_script_get_type ()", unref_function = "webkit_user_script_unref")] @@ -1391,24 +1466,28 @@ namespace WebKit { } [CCode (cheader_filename = "webkit2/webkit2.h", ref_function = "webkit_website_data_ref", type_id = "webkit_website_data_get_type ()", unref_function = "webkit_website_data_unref")] [Compact] - [Version (since = "2.16")] public class WebsiteData { + [Version (since = "2.16")] public unowned string get_name (); + [Version (since = "2.16")] public uint64 get_size (WebKit.WebsiteDataTypes types); + [Version (since = "2.16")] public WebKit.WebsiteDataTypes get_types (); + [Version (since = "2.16")] public unowned WebKit.WebsiteData @ref (); + [Version (since = "2.16")] public void unref (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_website_data_access_permission_request_get_type ()")] - [Version (since = "2.30")] public class WebsiteDataAccessPermissionRequest : GLib.Object, WebKit.PermissionRequest { [CCode (has_construct_function = false)] protected WebsiteDataAccessPermissionRequest (); + [Version (since = "2.30")] public unowned string get_current_domain (); + [Version (since = "2.30")] public unowned string get_requesting_domain (); } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_website_data_manager_get_type ()")] - [Version (since = "2.10")] public class WebsiteDataManager : GLib.Object { [CCode (has_construct_function = false)] protected WebsiteDataManager (); @@ -1419,15 +1498,19 @@ namespace WebKit { public WebsiteDataManager.ephemeral (); [Version (since = "2.16")] public async GLib.List fetch (WebKit.WebsiteDataTypes types, GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "2.10")] public unowned string? get_base_cache_directory (); + [Version (since = "2.10")] public unowned string? get_base_data_directory (); [Version (since = "2.16")] public unowned WebKit.CookieManager get_cookie_manager (); + [Version (since = "2.10")] public unowned string? get_disk_cache_directory (); [Version (since = "2.30")] public unowned string? get_dom_cache_directory (); [Version (since = "2.26")] public unowned string? get_hsts_cache_directory (); + [Version (since = "2.10")] public unowned string? get_indexeddb_directory (); [Version (since = "2.30")] public unowned string? get_itp_directory (); @@ -1435,7 +1518,9 @@ namespace WebKit { public bool get_itp_enabled (); [Version (since = "2.30")] public async GLib.List get_itp_summary (GLib.Cancellable? cancellable = null) throws GLib.Error; + [Version (since = "2.10")] public unowned string? get_local_storage_directory (); + [Version (since = "2.10")] public unowned string? get_offline_application_cache_directory (); [Version (since = "2.30")] public bool get_persistent_credential_storage_enabled (); @@ -1449,20 +1534,26 @@ namespace WebKit { public void set_itp_enabled (bool enabled); [Version (since = "2.30")] public void set_persistent_credential_storage_enabled (bool enabled); + [Version (since = "2.10")] public string base_cache_directory { get; construct; } + [Version (since = "2.10")] public string base_data_directory { get; construct; } + [Version (since = "2.10")] public string disk_cache_directory { get; construct; } [Version (since = "2.30")] public string dom_cache_directory { get; construct; } [Version (since = "2.26")] public string hsts_cache_directory { get; construct; } + [Version (since = "2.10")] public string indexeddb_directory { get; construct; } [NoAccessorMethod] [Version (since = "2.16")] public bool is_ephemeral { get; construct; } [Version (since = "2.30")] public string itp_directory { get; construct; } + [Version (since = "2.10")] public string local_storage_directory { get; construct; } + [Version (since = "2.10")] public string offline_application_cache_directory { get; construct; } [Version (since = "2.30")] public string service_worker_registrations_directory { get; construct; } @@ -1470,12 +1561,14 @@ namespace WebKit { public string websql_directory { get; construct; } } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_website_policies_get_type ()")] - [Version (since = "2.30")] public class WebsitePolicies : GLib.Object { [CCode (has_construct_function = false)] + [Version (since = "2.30")] public WebsitePolicies (); + [Version (since = "2.30")] public WebKit.AutoplayPolicy get_autoplay_policy (); [NoAccessorMethod] + [Version (since = "2.30")] public WebKit.AutoplayPolicy autoplay { get; construct; } } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_window_properties_get_type ()")] diff --git a/vapi/webkit2gtk-web-extension-4.0.vapi b/vapi/webkit2gtk-web-extension-4.0.vapi index c4b5b6387..f0c03aabb 100644 --- a/vapi/webkit2gtk-web-extension-4.0.vapi +++ b/vapi/webkit2gtk-web-extension-4.0.vapi @@ -4098,27 +4098,36 @@ namespace WebKit { public string uri { get; } } [CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_user_message_get_type ()")] - [Version (since = "2.28")] public class UserMessage : GLib.InitiallyUnowned { [CCode (has_construct_function = false)] + [Version (since = "2.28")] public UserMessage (string name, GLib.Variant? parameters); public static GLib.Quark error_quark (); + [Version (since = "2.28")] public unowned GLib.UnixFDList get_fd_list (); + [Version (since = "2.28")] public unowned string get_name (); + [Version (since = "2.28")] public unowned GLib.Variant get_parameters (); + [Version (since = "2.28")] public void send_reply (WebKit.UserMessage reply); [CCode (has_construct_function = false)] + [Version (since = "2.28")] public UserMessage.with_fd_list (string name, GLib.Variant? parameters, GLib.UnixFDList? fd_list); + [Version (since = "2.28")] public GLib.UnixFDList fd_list { get; construct; } + [Version (since = "2.28")] public string name { get; construct; } + [Version (since = "2.28")] public GLib.Variant parameters { get; construct; } } [CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_web_editor_get_type ()")] - [Version (since = "2.10")] public class WebEditor : GLib.Object { [CCode (has_construct_function = false)] protected WebEditor (); + [Version (since = "2.10")] public unowned WebKit.WebPage get_page (); + [Version (since = "2.10")] public signal void selection_changed (); } [CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_web_extension_get_type ()")] @@ -4133,10 +4142,10 @@ namespace WebKit { public signal void user_message_received (WebKit.UserMessage message); } [CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_web_hit_test_result_get_type ()")] - [Version (since = "2.8")] public class WebHitTestResult : WebKit.HitTestResult { [CCode (has_construct_function = false)] protected WebHitTestResult (); + [Version (since = "2.8")] public unowned WebKit.DOM.Node get_node (); public WebKit.DOM.Node node { get; construct; } } -- 2.47.2