Doc: Updated link and a bit more documentation for

QWebSecurityOrigin and QWebDatabase.

2 files changed, 26 insertions, 10 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp
index 7e85eaa..0d11381 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp
@@ -34,9 +34,20 @@ using namespace WebCore;
     \brief The QWebDatabase class provides access to HTML 5 databases created with JavaScript.
 
     The upcoming HTML 5 standard includes support for SQL databases that web sites can create and
-    access on a local computer through JavaScript. QWebDatabase is the C++ interface to these databases.
+    access on a local computer through JavaScript. QWebDatabase is the C++ interface to these
+    databases.
 
-    For more information refer to the \l{http://www.w3.org/html/wg/html5/#sql}{HTML 5 Draft Standard}.
+    To get access to all databases defined by a security origin, use QWebSecurityOrigin::databases().
+    Each database has an internal name(), as well as a user-friendly name, provided by displayName().
+
+    WebKit uses SQLite to create and access the local SQL databases. The location of the database
+    file in the local file system is returned by fileName(). You can access the database directly
+    through the QtSql database module.
+
+    For each database the web site can define an expectedSize(). The current size of the database
+    in bytes is returned by size().
+
+    For more information refer to the \l{http://dev.w3.org/html5/webdatabase/}{HTML 5 Draft Standard}.
 
     \sa QWebSecurityOrigin
 */
@@ -127,7 +138,7 @@ QWebDatabase::QWebDatabase(QWebDatabasePrivate* priv)
     \endcode
 
     \note Concurrent access to a database from multiple threads or processes
-    is not very efficient because Sqlite is used as WebKit's database backend.
+    is not very efficient because SQLite is used as WebKit's database backend.
 */
 QString QWebDatabase::fileName() const
 {
@@ -149,8 +160,8 @@ QWebSecurityOrigin QWebDatabase::origin() const
 }
 
 /*!
-    Removes the database \a db from its security origin. All data stored in this database
-    will be destroyed.
+    Removes the database \a db from its security origin. All data stored in the
+    database \a db will be destroyed.
 */
 void QWebDatabase::removeDatabase(const QWebDatabase &db)
 {
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp
index da9278c..d2eaf10 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp
@@ -36,10 +36,9 @@ using namespace WebCore;
     \brief The QWebSecurityOrigin class defines a security boundary for web sites.
 
     QWebSecurityOrigin provides access to the security domains defined by web sites.
-    An origin consists of a host name, a scheme, and a port number. Web sites with the same
-    security origin can access each other's resources for client-side scripting or databases.
-
-    ### diagram
+    An origin consists of a host name, a scheme, and a port number. Web sites
+    with the same security origin can access each other's resources for client-side
+    scripting or databases.
 
     For example the site \c{http://www.example.com/my/page.html} is allowed to share the same
     database as \c{http://www.example.com/my/overview.html}, or access each other's
@@ -47,7 +46,13 @@ using namespace WebCore;
     \c{http://www.malicious.com/evil.html} from accessing \c{http://www.example.com/}'s resources,
     because they are of a different security origin.
 
-    QWebSecurity also provides access to all databases defined within a security origin.
+    Call QWebFrame::securityOrigin() to get the QWebSecurityOrigin for a frame in a
+    web page, and use host(), scheme() and port() to identify the security origin.
+
+    Use databases() to access the databases defined within a security origin. The
+    disk usage of the origin's databases can be limited with setDatabaseQuota().
+    databaseQuota() and databaseUsage() report the current limit as well as the
+    current usage.
 
     For more information refer to the
     \l{http://en.wikipedia.org/wiki/Same_origin_policy}{"Same origin policy" Wikipedia Article}.