summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/API/gtk/docs
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-25 13:35:59 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-06-25 13:35:59 +0200
commit79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4 (patch)
tree0287b1a69d84492c901e8bc820e635e7133809a0 /Source/WebKit2/UIProcess/API/gtk/docs
parent682ab87480e7757346802ce7f54cfdbdfeb2339e (diff)
downloadqtwebkit-79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4.tar.gz
Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc (http://svn.webkit.org/repository/webkit/trunk@121147)
New snapshot that includes Win32 debug build fix (use SVGAllInOne)
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/docs')
-rw-r--r--Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml2
-rw-r--r--Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt62
-rw-r--r--Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types2
3 files changed, 66 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 c2eebf36c..6b62d6f69 100644
--- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml
+++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml
@@ -37,6 +37,8 @@
<xi:include href="xml/WebKitWebInspector.xml"/>
<xi:include href="xml/WebKitURISchemeRequest.xml"/>
<xi:include href="xml/WebKitVersion.xml"/>
+ <xi:include href="xml/WebKitContextMenu.xml"/>
+ <xi:include href="xml/WebKitContextMenuItem.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 1b97de88f..aca34df0b 100644
--- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt
+++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt
@@ -256,6 +256,8 @@ webkit_settings_get_enable_webaudio
webkit_settings_set_enable_webaudio
webkit_settings_get_enable_webgl
webkit_settings_set_enable_webgl
+webkit_settings_set_allow_modal_dialogs
+webkit_settings_get_allow_modal_dialogs
webkit_settings_get_zoom_text_only
webkit_settings_set_zoom_text_only
webkit_settings_get_javascript_can_access_clipboard
@@ -744,3 +746,63 @@ WEBKIT_MINOR_VERSION
WEBKIT_MICRO_VERSION
WEBKIT_CHECK_VERSION
</SECTION>
+
+<SECTION>
+<FILE>WebKitContextMenu</FILE>
+WebKitContextMenu
+webkit_context_menu_new
+webkit_context_menu_new_with_items
+webkit_context_menu_prepend
+webkit_context_menu_append
+webkit_context_menu_insert
+webkit_context_menu_move_item
+webkit_context_menu_get_items
+webkit_context_menu_get_n_items
+webkit_context_menu_first
+webkit_context_menu_last
+webkit_context_menu_get_item_at_position
+webkit_context_menu_remove
+webkit_context_menu_remove_all
+
+<SUBSECTION Standard>
+WebKitContextMenuClass
+WEBKIT_TYPE_CONTEXT_MENU
+WEBKIT_CONTEXT_MENU
+WEBKIT_IS_CONTEXT_MENU
+WEBKIT_CONTEXT_MENU_CLASS
+WEBKIT_IS_CONTEXT_MENU_CLASS
+WEBKIT_CONTEXT_MENU_GET_CLASS
+
+<SUBSECTION Private>
+WebKitContextMenuPrivate
+webkit_context_menu_get_type
+</SECTION>
+
+<SECTION>
+<FILE>WebKitContextMenuItem</FILE>
+WebKitContextMenuItem
+WebKitContextMenuAction
+webkit_context_menu_item_new
+webkit_context_menu_item_new_from_stock_action
+webkit_context_menu_item_new_from_stock_action_with_label
+webkit_context_menu_item_new_with_submenu
+webkit_context_menu_item_new_separator
+webkit_context_menu_item_get_action
+webkit_context_menu_item_get_stock_action
+webkit_context_menu_item_is_separator
+webkit_context_menu_item_set_submenu
+webkit_context_menu_item_get_submenu
+
+<SUBSECTION Standard>
+WebKitContextMenuItemClass
+WEBKIT_TYPE_CONTEXT_MENU_ITEM
+WEBKIT_CONTEXT_MENU_ITEM
+WEBKIT_IS_CONTEXT_MENU_ITEM
+WEBKIT_CONTEXT_MENU_ITEM_CLASS
+WEBKIT_IS_CONTEXT_MENU_ITEM_CLASS
+WEBKIT_CONTEXT_MENU_ITEM_GET_CLASS
+
+<SUBSECTION Private>
+WebKitContextMenuItemPrivate
+webkit_context_menu_item_get_type
+</SECTION>
diff --git a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types
index d155982f2..4d8843e9c 100644
--- a/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types
+++ b/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk.types
@@ -19,3 +19,5 @@ webkit_plugin_get_type
webkit_mime_info_get_type
webkit_web_inspector_get_type
webkit_uri_scheme_request_get_type
+webkit_context_menu_get_type
+webkit_context_menu_item_get_type