diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
| commit | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (patch) | |
| tree | cdca40d0353886b3ca52f33a2d7b8f1c0011aafc /Source/WebKit2/UIProcess/API/gtk/docs | |
| parent | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (diff) | |
| download | qtwebkit-8d473cf9743f1d30a16a27114e93bd5af5648d23.tar.gz | |
Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)
Weekly snapshot
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/docs')
3 files changed, 38 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 821127f3d..63db05f77 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml @@ -31,6 +31,7 @@ <xi:include href="xml/WebKitFileChooserRequest.xml"/> <xi:include href="xml/WebKitFindController.xml"/> <xi:include href="xml/WebKitCookieManager.xml"/> + <xi:include href="xml/WebKitPlugin.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 f5e15d9b2..884177b8b 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt @@ -29,6 +29,9 @@ webkit_web_context_get_cache_model webkit_web_context_set_cache_model webkit_web_context_download_uri webkit_web_context_get_cookie_manager +webkit_web_context_set_additional_plugins_directory +webkit_web_context_get_plugins +webkit_web_context_get_plugins_finish <SUBSECTION Standard> WebKitWebContextClass @@ -601,3 +604,35 @@ WEBKIT_COOKIE_MANAGER_GET_CLASS WebKitCookieManagerPrivate webkit_cookie_manager_get_type </SECTION> + +<SECTION> +<FILE>WebKitPlugin</FILE> +WebKitPlugin +webkit_plugin_get_name +webkit_plugin_get_description +webkit_plugin_get_path +webkit_plugin_get_mime_info_list + +<SUBSECTION WebKitMimeInfo> +WebKitMimeInfo +webkit_mime_info_ref +webkit_mime_info_unref +webkit_mime_info_get_mime_type +webkit_mime_info_get_description +webkit_mime_info_get_extensions + +<SUBSECTION Standard> +WebKitPluginClass +WEBKIT_TYPE_PLUGIN +WEBKIT_PLUGIN +WEBKIT_IS_PLUGIN +WEBKIT_PLUGIN_CLASS +WEBKIT_IS_PLUGIN_CLASS +WEBKIT_PLUGIN_GET_CLASS +WEBKIT_TYPE_MIME_INFO + +<SUBSECTION Private> +webkit_plugin_get_type +webkit_mime_info_get_type +WebKitPluginPrivate +</SECTION> diff --git a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types index 1ca821b47..cdf9edd73 100644 --- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types +++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types @@ -15,3 +15,5 @@ webkit_script_dialog_get_type webkit_javascript_result_get_type webkit_web_resource_get_type webkit_cookie_manager_get_type +webkit_plugin_get_type +webkit_mime_info_get_type |