From: Travis Watkins Date: Sat, 26 Sep 2009 15:02:12 +0000 (+0200) Subject: webkit-1.0: Update to WebKitGTK+ 1.1.14 X-Git-Tag: 0.7.7~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d4176547022421e24fda56041862bdf129dbd3c;p=thirdparty%2Fvala.git webkit-1.0: Update to WebKitGTK+ 1.1.14 Fixes bug 595585. --- diff --git a/vapi/packages/webkit-1.0/webkit-1.0.gi b/vapi/packages/webkit-1.0/webkit-1.0.gi index d32a40b5b..ea7f2ff6f 100644 --- a/vapi/packages/webkit-1.0/webkit-1.0.gi +++ b/vapi/packages/webkit-1.0/webkit-1.0.gi @@ -12,6 +12,12 @@ + + + + + + @@ -30,6 +36,21 @@ + + + + + + + + + + + + + + + @@ -42,10 +63,15 @@ + + + + + @@ -85,6 +111,9 @@ + + + @@ -212,6 +241,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -329,6 +437,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -337,12 +554,24 @@ + + + + + + + + + + + + @@ -361,6 +590,18 @@ + + + + + + + + + + + + @@ -373,6 +614,12 @@ + + + + + + @@ -445,10 +692,12 @@ + + @@ -476,6 +725,12 @@ + + + + + + @@ -617,6 +872,12 @@ + + + + + + @@ -635,6 +896,7 @@ + @@ -656,6 +918,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -663,6 +972,12 @@ + + + + + + @@ -673,16 +988,21 @@ + + + + + @@ -691,6 +1011,7 @@ + @@ -736,6 +1057,12 @@ + + + + + + @@ -743,6 +1070,12 @@ + + + + + + @@ -864,6 +1197,12 @@ + + + + + + @@ -973,6 +1312,12 @@ + + + + + + @@ -1050,6 +1395,13 @@ + + + + + + + @@ -1063,6 +1415,12 @@ + + + + + + @@ -1096,6 +1454,12 @@ + + + + + + @@ -1133,6 +1497,14 @@ + + + + + + + + @@ -1257,6 +1629,22 @@ + + + + + + + + + + + + + + + + @@ -1319,6 +1707,12 @@ + + + + + + @@ -1366,8 +1760,10 @@ - + + + diff --git a/vapi/packages/webkit-1.0/webkit-1.0.metadata b/vapi/packages/webkit-1.0/webkit-1.0.metadata index 91845ebb0..1f80ac68c 100644 --- a/vapi/packages/webkit-1.0/webkit-1.0.metadata +++ b/vapi/packages/webkit-1.0/webkit-1.0.metadata @@ -6,5 +6,6 @@ WebKitWebView::cut_clipboard has_emitter="1" WebKitWebView::hovering_over_link.p0 nullable="1" WebKitWebView::move_cursor has_emitter="1" WebKitWebView::paste_clipboard has_emitter="1" +WebKitWebView::redo has_emitter="1" WebKitWebView::select_all has_emitter="1" - +WebKitWebView::undo has_emitter="1" diff --git a/vapi/webkit-1.0.vapi b/vapi/webkit-1.0.vapi index 09e4effe4..db50ac35b 100644 --- a/vapi/webkit-1.0.vapi +++ b/vapi/webkit-1.0.vapi @@ -38,6 +38,31 @@ namespace WebKit { public string uri { get; set; } } [CCode (cheader_filename = "webkit/webkit.h")] + public class NetworkResponse : GLib.Object { + [CCode (has_construct_function = false)] + public NetworkResponse (string uri); + public unowned Soup.Message get_message (); + public unowned string get_uri (); + public void set_uri (string uri); + public Soup.Message message { get; construct; } + public string uri { get; set; } + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class SecurityOrigin : GLib.Object { + public unowned GLib.List get_all_web_databases (); + public unowned string get_host (); + public uint get_port (); + public unowned string get_protocol (); + public uint64 get_web_database_quota (); + public uint64 get_web_database_usage (); + public void set_web_database_quota (uint64 quota); + public string host { get; } + public uint port { get; } + public string protocol { get; } + public uint64 web_database_quota { get; set; } + public uint64 web_database_usage { get; } + } + [CCode (cheader_filename = "webkit/webkit.h")] public class SoupAuthDialog : GLib.Object, Soup.SessionFeature { public virtual signal unowned Gtk.Widget current_toplevel (Soup.Message message); } @@ -62,15 +87,51 @@ namespace WebKit { public WebBackForwardList.with_web_view (WebKit.WebView web_view); } [CCode (cheader_filename = "webkit/webkit.h")] + public class WebDataSource : GLib.Object { + [CCode (has_construct_function = false)] + public WebDataSource (); + public unowned GLib.StringBuilder get_data (); + public unowned string get_encoding (); + public unowned WebKit.NetworkRequest get_initial_request (); + public unowned WebKit.WebResource get_main_resource (); + public unowned WebKit.NetworkRequest get_request (); + public unowned string get_unreachable_uri (); + public unowned WebKit.WebFrame get_web_frame (); + public bool is_loading (); + [CCode (has_construct_function = false)] + public WebDataSource.with_request (WebKit.NetworkRequest request); + } + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebDatabase : GLib.Object { + public unowned string get_display_name (); + public uint64 get_expected_size (); + public unowned string get_filename (); + public unowned string get_name (); + public unowned WebKit.SecurityOrigin get_security_origin (); + public uint64 get_size (); + public void remove (); + public string display_name { get; } + public uint64 expected_size { get; } + public string filename { get; } + public string name { get; construct; } + public WebKit.SecurityOrigin security_origin { get; construct; } + public uint64 size { get; } + } + [CCode (cheader_filename = "webkit/webkit.h")] public class WebFrame : GLib.Object { [CCode (has_construct_function = false)] public WebFrame (WebKit.WebView web_view); public unowned WebKit.WebFrame find_frame (string name); + public unowned WebKit.WebDataSource get_data_source (); + public Gtk.PolicyType get_horizontal_scrollbar_policy (); public WebKit.LoadStatus get_load_status (); public unowned string get_name (); public unowned WebKit.WebFrame get_parent (); + public unowned WebKit.WebDataSource get_provisional_data_source (); + public unowned WebKit.SecurityOrigin get_security_origin (); public unowned string get_title (); public unowned string get_uri (); + public Gtk.PolicyType get_vertical_scrollbar_policy (); public unowned WebKit.WebView get_web_view (); public void load_alternate_string (string content, string base_url, string unreachable_url); public void load_request (WebKit.NetworkRequest request); @@ -80,14 +141,17 @@ namespace WebKit { public Gtk.PrintOperationResult print_full (Gtk.PrintOperation operation, Gtk.PrintOperationAction action) throws GLib.Error; public void reload (); public void stop_loading (); + public Gtk.PolicyType horizontal_scrollbar_policy { get; } public WebKit.LoadStatus load_status { get; } public string name { get; } public string title { get; } public string uri { get; } + public Gtk.PolicyType vertical_scrollbar_policy { get; } public virtual signal void cleared (); public virtual signal void hovering_over_link (string p0, string p1); public virtual signal void load_committed (); public virtual signal void load_done (bool p0); + public virtual signal bool scrollbars_policy_changed (); public virtual signal void title_changed (string p0); } [CCode (cheader_filename = "webkit/webkit.h")] @@ -129,12 +193,14 @@ namespace WebKit { public int get_modifier_state (); public unowned string get_original_uri (); public WebKit.WebNavigationReason get_reason (); + public unowned string get_target_frame (); public void set_original_uri (string originalUri); public void set_reason (WebKit.WebNavigationReason reason); public int button { get; construct; } public int modifier_state { get; construct; } public string original_uri { get; set construct; } public WebKit.WebNavigationReason reason { get; set construct; } + public string target_frame { get; construct; } } [CCode (cheader_filename = "webkit/webkit.h")] public class WebPolicyDecision : GLib.Object { @@ -143,10 +209,25 @@ namespace WebKit { public void use (); } [CCode (cheader_filename = "webkit/webkit.h")] + public class WebResource : GLib.Object { + [CCode (has_construct_function = false)] + public WebResource (string data, ssize_t size, string uri, string mime_type, string encoding, string frame_name); + public unowned GLib.StringBuilder get_data (); + public unowned string get_encoding (); + public unowned string get_frame_name (); + public unowned string get_mime_type (); + public unowned string get_uri (); + public string encoding { get; } + public string frame_name { get; } + public string mime_type { get; } + public string uri { get; construct; } + } + [CCode (cheader_filename = "webkit/webkit.h")] public class WebSettings : GLib.Object { [CCode (has_construct_function = false)] public WebSettings (); public WebKit.WebSettings copy (); + public unowned string get_user_agent (); [NoAccessorMethod] public bool auto_load_images { get; set construct; } [NoAccessorMethod] @@ -162,6 +243,8 @@ namespace WebKit { [NoAccessorMethod] public int default_monospace_font_size { get; set construct; } [NoAccessorMethod] + public WebKit.EditingBehavior editing_behavior { get; set construct; } + [NoAccessorMethod] public bool enable_caret_browsing { get; set construct; } [NoAccessorMethod] public bool enable_developer_extras { get; set construct; } @@ -170,6 +253,8 @@ namespace WebKit { [NoAccessorMethod] public bool enable_html5_local_storage { get; set construct; } [NoAccessorMethod] + public bool enable_offline_web_application_cache { get; set construct; } + [NoAccessorMethod] public bool enable_plugins { get; set construct; } [NoAccessorMethod] public bool enable_private_browsing { get; set construct; } @@ -178,10 +263,16 @@ namespace WebKit { [NoAccessorMethod] public bool enable_spell_checking { get; set construct; } [NoAccessorMethod] + public bool enable_universal_access_from_file_uris { get; set construct; } + [NoAccessorMethod] + public bool enable_xss_auditor { get; set construct; } + [NoAccessorMethod] public bool enforce_96_dpi { get; set construct; } [NoAccessorMethod] public string fantasy_font_family { owned get; set construct; } [NoAccessorMethod] + public bool javascript_can_open_windows_automatically { get; set construct; } + [NoAccessorMethod] public int minimum_font_size { get; set construct; } [NoAccessorMethod] public int minimum_logical_font_size { get; set construct; } @@ -198,6 +289,8 @@ namespace WebKit { [NoAccessorMethod] public string spell_checking_languages { owned get; set construct; } [NoAccessorMethod] + public string user_agent { owned get; set construct; } + [NoAccessorMethod] public string user_stylesheet_uri { owned get; set construct; } [NoAccessorMethod] public float zoom_step { get; set construct; } @@ -212,7 +305,9 @@ namespace WebKit { public bool can_go_back_or_forward (int steps); public bool can_go_forward (); public bool can_paste_clipboard (); + public bool can_redo (); public bool can_show_mime_type (string mime_type); + public bool can_undo (); [NoWrapper] public virtual unowned string choose_file (WebKit.WebFrame frame, string old_file); public void delete_selection (); @@ -233,6 +328,7 @@ namespace WebKit { public unowned string get_title (); public bool get_transparent (); public unowned string get_uri (); + public bool get_view_source_mode (); public unowned WebKit.WebWindowFeatures get_window_features (); public float get_zoom_level (); public void go_back (); @@ -256,6 +352,7 @@ namespace WebKit { public void set_maintains_back_forward_list (bool flag); public void set_settings (WebKit.WebSettings settings); public void set_transparent (bool flag); + public void set_view_source_mode (bool view_source_mode); public void set_zoom_level (float zoom_level); public void stop_loading (); public void unmark_text_matches (); @@ -278,6 +375,7 @@ namespace WebKit { [NoAccessorMethod] public WebKit.WebWindowFeatures window_features { owned get; set; } public float zoom_level { get; set; } + public virtual signal bool close_web_view (); public virtual signal bool console_message (string message, int line_number, string source_id); [HasEmitter] public virtual signal void copy_clipboard (); @@ -285,6 +383,7 @@ namespace WebKit { public virtual signal unowned WebKit.WebView create_web_view (WebKit.WebFrame web_frame); [HasEmitter] public virtual signal void cut_clipboard (); + public virtual signal void database_quota_exceeded (GLib.Object p0, GLib.Object p1); public virtual signal bool download_requested (GLib.Object p0); public virtual signal void hovering_over_link (string? p0, string p1); public virtual signal void icon_loaded (); @@ -303,6 +402,9 @@ namespace WebKit { public virtual signal void paste_clipboard (); public virtual signal void populate_popup (Gtk.Menu p0); public virtual signal bool print_requested (WebKit.WebFrame p0); + [HasEmitter] + public virtual signal void redo (); + public virtual signal void resource_request_starting (WebKit.WebFrame p0, WebKit.WebResource p1, WebKit.NetworkRequest p2, WebKit.NetworkResponse p3); public virtual signal bool script_alert (WebKit.WebFrame frame, string alert_message); public virtual signal bool script_confirm (WebKit.WebFrame frame, string confirm_message, void* did_confirm); public virtual signal bool script_prompt (WebKit.WebFrame frame, string message, string default_value, void* value); @@ -312,6 +414,8 @@ namespace WebKit { public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); public virtual signal void status_bar_text_changed (string p0); public virtual signal void title_changed (WebKit.WebFrame p0, string p1); + [HasEmitter] + public virtual signal void undo (); public virtual signal bool web_view_ready (); public virtual signal void window_object_cleared (WebKit.WebFrame frame, void* context, void* window_object); } @@ -355,11 +459,17 @@ namespace WebKit { CANCELLED, FINISHED } + [CCode (cprefix = "WEBKIT_EDITING_BEHAVIOR_", cheader_filename = "webkit/webkit.h")] + public enum EditingBehavior { + MAC, + WINDOWS + } [CCode (cprefix = "WEBKIT_LOAD_", cheader_filename = "webkit/webkit.h")] public enum LoadStatus { PROVISIONAL, COMMITTED, - FINISHED + FINISHED, + FIRST_VISUALLY_NON_EMPTY_LAYOUT } [CCode (cprefix = "WEBKIT_NAVIGATION_RESPONSE_", cheader_filename = "webkit/webkit.h")] public enum NavigationResponse { @@ -404,7 +514,10 @@ namespace WebKit { [CCode (cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_", cheader_filename = "webkit/webkit.h")] public enum WebViewTargetInfo { HTML, - TEXT + TEXT, + IMAGE, + URI_LIST, + NETSCAPE_URL } [CCode (cheader_filename = "webkit/webkit.h")] public const int MAJOR_VERSION; @@ -415,10 +528,18 @@ namespace WebKit { [CCode (cheader_filename = "webkit/webkit.h")] public const int SOUP_AUTH_DIALOG_H; [CCode (cheader_filename = "webkit/webkit.h")] + public const int USER_AGENT_MAJOR_VERSION; + [CCode (cheader_filename = "webkit/webkit.h")] + public const int USER_AGENT_MINOR_VERSION; + [CCode (cheader_filename = "webkit/webkit.h")] public static bool check_version (uint major, uint minor, uint micro); [CCode (cheader_filename = "webkit/webkit.h")] public static unowned Soup.Session get_default_session (); [CCode (cheader_filename = "webkit/webkit.h")] + public static uint64 get_default_web_database_quota (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static unowned string get_web_database_directory_path (); + [CCode (cheader_filename = "webkit/webkit.h")] public static uint major_version (); [CCode (cheader_filename = "webkit/webkit.h")] public static uint micro_version (); @@ -430,4 +551,10 @@ namespace WebKit { public static GLib.Quark plugin_error_quark (); [CCode (cheader_filename = "webkit/webkit.h")] public static GLib.Quark policy_error_quark (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static void remove_all_web_databases (); + [CCode (cheader_filename = "webkit/webkit.h")] + public static void set_default_web_database_quota (uint64 defaultQuota); + [CCode (cheader_filename = "webkit/webkit.h")] + public static void set_web_database_directory_path (string path); }