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

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit b1b2a6f7e5e6d5ec9836f18647470111bd824041
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 06:14:21 2010 +0000

    2010-12-15  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Fix tst_QWebPage::geolocationRequestJS()
            https://bugs.webkit.org/show_bug.cgi?id=46814
    
            Change the test case according to the changes introduced by
            r72603 and enable the test case.
    
            * tests/qwebpage/tst_qwebpage.cpp:
            (tst_QWebPage::geolocationRequestJS):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74173 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4195434..aac0b64 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-15  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Fix tst_QWebPage::geolocationRequestJS()
+        https://bugs.webkit.org/show_bug.cgi?id=46814
+
+        Change the test case according to the changes introduced by
+        r72603 and enable the test case.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::geolocationRequestJS):
+
 2010-12-14  Viatcheslav Ostapenko  <ostapenko.viatcheslav at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 27d28f0..301a050 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -250,14 +250,8 @@ 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::Feature)), 
+    connect(newPage, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)),
             newPage, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
 
     newPage->setGeolocationPermission(false);

-- 
WebKit Debian packaging