From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 11 Aug 2014 13:36:12 +0000 (+0200)
Subject: webkit2gtk: Update to 2.5.2
X-Git-Tag: 0.25.2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccf18315254585196811f5bb93d0de90ee7042a2;p=thirdparty%2Fvala.git

webkit2gtk: Update to 2.5.2
---

diff --git a/vapi/webkit2gtk-4.0.vapi b/vapi/webkit2gtk-4.0.vapi
index ec9b40e79..e4e8d796e 100644
--- a/vapi/webkit2gtk-4.0.vapi
+++ b/vapi/webkit2gtk-4.0.vapi
@@ -241,14 +241,24 @@ namespace WebKit {
 		[CCode (has_construct_function = false)]
 		protected NavigationPolicyDecision ();
 		public unowned string get_frame_name ();
+		[Deprecated (since = "2.6")]
 		public uint get_modifiers ();
+		[Deprecated (since = "2.6")]
 		public uint get_mouse_button ();
+		public unowned WebKit.NavigationAction get_navigation_action ();
+		[Deprecated (since = "2.6")]
 		public WebKit.NavigationType get_navigation_type ();
+		[Deprecated (since = "2.6")]
 		public unowned WebKit.URIRequest get_request ();
 		public string frame_name { get; }
+		[Deprecated (since = "2.6")]
 		public uint modifiers { get; }
+		[Deprecated (since = "2.6")]
 		public uint mouse_button { get; }
+		public WebKit.NavigationAction navigation_action { get; }
+		[Deprecated (since = "2.6")]
 		public WebKit.NavigationType navigation_type { get; }
+		[Deprecated (since = "2.6")]
 		public WebKit.URIRequest request { get; }
 	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_plugin_get_type ()")]
@@ -510,9 +520,19 @@ namespace WebKit {
 	public class UserContentManager : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public UserContentManager ();
+		public void add_script (WebKit.UserScript script);
 		public void add_style_sheet (WebKit.UserStyleSheet stylesheet);
+		public void remove_all_scripts ();
 		public void remove_all_style_sheets ();
 	}
+	[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")]
+	[Compact]
+	public class UserScript {
+		[CCode (has_construct_function = false)]
+		public UserScript (string source, WebKit.UserContentInjectedFrames injected_frames, WebKit.UserScriptInjectionTime injection_time, [CCode (array_length = false, array_null_terminated = true)] string[]? whitelist, [CCode (array_length = false, array_null_terminated = true)] string[]? blacklist);
+		public WebKit.UserScript @ref ();
+		public void unref ();
+	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", ref_function = "webkit_user_style_sheet_ref", type_id = "webkit_user_style_sheet_get_type ()", unref_function = "webkit_user_style_sheet_unref")]
 	[Compact]
 	public class UserStyleSheet {
@@ -880,6 +900,11 @@ namespace WebKit {
 		ALL_FRAMES,
 		TOP_FRAME
 	}
+	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_", type_id = "webkit_user_script_injection_time_get_type ()")]
+	public enum UserScriptInjectionTime {
+		START,
+		END
+	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_USER_STYLE_LEVEL_", type_id = "webkit_user_style_level_get_type ()")]
 	public enum UserStyleLevel {
 		USER,
diff --git a/vapi/webkit2gtk-web-extension-4.0.vapi b/vapi/webkit2gtk-web-extension-4.0.vapi
index 96d5e95d4..bb05ee9f0 100644
--- a/vapi/webkit2gtk-web-extension-4.0.vapi
+++ b/vapi/webkit2gtk-web-extension-4.0.vapi
@@ -1306,10 +1306,6 @@ namespace WebKit {
 			public string value { owned get; set; }
 			[NoAccessorMethod]
 			public double value_as_number { get; set; }
-			[NoAccessorMethod]
-			public bool webkit_grammar { get; set; }
-			[NoAccessorMethod]
-			public bool webkit_speech { get; set; }
 			public ulong width { get; set; }
 			public bool will_validate { get; }
 		}