diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebKit2/UIProcess/API/gtk/docs | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/docs')
3 files changed, 63 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 90005acb2..c2eebf36c 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml @@ -22,6 +22,7 @@ <xi:include href="xml/WebKitWindowProperties.xml"/> <xi:include href="xml/WebKitDownload.xml"/> <xi:include href="xml/WebKitPermissionRequest.xml"/> + <xi:include href="xml/WebKitGeolocationPermissionRequest.xml"/> <xi:include href="xml/WebKitPolicyDecision.xml"/> <xi:include href="xml/WebKitNavigationPolicyDecision.xml"/> <xi:include href="xml/WebKitResponsePolicyDecision.xml"/> @@ -34,6 +35,8 @@ <xi:include href="xml/WebKitCookieManager.xml"/> <xi:include href="xml/WebKitPlugin.xml"/> <xi:include href="xml/WebKitWebInspector.xml"/> + <xi:include href="xml/WebKitURISchemeRequest.xml"/> + <xi:include href="xml/WebKitVersion.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 6dde0866d..1b97de88f 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt @@ -33,6 +33,10 @@ webkit_web_context_set_additional_plugins_directory webkit_web_context_get_plugins webkit_web_context_get_plugins_finish +<SUBSECTION URI Scheme> +WebKitURISchemeRequestCallback +webkit_web_context_register_uri_scheme + <SUBSECTION Standard> WebKitWebContextClass WEBKIT_WEB_CONTEXT @@ -355,6 +359,7 @@ webkit_download_get_response webkit_download_cancel webkit_download_get_estimated_progress webkit_download_get_elapsed_time +webkit_download_get_received_data_length <SUBSECTION Standard> WebKitDownloadClass @@ -388,6 +393,24 @@ webkit_permission_request_get_type </SECTION> <SECTION> +<FILE>WebKitGeolocationPermissionRequest</FILE> +WebKitGeolocationPermissionRequest + +<SUBSECTION Standard> +WebKitGeolocationPermissionRequestClass +WEBKIT_TYPE_GEOLOCATION_PERMISSION_REQUEST +WEBKIT_GEOLOCATION_PERMISSION_REQUEST +WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST +WEBKIT_GEOLOCATION_PERMISSION_REQUEST_CLASS +WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST_CLASS +WEBKIT_GEOLOCATION_PERMISSION_REQUEST_GET_CLASS + +<SUBSECTION Private> +WebKitGeolocationPermissionRequestPrivate +webkit_geolocation_permission_request_get_type +</SECTION> + +<SECTION> <FILE>WebKitPolicyDecision</FILE> WebKitPolicyDecision webkit_policy_decision_download @@ -460,6 +483,7 @@ webkit_hit_test_result_get_context webkit_hit_test_result_context_is_link webkit_hit_test_result_context_is_image webkit_hit_test_result_context_is_media +webkit_hit_test_result_context_is_editable webkit_hit_test_result_get_link_uri webkit_hit_test_result_get_link_title webkit_hit_test_result_get_link_label @@ -685,3 +709,38 @@ WEBKIT_WEB_INSPECTOR_GET_CLASS webkit_web_inspector_get_type WebKitWebInspectorPrivate </SECTION> + +<SECTION> +<FILE>WebKitURISchemeRequest</FILE> +WebKitURISchemeRequest +webkit_uri_scheme_request_get_scheme +webkit_uri_scheme_request_get_uri +webkit_uri_scheme_request_get_path +webkit_uri_scheme_request_finish + +<SUBSECTION Standard> +WebKitURISchemeRequestClass +WEBKIT_TYPE_URI_SCHEME_REQUEST +WEBKIT_URI_SCHEME_REQUEST +WEBKIT_IS_URI_SCHEME_REQUEST +WEBKIT_URI_SCHEME_REQUEST_CLASS +WEBKIT_IS_URI_SCHEME_REQUEST_CLASS +WEBKIT_URI_SCHEME_REQUEST_GET_CLASS + +<SUBSECTION Private> +WebKitURISchemeRequestPrivate +webkit_uri_scheme_request_get_type +</SECTION> + +<SECTION> +<FILE>WebKitVersion</FILE> +webkit_get_major_version +webkit_get_minor_version +webkit_get_micro_version + +<SUBSECTION> +WEBKIT_MAJOR_VERSION +WEBKIT_MINOR_VERSION +WEBKIT_MICRO_VERSION +WEBKIT_CHECK_VERSION +</SECTION> diff --git a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types index 92b6fb400..d155982f2 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types @@ -18,3 +18,4 @@ webkit_cookie_manager_get_type webkit_plugin_get_type webkit_mime_info_get_type webkit_web_inspector_get_type +webkit_uri_scheme_request_get_type |