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

Wed Dec 22 12:50:12 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit f1e2aa8f93f63b5332ccfa7646a510f974e11fe8
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 12:57:44 2010 +0000

    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
    
            Re-enabled the test that was skipped for Maemo 5.
    
            * tests/qwebpage/tst_qwebpage.cpp:
            (tst_QWebPage::infiniteLoopJS):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66478 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index a724a35..c421f7b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+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
+
+        Re-enabled the test that was skipped for Maemo 5.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::infiniteLoopJS):
+
 2010-08-30  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r66198.
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 67e3ecd..9b4b6d8 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -234,9 +234,6 @@ private:
 
 void tst_QWebPage::infiniteLoopJS()
 {
-#ifdef Q_WS_MAEMO_5
-    QSKIP("Test never terminates on Maemo 5 : https://bugs.webkit.org/show_bug.cgi?id=38538", SkipAll);
-#endif
     JSTestPage* newPage = new JSTestPage(m_view);
     m_view->setPage(newPage);
     m_view->setHtml(QString("<html><body>test</body></html>"), QUrl());

-- 
WebKit Debian packaging

