diff options
Diffstat (limited to 'WebKit/qt/tests/qwebpage/tst_qwebpage.cpp')
| -rw-r--r-- | WebKit/qt/tests/qwebpage/tst_qwebpage.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp index 67e3ecd..9a6c35f 100644 --- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp +++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp @@ -217,9 +217,12 @@ public slots: bool shouldInterruptJavaScript() { return true; } - bool allowGeolocationRequest(QWebFrame *frame) + void requestPermission(QWebFrame* frame, QWebPage::PermissionDomain domain) { - return m_allowGeolocation; + if (m_allowGeolocation) + setUserPermission(frame, domain, PermissionGranted); + else + setUserPermission(frame, domain, PermissionDenied); } public: @@ -234,9 +237,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()); @@ -247,6 +247,9 @@ void tst_QWebPage::infiniteLoopJS() void tst_QWebPage::geolocationRequestJS() { JSTestPage* newPage = new JSTestPage(m_view); + connect(newPage, SIGNAL(requestPermissionFromUser(QWebFrame*, QWebPage::PermissionDomain)), + newPage, SLOT(requestPermission(QWebFrame*, QWebPage::PermissionDomain))); + newPage->setGeolocationPermission(false); m_view->setPage(newPage); m_view->setHtml(QString("<html><body>test</body></html>"), QUrl()); @@ -2028,7 +2031,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)))); |