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

[robert at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit de4e1c4be183b3c11146fe7526375e8a1c6caa06
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 09:22:38 2010 +0000

    2010-11-04  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] Clarify expected return values of innerXml(), outerXml()
    
            If you put HTML in (e.g. using setHTML()) you will get HTML out,
            even if you marked it up as XML.
    
            https://bugs.webkit.org/show_bug.cgi?id=44876
    
            * Api/qwebelement.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebelement.cpp b/WebKit/qt/Api/qwebelement.cpp
index 68fa17a..8121111 100644
--- a/WebKit/qt/Api/qwebelement.cpp
+++ b/WebKit/qt/Api/qwebelement.cpp
@@ -311,6 +311,11 @@ void QWebElement::setOuterXml(const QString &markup)
 
     \note This is currently implemented for (X)HTML elements only.
 
+    \note The format of the markup returned will obey the namespace of the
+    document containing the element. This means the return value will obey XML
+    formatting rules, such as self-closing tags, only if the document is
+    'text/xhtml+xml'.
+
     \sa setOuterXml(), setInnerXml(), toInnerXml()
 */
 QString QWebElement::toOuterXml() const
@@ -345,6 +350,11 @@ void QWebElement::setInnerXml(const QString &markup)
 
     \note This is currently implemented for (X)HTML elements only.
 
+    \note The format of the markup returned will obey the namespace of the
+    document containing the element. This means the return value will obey XML
+    formatting rules, such as self-closing tags, only if the document is
+    'text/xhtml+xml'.
+
     \sa setInnerXml(), setOuterXml(), toOuterXml()
 */
 QString QWebElement::toInnerXml() const
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 94bebfe..d27dfa7 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-04  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Clarify expected return values of innerXml(), outerXml()
+
+        If you put HTML in (e.g. using setHTML()) you will get HTML out,
+        even if you marked it up as XML.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44876
+
+        * Api/qwebelement.cpp:
+
 2010-11-03  Andre Pedralho  <andre.pedralho at gmail.com>
 
         Reviewed by Kenneth Rohde Christiansen.

-- 
WebKit Debian packaging