[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
kov at webkit.org
kov at webkit.org
Wed Dec 22 18:50:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5e40f1ff59105971a32307097f645956561d2927
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 20 22:13:13 2010 +0000
2010-12-20 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Xan Lopez.
Add WebPlugin, WebPluginDatabase, and ViewportAttributes to the
documentation control files, in preparation for 1.3.8. Also take
the opportunity to add descriptions to WebPlugin and
WebPluginDatabase.
* docs/GNUmakefile.am:
* docs/webkitgtk-docs.sgml:
* docs/webkitgtk-sections.txt:
* webkit/webkitwebplugin.cpp:
* webkit/webkitwebplugindatabase.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74367 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 81a477d..1393c2a 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-20 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Reviewed by Xan Lopez.
+
+ Add WebPlugin, WebPluginDatabase, and ViewportAttributes to the
+ documentation control files, in preparation for 1.3.8. Also take
+ the opportunity to add descriptions to WebPlugin and
+ WebPluginDatabase.
+
+ * docs/GNUmakefile.am:
+ * docs/webkitgtk-docs.sgml:
+ * docs/webkitgtk-sections.txt:
+ * webkit/webkitwebplugin.cpp:
+ * webkit/webkitwebplugindatabase.cpp:
+
2010-12-20 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
diff --git a/WebKit/gtk/docs/GNUmakefile.am b/WebKit/gtk/docs/GNUmakefile.am
index 105e277..d38a7aa 100644
--- a/WebKit/gtk/docs/GNUmakefile.am
+++ b/WebKit/gtk/docs/GNUmakefile.am
@@ -78,6 +78,7 @@ INCLUDES= \
-I$(top_srcdir)/JavaScriptCore/parser \
-I$(top_srcdir)/JavaScriptCore/wtf \
-I$(top_builddir)/DerivedSources \
+ -I$(top_srcdir)/WebCore/platform/network/soup/cache \
$(GLOBALDEPS_CFLAGS) \
$(CAIRO_CFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/WebKit/gtk/docs/webkitgtk-docs.sgml b/WebKit/gtk/docs/webkitgtk-docs.sgml
index 0852c7d..9a833ea 100644
--- a/WebKit/gtk/docs/webkitgtk-docs.sgml
+++ b/WebKit/gtk/docs/webkitgtk-docs.sgml
@@ -31,7 +31,10 @@
<xi:include href="xml/webkitwebdatasource.xml"/>
<xi:include href="xml/webkitwebresource.xml"/>
<xi:include href="xml/webkitdownload.xml"/>
+ <xi:include href="xml/webkitviewportattributes.xml"/>
<xi:include href="xml/webkithittestresult.xml"/>
+ <xi:include href="xml/webkitwebplugin.xml"/>
+ <xi:include href="xml/webkitwebplugindatabase.xml"/>
<xi:include href="xml/webkitsoupauthdialog.xml"/>
<xi:include href="xml/webkitsecurityorigin.xml"/>
<xi:include href="xml/webkitwebwindowfeatures.xml"/>
@@ -123,4 +126,7 @@
<index id="index-1.3.4" role="1.3.4">
<title>Index of new symbols in 1.3.4</title>
</index>
+ <index id="index-1.3.8" role="1.3.8">
+ <title>Index of new symbols in 1.3.8</title>
+ </index>
</book>
diff --git a/WebKit/gtk/docs/webkitgtk-sections.txt b/WebKit/gtk/docs/webkitgtk-sections.txt
index 0b185a0..2759e2b 100644
--- a/WebKit/gtk/docs/webkitgtk-sections.txt
+++ b/WebKit/gtk/docs/webkitgtk-sections.txt
@@ -456,6 +456,7 @@ webkit_web_view_get_transparent
webkit_web_view_get_uri
webkit_web_view_get_view_mode
webkit_web_view_get_view_source_mode
+webkit_web_view_get_viewport_attributes
webkit_web_view_get_zoom_level
webkit_web_view_go_back
webkit_web_view_go_back_or_forward
@@ -536,6 +537,7 @@ webkit_init
webkit_get_default_session
webkit_get_default_web_database_quota
webkit_get_web_database_directory_path
+webkit_get_web_plugin_database
webkit_remove_all_web_databases
webkit_set_default_web_database_quota
webkit_set_web_database_directory_path
@@ -573,6 +575,69 @@ WebKitWebResourceClass
</SECTION>
<SECTION>
+<FILE>webkitviewportattributes</FILE>
+<TITLE>WebKitViewportAttributes</TITLE>
+webkit_viewport_attributes_recompute
+<SUBSECTION Standard>
+WEBKIT_IS_VIEWPORT_ATTRIBUTES
+WEBKIT_IS_VIEWPORT_ATTRIBUTES_CLASS
+WEBKIT_TYPE_VIEWPORT_ATTRIBUTES
+WEBKIT_VIEWPORT_ATTRIBUTES
+WEBKIT_VIEWPORT_ATTRIBUTES_CLASS
+WEBKIT_VIEWPORT_ATTRIBUTES_GET_CLASS
+<SUBSECTION Private>
+webkit_viewport_attributes_get_type
+WebKitViewportAttributes
+WebKitViewportAttributesClass
+WebKitViewportAttributesPrivate
+</SECTION>
+
+<SECTION>
+<FILE>webkitwebplugin</FILE>
+<TITLE>WebKitWebPlugin</TITLE>
+WebKitWebPluginMIMEType
+webkit_web_plugin_get_description
+webkit_web_plugin_get_enabled
+webkit_web_plugin_get_mimetypes
+webkit_web_plugin_get_name
+webkit_web_plugin_set_enabled
+<SUBSECTION Standard>
+WEBKIT_IS_WEB_PLUGIN
+WEBKIT_IS_WEB_PLUGIN_CLASS
+WEBKIT_TYPE_WEB_PLUGIN
+WEBKIT_WEB_PLUGIN
+WEBKIT_WEB_PLUGIN_CLASS
+WEBKIT_WEB_PLUGIN_GET_CLASS
+<SUBSECTION Private>
+webkit_web_plugin_get_type
+WebKitWebPlugin
+WebKitWebPluginClass
+WebKitWebPluginPrivate
+</SECTION>
+
+<SECTION>
+<FILE>webkitwebplugindatabase</FILE>
+<TITLE>WebKitWebPluginDatabase</TITLE>
+webkit_web_plugin_database_get_plugin_for_mimetype
+webkit_web_plugin_database_get_plugins
+webkit_web_plugin_database_new
+webkit_web_plugin_database_plugins_list_free
+webkit_web_plugin_database_refresh
+<SUBSECTION Standard>
+WEBKIT_IS_WEB_PLUGIN_DATABASE
+WEBKIT_IS_WEB_PLUGIN_DATABASE_CLASS
+WEBKIT_TYPE_WEB_PLUGIN_DATABASE
+WEBKIT_WEB_PLUGIN_DATABASE
+WEBKIT_WEB_PLUGIN_DATABASE_CLASS
+WEBKIT_WEB_PLUGIN_DATABASE_GET_CLASS
+<SUBSECTION Private>
+WebKitWebPluginDatabase
+WebKitWebPluginDatabaseClass
+WebKitWebPluginDatabasePrivate
+webkit_web_plugin_database_get_type
+</SECTION>
+
+<SECTION>
<FILE>soup-cache</FILE>
<TITLE>WebKitSoupCache</TITLE>
webkit_soup_cache_new
diff --git a/WebKit/gtk/webkit/webkitwebplugin.cpp b/WebKit/gtk/webkit/webkitwebplugin.cpp
index 699cd5f..0b06416 100644
--- a/WebKit/gtk/webkit/webkitwebplugin.cpp
+++ b/WebKit/gtk/webkit/webkitwebplugin.cpp
@@ -24,6 +24,18 @@
#include "webkitwebpluginprivate.h"
#include <glib/gi18n-lib.h>
+/**
+ * SECTION:webkitwebplugin
+ * @short_description: Represents a plugin, enabling fine-grained control
+ * @see_also: #WebKitWebPluginDatabase
+ *
+ * This object represents a single plugin, found by WebKitGTK+ while
+ * scanning the various usual directories. This object can be used to
+ * get more information about a plugin, and enable/disable it,
+ * allowing fine-grained control of plugins. The list of available
+ * plugins can be obtained from the #WebKitWebPluginDatabase object.
+ */
+
using namespace WebCore;
enum {
diff --git a/WebKit/gtk/webkit/webkitwebplugindatabase.cpp b/WebKit/gtk/webkit/webkitwebplugindatabase.cpp
index afc3ceb..08328a0 100644
--- a/WebKit/gtk/webkit/webkitwebplugindatabase.cpp
+++ b/WebKit/gtk/webkit/webkitwebplugindatabase.cpp
@@ -24,6 +24,17 @@
#include "webkitwebplugindatabaseprivate.h"
#include "webkitwebpluginprivate.h"
+/**
+ * SECTION:webkitwebplugindatabase
+ * @short_description: Provides information about the plugins the engine knows about
+ * @see_also: #WebKitWebPlugin
+ *
+ * This object allows you to query information about the plugins found
+ * by the engine while scanning the usual directories. You can then
+ * use the #WebKitWebPlugin objects to get more information or
+ * enable/disable individual plugins.
+ */
+
using namespace WebKit;
using namespace WebCore;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list