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

Wed Dec 22 16:19:25 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 18742a0034d7fca1133c54a981e7ac56343dc9e3
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 22 09:59:44 2010 +0000

    2010-11-22  Jan Erik Hanssen  <jhanssen at sencha.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] QWebElement::appendInside() doesn't work on head elements
            https://bugs.webkit.org/show_bug.cgi?id=49166
    
            Make QWebElement::appendInside() call
            Element::deprecatedCreateContextualFragment(), bypassing the check for
            the HEAD tag in the HTMLElement implementation of this function.
    
            * Api/qwebelement.cpp:
            (QWebElement::appendInside):
            * tests/qwebelement/tst_qwebelement.cpp:
            (tst_QWebElement::addElementToHead):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72510 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebelement.cpp b/WebKit/qt/Api/qwebelement.cpp
index 8f40c0f..60ae3a0 100644
--- a/WebKit/qt/Api/qwebelement.cpp
+++ b/WebKit/qt/Api/qwebelement.cpp
@@ -1020,7 +1020,7 @@ void QWebElement::appendInside(const QString &markup)
         return;
 
     HTMLElement* htmlElement = static_cast<HTMLElement*>(m_element);
-    RefPtr<DocumentFragment> fragment = htmlElement->deprecatedCreateContextualFragment(markup);
+    RefPtr<DocumentFragment> fragment = htmlElement->Element::deprecatedCreateContextualFragment(markup);
 
     ExceptionCode exception = 0;
     m_element->appendChild(fragment, exception);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 0326d76..0ddc0e1 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-22  Jan Erik Hanssen  <jhanssen at sencha.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QWebElement::appendInside() doesn't work on head elements
+        https://bugs.webkit.org/show_bug.cgi?id=49166
+
+        Make QWebElement::appendInside() call 
+        Element::deprecatedCreateContextualFragment(), bypassing the check for
+        the HEAD tag in the HTMLElement implementation of this function.
+
+        * Api/qwebelement.cpp:
+        (QWebElement::appendInside):
+        * tests/qwebelement/tst_qwebelement.cpp:
+        (tst_QWebElement::addElementToHead):
+
 2010-11-20  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp b/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
index 9bd255f..88816e8 100644
--- a/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
+++ b/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
@@ -71,6 +71,7 @@ private slots:
     void lastChildPreviousSibling();
     void hasSetFocus();
     void render();
+    void addElementToHead();
 
 private:
     QWebView* m_view;
@@ -1013,5 +1014,15 @@ void tst_QWebElement::render()
     QVERIFY(image3 == image4);
 }
 
+void tst_QWebElement::addElementToHead()
+{
+    m_mainFrame->setHtml("<html><head></head><body></body></html>");
+    QWebElement head = m_mainFrame->findFirstElement("head");
+    QVERIFY(!head.isNull());
+    QString append = "<script type=\"text/javascript\">var t = 0;</script>";
+    head.appendInside(append);
+    QCOMPARE(head.toInnerXml(), append);
+}
+
 QTEST_MAIN(tst_QWebElement)
 #include "tst_qwebelement.moc"

-- 
WebKit Debian packaging

