From 6ed127d2c0890b4363536ed635cc4f55950e877d Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 10 Jan 2018 16:23:19 +0100
Subject: [PATCH] webkit2gtk-4.0: Update to 2.19.5

---
 vapi/webkit2gtk-4.0.vapi               | 14 +++++++++++++-
 vapi/webkit2gtk-web-extension-4.0.vapi | 12 ++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/vapi/webkit2gtk-4.0.vapi b/vapi/webkit2gtk-4.0.vapi
index eabe3f327..76170a990 100644
--- a/vapi/webkit2gtk-4.0.vapi
+++ b/vapi/webkit2gtk-4.0.vapi
@@ -294,7 +294,10 @@ namespace WebKit {
 	public class FormSubmissionRequest : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected FormSubmissionRequest ();
-		public unowned GLib.HashTable<void*,void*> get_text_fields ();
+		[Version (deprecated = true, deprecated_since = "2.20.")]
+		public unowned GLib.HashTable<void*,void*>? get_text_fields ();
+		[Version (since = "2.20")]
+		public bool list_text_fields (out unowned GLib.GenericArray<string> field_names, out unowned GLib.GenericArray<string> field_values);
 		public void submit ();
 	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_geolocation_permission_request_get_type ()")]
@@ -1134,7 +1137,10 @@ namespace WebKit {
 		[Version (since = "2.8")]
 		public virtual signal bool show_notification (WebKit.Notification notification);
 		public virtual signal void submit_form (WebKit.FormSubmissionRequest request);
+		[Version (deprecated = true, deprecated_since = "2.20")]
 		public virtual signal bool web_process_crashed ();
+		[Version (since = "2.20")]
+		public virtual signal void web_process_terminated (WebKit.WebProcessTerminationReason reason);
 	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_web_view_base_get_type ()")]
 	public class WebViewBase : Gtk.Container, Atk.Implementor, Gtk.Buildable {
@@ -1463,6 +1469,12 @@ namespace WebKit {
 		USER,
 		AUTHOR
 	}
+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_WEB_PROCESS_", type_id = "webkit_web_process_termination_reason_get_type ()")]
+	[Version (since = "2.20")]
+	public enum WebProcessTerminationReason {
+		CRASHED,
+		EXCEEDED_MEMORY_LIMIT
+	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_WEBSITE_DATA_", type_id = "webkit_website_data_types_get_type ()")]
 	[Flags]
 	[Version (since = "2.16")]
diff --git a/vapi/webkit2gtk-web-extension-4.0.vapi b/vapi/webkit2gtk-web-extension-4.0.vapi
index 9f8d9f53d..8c5e702a5 100644
--- a/vapi/webkit2gtk-web-extension-4.0.vapi
+++ b/vapi/webkit2gtk-web-extension-4.0.vapi
@@ -3032,8 +3032,10 @@ namespace WebKit {
 		[Version (since = "2.16")]
 		public signal void form_controls_associated (GLib.GenericArray<WebKit.DOM.Element> elements);
 		public signal bool send_request (WebKit.URIRequest request, WebKit.URIResponse redirected_response);
+		[Version (since = "2.20")]
+		public signal void will_submit_form (WebKit.DOM.HTMLFormElement form, WebKit.FormSubmissionStep step, WebKit.Frame source_frame, WebKit.Frame target_frame, GLib.GenericArray<string> text_field_names, GLib.GenericArray<string> text_field_values);
 	}
-	[CCode (cheader_filename = "webkit2/webkit-web-extension.h", cprefix = "WEBKIT_CONSOLE_MESSAGE_LEVEL_", has_type_id = false)]
+	[CCode (cheader_filename = "webkit2/webkit-web-extension.h", cprefix = "WEBKIT_CONSOLE_MESSAGE_LEVEL_", type_id = "webkit_console_message_level_get_type ()")]
 	[Version (since = "2.12")]
 	public enum ConsoleMessageLevel {
 		INFO,
@@ -3042,7 +3044,7 @@ namespace WebKit {
 		ERROR,
 		DEBUG
 	}
-	[CCode (cheader_filename = "webkit2/webkit-web-extension.h", cprefix = "WEBKIT_CONSOLE_MESSAGE_SOURCE_", has_type_id = false)]
+	[CCode (cheader_filename = "webkit2/webkit-web-extension.h", cprefix = "WEBKIT_CONSOLE_MESSAGE_SOURCE_", type_id = "webkit_console_message_source_get_type ()")]
 	[Version (since = "2.12")]
 	public enum ConsoleMessageSource {
 		JAVASCRIPT,
@@ -3099,6 +3101,12 @@ namespace WebKit {
 		DOWNLOAD_AUDIO_TO_DISK,
 		CUSTOM
 	}
+	[CCode (cheader_filename = "webkit2/webkit-web-extension.h", cprefix = "WEBKIT_FORM_SUBMISSION_WILL_", type_id = "webkit_form_submission_step_get_type ()")]
+	[Version (since = "2.20")]
+	public enum FormSubmissionStep {
+		SEND_DOM_EVENT,
+		COMPLETE
+	}
 	[CCode (cheader_filename = "webkit2/webkit-web-extension.h", cprefix = "WEBKIT_HIT_TEST_RESULT_CONTEXT_", has_type_id = false)]
 	[Flags]
 	public enum HitTestResultContext {
-- 
2.11.4.GIT