diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebKit2/UIProcess/API/gtk/docs | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/docs')
3 files changed, 42 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml index 5cd859dad..4a9cc798c 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml @@ -27,6 +27,7 @@ <xi:include href="xml/WebKitHitTestResult.xml"/> <xi:include href="xml/WebKitPrintOperation.xml"/> <xi:include href="xml/WebKitError.xml"/> + <xi:include href="xml/WebKitFindController.xml"/> </chapter> <index id="index-all"> diff --git a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt index 5bfc129b2..a8f54083a 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt @@ -49,6 +49,8 @@ webkit_web_context_get_type WebKitWebView WebKitLoadEvent WebKitPolicyDecisionType +WebKitScriptDialog +WebKitScriptDialogType <SUBSECTION Editing Commands> WEBKIT_EDITING_COMMAND_CUT @@ -86,6 +88,12 @@ webkit_web_view_get_zoom_level webkit_web_view_can_execute_editing_command webkit_web_view_can_execute_editing_command_finish webkit_web_view_execute_editing_command +webkit_web_view_get_find_controller +webkit_script_dialog_get_dialog_type +webkit_script_dialog_get_message +webkit_script_dialog_confirm_set_confirmed +webkit_script_dialog_prompt_get_default_text +webkit_script_dialog_prompt_set_text <SUBSECTION Standard> WebKitWebViewClass @@ -95,9 +103,11 @@ WEBKIT_TYPE_WEB_VIEW WEBKIT_WEB_VIEW_CLASS WEBKIT_IS_WEB_VIEW_CLASS WEBKIT_WEB_VIEW_GET_CLASS +WEBKIT_TYPE_SCRIPT_DIALOG <SUBSECTION Private> webkit_web_view_get_type +webkit_script_dialog_get_type WebKitWebViewPrivate </SECTION> @@ -220,6 +230,8 @@ webkit_settings_get_enable_webaudio webkit_settings_set_enable_webaudio webkit_settings_get_enable_webgl webkit_settings_set_enable_webgl +webkit_settings_get_zoom_text_only +webkit_settings_set_zoom_text_only <SUBSECTION Standard> WebKitSettingsClass @@ -461,3 +473,30 @@ webkit_policy_error_quark webkit_download_error_quark </SECTION> +<SECTION> +<FILE>WebKitFindController</FILE> +WebKitFindController +WebKitFindOptions +webkit_find_controller_search +webkit_find_controller_search_finish +webkit_find_controller_search_next +webkit_find_controller_search_previous +webkit_find_controller_get_search_text +webkit_find_controller_count_matches +webkit_find_controller_get_options +webkit_find_controller_get_max_match_count +webkit_find_controller_get_web_view + +<SUBSECTION Standard> +WebKitFindControllerClass +WEBKIT_TYPE_FIND_CONTROLLER +WEBKIT_FIND_CONTROLLER +WEBKIT_IS_FIND_CONTROLLER +WEBKIT_FIND_CONTROLLER_CLASS +WEBKIT_IS_FIND_CONTROLLER_CLASS +WEBKIT_FIND_CONTROLLER_GET_CLASS + +<SUBSECTION Private> +WebKitFindControllerPrivate +webkit_find_controller_get_type +</SECTION> diff --git a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types index cba2df42c..8e8d7b13a 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types @@ -9,4 +9,5 @@ webkit_uri_response_get_type webkit_uri_request_get_type webkit_window_properties_get_type webkit_download_get_type - +webkit_find_controller_get_type +webkit_script_dialog_get_type |