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

Wed Dec 22 12:53:26 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit b4fc9e0c7fb45b71d8c74f4b21fa072eb99b6b2b
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 1 01:55:40 2010 +0000

    2010-08-31  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] tst_QWebPage::originatingObjectInNetworkRequests() fails on trunk
            https://bugs.webkit.org/show_bug.cgi?id=45001
    
            Fix the test, we should not use data encoded URL since we are not
            setting an URL but setting the substituteData directly.
    
            * tests/qwebpage/tst_qwebpage.cpp:
            (tst_QWebPage::originatingObjectInNetworkRequests):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index c421f7b..ea56348 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [Qt] tst_QWebPage::originatingObjectInNetworkRequests() fails on trunk
+        https://bugs.webkit.org/show_bug.cgi?id=45001
+
+        Fix the test, we should not use data encoded URL since we are not
+        setting an URL but setting the substituteData directly.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::originatingObjectInNetworkRequests):
+
+2010-08-31  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         JSC TimeoutChecker::didTimeOut overflows on ARM
         https://bugs.webkit.org/show_bug.cgi?id=38538
 
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 9b4b6d8..cc436ec 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -2025,7 +2025,7 @@ void tst_QWebPage::originatingObjectInNetworkRequests()
     m_page->setNetworkAccessManager(networkManager);
     networkManager->requests.clear();
 
-    m_view->setHtml(QString("data:text/html,<frameset cols=\"25%,75%\"><frame src=\"data:text/html,"
+    m_view->setHtml(QString("<frameset cols=\"25%,75%\"><frame src=\"data:text/html,"
                             "<head><meta http-equiv='refresh' content='1'></head>foo \">"
                             "<frame src=\"data:text/html,bar\"></frameset>"), QUrl());
     QVERIFY(::waitForSignal(m_view, SIGNAL(loadFinished(bool))));

-- 
WebKit Debian packaging

