[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[benjamin.poulain at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit d284c912e201435a80a9fe063a005861d4b49da7
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 10:08:06 2011 +0000

    2011-01-11  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Fix tst_QWebPage::geolocationRequestJS()
            https://bugs.webkit.org/show_bug.cgi?id=46814
    
            Skip the test when WebKit is compiled without geolocation.
    
            * tests/qwebpage/tst_qwebpage.cpp:
            (tst_QWebPage::geolocationRequestJS):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75479 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 2818bff..d55d7ac 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-11  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix tst_QWebPage::geolocationRequestJS()
+        https://bugs.webkit.org/show_bug.cgi?id=46814
+
+        Skip the test when WebKit is compiled without geolocation.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::geolocationRequestJS):
+
 2011-01-10  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index e0662b3..cdc6e55 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -259,6 +259,12 @@ void tst_QWebPage::infiniteLoopJS()
 void tst_QWebPage::geolocationRequestJS()
 {
     JSTestPage* newPage = new JSTestPage(m_view);
+
+    if (newPage->mainFrame()->evaluateJavaScript(QLatin1String("!navigator.geolocation")).toBool()) {
+        delete newPage;
+        QSKIP("Geolocation is not supported.", SkipSingle);
+    }
+
     connect(newPage, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)),
             newPage, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
 

-- 
WebKit Debian packaging