diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
| commit | 6dbcd09121fe266c7704a524b5cbd7f2754659c0 (patch) | |
| tree | 5ae0d16cec0cc61f576d51c57b3a4613c7e91e22 /Source/WebKit2/UIProcess/API/gtk/docs | |
| parent | 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (diff) | |
| download | qtwebkit-6dbcd09121fe266c7704a524b5cbd7f2754659c0.tar.gz | |
Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119)
New snapshot with prospective build fix for incorrect QtWebKit master module header file creation
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/docs')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml | 1 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml index 6aac7c843..a7f34e6d1 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml @@ -40,6 +40,7 @@ <xi:include href="xml/WebKitContextMenu.xml"/> <xi:include href="xml/WebKitContextMenuItem.xml"/> <xi:include href="xml/WebKitFormSubmissionRequest.xml"/> + <xi:include href="xml/WebKitSecurityManager.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 596498c83..73defe419 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt @@ -30,6 +30,7 @@ webkit_web_context_set_cache_model webkit_web_context_clear_cache webkit_web_context_download_uri webkit_web_context_get_cookie_manager +webkit_web_context_get_security_manager webkit_web_context_set_additional_plugins_directory webkit_web_context_get_plugins webkit_web_context_get_plugins_finish @@ -283,6 +284,9 @@ webkit_settings_get_enable_site_specific_quirks webkit_settings_set_enable_site_specific_quirks webkit_settings_get_enable_page_cache webkit_settings_set_enable_page_cache +webkit_settings_get_user_agent +webkit_settings_set_user_agent +webkit_settings_set_user_agent_with_application_details <SUBSECTION Standard> WebKitSettingsClass @@ -845,3 +849,33 @@ WEBKIT_FORM_SUBMISSION_REQUEST_GET_CLASS WebKitFormSubmissionRequestPrivate webkit_form_submission_request_get_type </SECTION> + +<SECTION> +<FILE>WebKitSecurityManager</FILE> +WebKitSecurityManager +webkit_security_manager_register_uri_scheme_as_local +webkit_security_manager_uri_scheme_is_local +webkit_security_manager_register_uri_scheme_as_no_access +webkit_security_manager_uri_scheme_is_no_access +webkit_security_manager_register_uri_scheme_as_display_isolated +webkit_security_manager_uri_scheme_is_display_isolated +webkit_security_manager_register_uri_scheme_as_secure +webkit_security_manager_uri_scheme_is_secure +webkit_security_manager_register_uri_scheme_as_cors_enabled +webkit_security_manager_uri_scheme_is_cors_enabled +webkit_security_manager_register_uri_scheme_as_empty_document +webkit_security_manager_uri_scheme_is_empty_document + +<SUBSECTION Standard> +WebKitSecurityManagerClass +WEBKIT_TYPE_SECURITY_MANAGER +WEBKIT_SECURITY_MANAGER +WEBKIT_IS_SECURITY_MANAGER +WEBKIT_SECURITY_MANAGER_CLASS +WEBKIT_IS_SECURITY_MANAGER_CLASS +WEBKIT_SECURITY_MANAGER_GET_CLASS + +<SUBSECTION Private> +WebKitSecurityManagerPrivate +webkit_security_manager_get_type +</SECTION> |