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

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit e004782ea04bfae3df15fcac004c97a78c5d864e
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 07:10:01 2010 +0000

    2010-09-30  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Fix tst_QWebPage::geolocationRequestJS()
            https://bugs.webkit.org/show_bug.cgi?id=46814
    
            Disable the test. This test cannot pass with a
            standard build of WebKit, it is disabled until the API is finilized.
    
            * tests/qwebpage/tst_qwebpage.cpp:
            (tst_QWebPage::geolocationRequestJS):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68760 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7e70a9e..3e0caa2 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-30  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Fix tst_QWebPage::geolocationRequestJS()
+        https://bugs.webkit.org/show_bug.cgi?id=46814
+
+        Disable the test. This test cannot pass with a
+        standard build of WebKit, it is disabled until the API is finilized.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::geolocationRequestJS):
+
 2010-09-29  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 36fa050..3ddbf4e 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -247,6 +247,12 @@ void tst_QWebPage::infiniteLoopJS()
 
 void tst_QWebPage::geolocationRequestJS()
 {
+    /*
+      This test is disabled because it can only succeed if ENABLE(GEOLOCATION) is true.
+      The code needs to be updated when the API of requestPermissionFromUser is updated.
+    */
+    QSKIP("Test disabled as long as geolocation is disabled from the build.", SkipSingle);
+
     JSTestPage* newPage = new JSTestPage(m_view);
     connect(newPage, SIGNAL(requestPermissionFromUser(QWebFrame*, QWebPage::PermissionDomain)), 
             newPage, SLOT(requestPermission(QWebFrame*, QWebPage::PermissionDomain)));

-- 
WebKit Debian packaging