[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 48bb7d67cb9a9b394bbb38af4e0cddffa07cf16a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 16:29:42 2010 +0000

    2010-07-29  Alexis Menard  <alexis.menard at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            QWebFrame and QWebView documentation fix.
    
            The QWebFrame and the QWebView setHtml() methods are a bit confusing.
            There are a few registered bugs in Webkit's bugzilla that source is
            in a bad usage of the function.
            Additional information were added.
    
            https://bugs.webkit.org/show_bug.cgi?id=31115
    
            * Api/qgraphicswebview.cpp:
            * Api/qwebframe.cpp:
            * Api/qwebview.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64284 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 8a94c9b..53c1494 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -711,7 +711,12 @@ void QGraphicsWebView::load(const QNetworkRequest& request,
     through the charset attribute of the HTML script tag. Alternatively, the
     encoding can also be specified by the web server.
 
-    \sa load(), setContent(), QWebFrame::toHtml()
+    This is a convenience function equivalent to setContent(html, "text/html", baseUrl).
+
+    \warning This function works only for HTML, for other mime types (i.e. XHTML, SVG)
+    setContent() should be used instead.
+
+    \sa load(), setContent(), QWebFrame::toHtml(), QWebFrame::setContent()
 */
 void QGraphicsWebView::setHtml(const QString& html, const QUrl& baseUrl)
 {
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index f10d5b4..e90367e 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -793,9 +793,14 @@ void QWebFrame::load(const QNetworkRequest &req,
   script can be specified through the charset attribute of the HTML script tag. It is also possible
   for the encoding to be specified by web server.
 
+  This is a convenience function equivalent to setContent(html, "text/html", baseUrl).
+
   \note This method will not affect session or global history for the frame.
 
-  \sa toHtml(), setContent()
+  \warning This function works only for HTML, for other mime types (i.e. XHTML, SVG)
+  setContent() should be used instead.
+
+  \sa toHtml(), setContent(), load()
 */
 void QWebFrame::setHtml(const QString &html, const QUrl &baseUrl)
 {
diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index 3daa045..773c79a 100644
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -470,7 +470,12 @@ void QWebView::load(const QNetworkRequest &request,
     through the charset attribute of the HTML script tag. Alternatively, the
     encoding can also be specified by the web server.
 
-    \sa load(), setContent(), QWebFrame::toHtml()
+    This is a convenience function equivalent to setContent(html, "text/html", baseUrl).
+
+    \warning This function works only for HTML, for other mime types (i.e. XHTML, SVG)
+    setContent() should be used instead.
+
+    \sa load(), setContent(), QWebFrame::toHtml(), QWebFrame::setContent()
 */
 void QWebView::setHtml(const QString &html, const QUrl &baseUrl)
 {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 455fd89..858bf29 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-29  Alexis Menard  <alexis.menard at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        QWebFrame and QWebView documentation fix.
+
+        The QWebFrame and the QWebView setHtml() methods are a bit confusing.
+        There are a few registered bugs in Webkit's bugzilla that source is
+        in a bad usage of the function.
+        Additional information were added.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31115
+
+        * Api/qgraphicswebview.cpp:
+        * Api/qwebframe.cpp:
+        * Api/qwebview.cpp:
+
 2010-07-28  Kim Grönholm  <kim.1.gronholm at nokia.com>
 
         Reviewed by Antonio Gomes.

-- 
WebKit Debian packaging