From 2abb211d53593d04e7678076fa7c3e0082da12f2 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sat, 1 Apr 2023 13:25:58 +0200 Subject: webkit2gtk-6.0: Update to 2.40.0 --- vapi/Makefile.am | 6 + vapi/webkitgtk-6.0.vapi | 36 ++-- vapi/webkitgtk-web-process-extension-6.0.deps | 3 + vapi/webkitgtk-web-process-extension-6.0.vapi | 296 ++++++++++++++++++++++++++ 4 files changed, 320 insertions(+), 21 deletions(-) create mode 100644 vapi/webkitgtk-web-process-extension-6.0.deps create mode 100644 vapi/webkitgtk-web-process-extension-6.0.vapi diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 2c8038500..74bf81c6d 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -320,6 +320,8 @@ dist_vapi_DATA = \ webkitgtk-6.0.deps \ webkitgtk-web-extension-6.0.vapi \ webkitgtk-web-extension-6.0.deps \ + webkitgtk-web-process-extension-6.0.vapi \ + webkitgtk-web-process-extension-6.0.deps \ x11.vapi \ xcb.vapi \ xcb-icccm.vapi \ @@ -453,6 +455,7 @@ GIR_BINDINGS = \ webkit2gtk-web-extension-5.0 \ webkitgtk-6.0 \ webkitgtk-web-extension-6.0 \ + webkitgtk-web-process-extension-6.0 \ $(GSTREAMER_1_0_BINDINGS) \ $(NULL) @@ -819,3 +822,6 @@ webkitgtk-6.0: webkitgtk-web-extension-6.0: $(GENVAPI) --library $(srcdir)/webkitgtk-web-extension-6.0 --metadatadir $(METADATADIR) --pkg javascriptcoregtk-6.0 --pkg gtk4 --pkg libsoup-3.0 $(METADATADIR)/WebKitWebExtension-6.0-custom.vala $(GIRDIR)/WebKitWebExtension-6.0.gir + +webkitgtk-web-process-extension-6.0: + $(GENVAPI) --library $(srcdir)/webkitgtk-web-process-extension-6.0 --metadatadir $(METADATADIR) --pkg javascriptcoregtk-6.0 --pkg gtk4 --pkg libsoup-3.0 $(GIRDIR)/WebKitWebProcessExtension-6.0.gir diff --git a/vapi/webkitgtk-6.0.vapi b/vapi/webkitgtk-6.0.vapi index f28d794ce..0ede9390c 100644 --- a/vapi/webkitgtk-6.0.vapi +++ b/vapi/webkitgtk-6.0.vapi @@ -206,7 +206,7 @@ namespace WebKit { public void cancel (); [Version (since = "2.6")] public bool get_allow_overwrite (); - public unowned string get_destination (); + public unowned string? get_destination (); public double get_elapsed_time (); public double get_estimated_progress (); public uint64 get_received_data_length (); @@ -215,14 +215,14 @@ namespace WebKit { public unowned WebKit.WebView get_web_view (); [Version (since = "2.6")] public void set_allow_overwrite (bool allowed); - public void set_destination (string uri); + public void set_destination (string destination); [Version (since = "2.6")] public bool allow_overwrite { get; set; } public string destination { get; } public double estimated_progress { get; } public WebKit.URIResponse response { get; } public signal void created_destination (string destination); - public virtual signal bool decide_destination (string suggested_filename); + public signal bool decide_destination (string suggested_filename); public signal void failed (WebKit.DownloadError error); public signal void finished (); public signal void received_data (uint64 data_length); @@ -413,14 +413,6 @@ namespace WebKit { public void free (); public void set_color (Gdk.RGBA? rgba); } - [CCode (cheader_filename = "webkit/webkit.h", ref_function = "webkit_javascript_result_ref", type_id = "webkit_javascript_result_get_type ()", unref_function = "webkit_javascript_result_unref")] - [Compact] - public class JavascriptResult { - [Version (since = "2.22")] - public unowned JSC.Value get_js_value (); - public unowned WebKit.JavascriptResult @ref (); - public void unref (); - } [CCode (cheader_filename = "webkit/webkit.h", type_id = "webkit_media_key_system_permission_request_get_type ()")] public sealed class MediaKeySystemPermissionRequest : GLib.Object, WebKit.PermissionRequest { [CCode (has_construct_function = false)] @@ -951,6 +943,8 @@ namespace WebKit { public void finish_error (GLib.Error error); [Version (since = "2.36")] public void finish_with_response (WebKit.URISchemeResponse response); + [Version (since = "2.40")] + public GLib.InputStream get_http_body (); [Version (since = "2.36")] public unowned Soup.MessageHeaders get_http_headers (); [Version (since = "2.36")] @@ -1027,9 +1021,9 @@ namespace WebKit { [Version (since = "2.40")] public void unregister_script_message_handler (string name, string? world_name); [Version (since = "2.8")] - public signal void script_message_received (WebKit.JavascriptResult js_result); + public signal void script_message_received (JSC.Value value); [Version (since = "2.40")] - public signal bool script_message_with_reply_received (WebKit.JavascriptResult js_result, WebKit.ScriptMessageReply reply); + public signal bool script_message_with_reply_received (JSC.Value value, WebKit.ScriptMessageReply reply); } [CCode (cheader_filename = "webkit/webkit.h", type_id = "webkit_user_media_permission_request_get_type ()")] [Version (since = "2.8")] @@ -1113,22 +1107,22 @@ namespace WebKit { public void set_preferred_languages ([CCode (array_length = false, array_null_terminated = true)] string[]? languages); public void set_spell_checking_enabled (bool enabled); public void set_spell_checking_languages ([CCode (array_length = false, array_null_terminated = true)] string[] languages); - public void set_web_extensions_directory (string directory); + public void set_web_process_extensions_directory (string directory); [Version (since = "2.4")] - public void set_web_extensions_initialization_user_data (GLib.Variant user_data); + public void set_web_process_extensions_initialization_user_data (GLib.Variant user_data); [NoAccessorMethod] [Version (since = "2.34")] public WebKit.MemoryPressureSettings memory_pressure_settings { construct; } [Version (since = "2.38")] public string time_zone_override { get; construct; } [Version (since = "2.18")] - public virtual signal void automation_started (WebKit.AutomationSession session); + public signal void automation_started (WebKit.AutomationSession session); [Version (since = "2.16")] - public virtual signal void initialize_notification_permissions (); + public signal void initialize_notification_permissions (); [Version (since = "2.4")] - public virtual signal void initialize_web_extensions (); + public signal void initialize_web_process_extensions (); [Version (since = "2.28")] - public virtual signal bool user_message_received (WebKit.UserMessage message); + public signal bool user_message_received (WebKit.UserMessage message); } [CCode (cheader_filename = "webkit/webkit.h", type_id = "webkit_web_inspector_get_type ()")] public sealed class WebInspector : GLib.Object { @@ -1174,14 +1168,14 @@ namespace WebKit { [CCode (has_construct_function = false, type = "GtkWidget*")] public WebView (); [Version (since = "2.40")] - public async WebKit.JavascriptResult call_async_javascript_function (string body, ssize_t length, GLib.Variant? arguments, string? world_name, string? source_uri, GLib.Cancellable? cancellable = null) throws GLib.Error; + public async JSC.Value call_async_javascript_function (string body, ssize_t length, GLib.Variant? arguments, string? world_name, string? source_uri, GLib.Cancellable? cancellable = null) throws GLib.Error; public async bool can_execute_editing_command (string command, GLib.Cancellable? cancellable = null) throws GLib.Error; public bool can_go_back (); public bool can_go_forward (); public bool can_show_mime_type (string mime_type); public WebKit.Download download_uri (string uri); [Version (since = "2.40")] - public async WebKit.JavascriptResult evaluate_javascript (string script, ssize_t length, string? world_name, string? source_uri, GLib.Cancellable? cancellable = null) throws GLib.Error; + public async JSC.Value evaluate_javascript (string script, ssize_t length, string? world_name, string? source_uri, GLib.Cancellable? cancellable = null) throws GLib.Error; public void execute_editing_command (string command); [Version (since = "2.10")] public void execute_editing_command_with_argument (string command, string argument); diff --git a/vapi/webkitgtk-web-process-extension-6.0.deps b/vapi/webkitgtk-web-process-extension-6.0.deps new file mode 100644 index 000000000..7059f87f6 --- /dev/null +++ b/vapi/webkitgtk-web-process-extension-6.0.deps @@ -0,0 +1,3 @@ +gtk4 +javascriptcoregtk-6.0 +libsoup-3.0 diff --git a/vapi/webkitgtk-web-process-extension-6.0.vapi b/vapi/webkitgtk-web-process-extension-6.0.vapi new file mode 100644 index 000000000..d6dba9315 --- /dev/null +++ b/vapi/webkitgtk-web-process-extension-6.0.vapi @@ -0,0 +1,296 @@ +/* webkitgtk-web-process-extension-6.0.vapi generated by vapigen, do not modify. */ + +[CCode (cprefix = "WebKit", gir_namespace = "WebKitWebProcessExtension", gir_version = "6.0", lower_case_cprefix = "webkit_")] +namespace WebKit { + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_context_menu_get_type ()")] + public sealed class ContextMenu : GLib.Object { + [CCode (has_construct_function = false)] + public ContextMenu (); + public void append (WebKit.ContextMenuItem item); + public unowned WebKit.ContextMenuItem first (); + [Version (since = "2.40")] + public unowned Gdk.Event get_event (); + public unowned WebKit.ContextMenuItem get_item_at_position (uint position); + public unowned GLib.List get_items (); + public uint get_n_items (); + [Version (since = "2.8")] + public unowned GLib.Variant get_user_data (); + public void insert (WebKit.ContextMenuItem item, int position); + public unowned WebKit.ContextMenuItem last (); + public void move_item (WebKit.ContextMenuItem item, int position); + public void prepend (WebKit.ContextMenuItem item); + public void remove (WebKit.ContextMenuItem item); + public void remove_all (); + [Version (since = "2.8")] + public void set_user_data (GLib.Variant user_data); + [CCode (has_construct_function = false)] + public ContextMenu.with_items (GLib.List items); + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_context_menu_item_get_type ()")] + public sealed class ContextMenuItem : GLib.InitiallyUnowned { + [CCode (has_construct_function = false)] + protected ContextMenuItem (); + [CCode (has_construct_function = false)] + [Version (since = "2.18")] + public ContextMenuItem.from_gaction (GLib.Action action, string label, GLib.Variant? target); + [CCode (has_construct_function = false)] + public ContextMenuItem.from_stock_action (WebKit.ContextMenuAction action); + [CCode (has_construct_function = false)] + public ContextMenuItem.from_stock_action_with_label (WebKit.ContextMenuAction action, string label); + [Version (since = "2.18")] + public unowned GLib.Action get_gaction (); + public WebKit.ContextMenuAction get_stock_action (); + public unowned WebKit.ContextMenu get_submenu (); + public bool is_separator (); + [CCode (has_construct_function = false)] + public ContextMenuItem.separator (); + public void set_submenu (WebKit.ContextMenu? submenu); + [CCode (has_construct_function = false)] + public ContextMenuItem.with_submenu (string label, WebKit.ContextMenu submenu); + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_frame_get_type ()")] + [Version (since = "2.26")] + public sealed class Frame : GLib.Object { + [CCode (has_construct_function = false)] + protected Frame (); + public uint64 get_id (); + [Version (since = "2.22")] + public JSC.Context get_js_context (); + [Version (since = "2.22")] + public JSC.Context get_js_context_for_script_world (WebKit.ScriptWorld world); + [Version (since = "2.2")] + public unowned string get_uri (); + [Version (since = "2.2")] + public bool is_main_frame (); + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_hit_test_result_get_type ()")] + public sealed class HitTestResult : GLib.Object { + [CCode (has_construct_function = false)] + protected HitTestResult (); + public bool context_is_editable (); + public bool context_is_image (); + public bool context_is_link (); + public bool context_is_media (); + public bool context_is_scrollbar (); + [Version (since = "2.8")] + public bool context_is_selection (); + public uint get_context (); + public unowned string get_image_uri (); + public unowned string get_link_label (); + public unowned string get_link_title (); + public unowned string get_link_uri (); + public unowned string get_media_uri (); + public uint context { get; construct; } + public string image_uri { get; construct; } + public string link_label { get; construct; } + public string link_title { get; construct; } + public string link_uri { get; construct; } + public string media_uri { get; construct; } + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_script_world_get_type ()")] + public sealed class ScriptWorld : GLib.Object { + [CCode (has_construct_function = false)] + [Version (since = "2.2")] + public ScriptWorld (); + [Version (since = "2.2")] + public static unowned WebKit.ScriptWorld get_default (); + [Version (since = "2.22")] + public unowned string get_name (); + [CCode (has_construct_function = false)] + [Version (since = "2.22")] + public ScriptWorld.with_name (string name); + [Version (since = "2.2")] + public signal void window_object_cleared (WebKit.WebPage page, WebKit.Frame frame); + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_uri_request_get_type ()")] + public sealed class URIRequest : GLib.Object { + [CCode (has_construct_function = false)] + public URIRequest (string uri); + public unowned Soup.MessageHeaders get_http_headers (); + [Version (since = "2.12")] + public unowned string get_http_method (); + public unowned string get_uri (); + public void set_uri (string uri); + public string uri { get; set construct; } + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_uri_response_get_type ()")] + public sealed class URIResponse : GLib.Object { + [CCode (has_construct_function = false)] + protected URIResponse (); + public uint64 get_content_length (); + [Version (since = "2.6")] + public unowned Soup.MessageHeaders get_http_headers (); + public unowned string get_mime_type (); + public uint get_status_code (); + public unowned string get_suggested_filename (); + public unowned string get_uri (); + public uint64 content_length { get; } + [Version (since = "2.6")] + public Soup.MessageHeaders http_headers { get; } + public string mime_type { get; } + public uint status_code { get; } + public string suggested_filename { get; } + public string uri { get; } + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_user_message_get_type ()")] + [Version (since = "2.28")] + public sealed class UserMessage : GLib.InitiallyUnowned { + [CCode (has_construct_function = false)] + public UserMessage (string name, GLib.Variant? parameters); + public static GLib.Quark error_quark (); + public unowned GLib.UnixFDList? get_fd_list (); + public unowned string get_name (); + public unowned GLib.Variant? get_parameters (); + public void send_reply (WebKit.UserMessage reply); + [CCode (has_construct_function = false)] + public UserMessage.with_fd_list (string name, GLib.Variant? parameters, GLib.UnixFDList? fd_list); + public GLib.UnixFDList fd_list { get; construct; } + public string name { get; construct; } + public GLib.Variant parameters { get; construct; } + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_web_editor_get_type ()")] + [Version (since = "2.10")] + public sealed class WebEditor : GLib.Object { + [CCode (has_construct_function = false)] + protected WebEditor (); + public unowned WebKit.WebPage get_page (); + public signal void selection_changed (); + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_web_form_manager_get_type ()")] + [Version (since = "2.40")] + public class WebFormManager : GLib.Object { + [CCode (has_construct_function = false)] + protected WebFormManager (); + public static void input_element_auto_fill (JSC.Value element, string value); + public static bool input_element_is_auto_filled (JSC.Value element); + public static bool input_element_is_user_edited (JSC.Value element); + public signal void form_controls_associated (WebKit.Frame frame, GLib.GenericArray elements); + public signal void will_send_submit_event (JSC.Value form, WebKit.Frame source_frame, WebKit.Frame target_frame); + public signal void will_submit_form (JSC.Value form, WebKit.Frame source_frame, WebKit.Frame target_frame); + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_web_hit_test_result_get_type ()")] + [Version (since = "2.8")] + public sealed class WebHitTestResult : GLib.Object { + [CCode (has_construct_function = false)] + protected WebHitTestResult (); + public bool context_is_editable (); + public bool context_is_image (); + public bool context_is_link (); + public bool context_is_media (); + public bool context_is_scrollbar (); + public bool context_is_selection (); + public uint get_context (); + public unowned string get_image_uri (); + [Version (since = "2.40")] + public JSC.Value? get_js_node (WebKit.ScriptWorld? world); + public unowned string get_link_label (); + public unowned string get_link_title (); + public unowned string get_link_uri (); + public unowned string get_media_uri (); + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_web_page_get_type ()")] + public sealed class WebPage : GLib.Object { + [CCode (has_construct_function = false)] + protected WebPage (); + [Version (since = "2.10")] + public unowned WebKit.WebEditor get_editor (); + [Version (since = "2.40")] + public unowned WebKit.WebFormManager get_form_manager (WebKit.ScriptWorld? world); + public uint64 get_id (); + [Version (since = "2.2")] + public unowned WebKit.Frame get_main_frame (); + public unowned string get_uri (); + [Version (since = "2.28")] + public async WebKit.UserMessage send_message_to_view (WebKit.UserMessage message, GLib.Cancellable? cancellable) throws GLib.Error; + public string uri { get; } + [Version (since = "2.8")] + public signal bool context_menu (WebKit.ContextMenu context_menu, WebKit.WebHitTestResult hit_test_result); + public signal void document_loaded (); + public signal bool send_request (WebKit.URIRequest request, WebKit.URIResponse redirected_response); + [Version (since = "2.28")] + public signal bool user_message_received (WebKit.UserMessage message); + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", type_id = "webkit_web_process_extension_get_type ()")] + [Version (since = "2.40")] + public sealed class WebProcessExtension : GLib.Object { + [CCode (has_construct_function = false)] + protected WebProcessExtension (); + public unowned WebKit.WebPage get_page (uint64 page_id); + public async WebKit.UserMessage send_message_to_context (WebKit.UserMessage message, GLib.Cancellable? cancellable) throws GLib.Error; + public signal void page_created (WebKit.WebPage web_page); + public signal void user_message_received (WebKit.UserMessage message); + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", cprefix = "WEBKIT_CONTEXT_MENU_ACTION_", has_type_id = false)] + public enum ContextMenuAction { + NO_ACTION, + OPEN_LINK, + OPEN_LINK_IN_NEW_WINDOW, + DOWNLOAD_LINK_TO_DISK, + COPY_LINK_TO_CLIPBOARD, + OPEN_IMAGE_IN_NEW_WINDOW, + DOWNLOAD_IMAGE_TO_DISK, + COPY_IMAGE_TO_CLIPBOARD, + COPY_IMAGE_URL_TO_CLIPBOARD, + OPEN_FRAME_IN_NEW_WINDOW, + GO_BACK, + GO_FORWARD, + STOP, + RELOAD, + COPY, + CUT, + PASTE, + DELETE, + SELECT_ALL, + INPUT_METHODS, + UNICODE, + SPELLING_GUESS, + NO_GUESSES_FOUND, + IGNORE_SPELLING, + LEARN_SPELLING, + IGNORE_GRAMMAR, + FONT_MENU, + BOLD, + ITALIC, + UNDERLINE, + OUTLINE, + INSPECT_ELEMENT, + OPEN_VIDEO_IN_NEW_WINDOW, + OPEN_AUDIO_IN_NEW_WINDOW, + COPY_VIDEO_LINK_TO_CLIPBOARD, + COPY_AUDIO_LINK_TO_CLIPBOARD, + TOGGLE_MEDIA_CONTROLS, + TOGGLE_MEDIA_LOOP, + ENTER_VIDEO_FULLSCREEN, + MEDIA_PLAY, + MEDIA_PAUSE, + MEDIA_MUTE, + DOWNLOAD_VIDEO_TO_DISK, + DOWNLOAD_AUDIO_TO_DISK, + INSERT_EMOJI, + PASTE_AS_PLAIN_TEXT, + CUSTOM + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", cprefix = "WEBKIT_HIT_TEST_RESULT_CONTEXT_", has_type_id = false)] + [Flags] + public enum HitTestResultContext { + DOCUMENT, + LINK, + IMAGE, + MEDIA, + EDITABLE, + SCROLLBAR, + SELECTION + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", cprefix = "WEBKIT_USER_MESSAGE_UNHANDLED_", has_type_id = false)] + [Version (since = "2.28")] + public enum UserMessageError { + [CCode (cname = "WEBKIT_USER_MESSAGE_UNHANDLED_MESSAGE")] + USER_MESSAGE_UNHANDLED_MESSAGE + } + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", has_target = false)] + [Version (since = "2.40")] + public delegate void WebProcessExtensionInitializeFunction (WebKit.WebProcessExtension extension); + [CCode (cheader_filename = "webkit/webkit-web-process-extension.h", has_target = false)] + [Version (since = "2.40")] + public delegate void WebProcessExtensionInitializeWithUserDataFunction (WebKit.WebProcessExtension extension, GLib.Variant user_data); +} -- cgit v1.2.1