Changeset 83137 in webkit

Timestamp:

Apr 6, 2011 8:49:53 PM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

2011-04-06 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] LayoutTestController needs to implement numberOfPendingGeolocationPermissionRequests
​https://bugs.webkit.org/show_bug.cgi?id=56086

• platform/qt/Skipped: Remove the skipped test which required numberOfPendingGeolocationPermissionRequests.

2011-04-06 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] LayoutTestController needs to implement numberOfPendingGeolocationPermissionRequests
​https://bugs.webkit.org/show_bug.cgi?id=56086

Add the accessor numberOfPendingGeolocationPermissionRequests to call GeolocationClientMock::numberOfPendingPermissionRequests()
from the LayoutTestController.

• WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::numberOfPendingGeolocationPermissionRequests):
• WebCoreSupport/DumpRenderTreeSupportQt.h:

2011-04-06 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] LayoutTestController needs to implement numberOfPendingGeolocationPermissionRequests
​https://bugs.webkit.org/show_bug.cgi?id=56086

Add the missing method.

• DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::DumpRenderTree::getAllPages): Add a method to return all the pages allocated for the current test.
• DumpRenderTree/qt/DumpRenderTreeQt.h:
• DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::numberOfPendingGeolocationPermissionRequests):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (1 diff)
• Tools/DumpRenderTree/qt/DumpRenderTreeQt.h (modified) (1 diff)
• Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-06  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] LayoutTestController needs to implement numberOfPendingGeolocationPermissionRequests
+        https://bugs.webkit.org/show_bug.cgi?id=56086
+
+        * platform/qt/Skipped: Remove the skipped test which required numberOfPendingGeolocationPermissionRequests.
+
 2011-04-06  Kent Tamura  <tkent@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -3198 +3198 @@
 fast/dom/Geolocation/window-close-crash.html
 
-# [Qt] LayoutTestController needs to implement numberOfPendingGeolocationPermissionRequests
-# https://bugs.webkit.org/show_bug.cgi?id=56086
-fast/dom/Geolocation/page-reload-cancel-permission-requests.html
-
 # [Qt] Two http auth tests fail with Qt 4.7.2
 # https://bugs.webkit.org/show_bug.cgi?id=55767

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-04-06  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] LayoutTestController needs to implement numberOfPendingGeolocationPermissionRequests
+        https://bugs.webkit.org/show_bug.cgi?id=56086
+
+        Add the accessor numberOfPendingGeolocationPermissionRequests to call GeolocationClientMock::numberOfPendingPermissionRequests()
+        from the LayoutTestController.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::numberOfPendingGeolocationPermissionRequests):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
 2011-04-06  Anders Bakken  <agbakken@gmail.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

@@ -823 +823 @@
 }
 
+int DumpRenderTreeSupportQt::numberOfPendingGeolocationPermissionRequests(QWebPage* page)
+{
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
+    Page* corePage = QWebPagePrivate::core(page);
+    GeolocationClientMock* mockClient = toGeolocationClientMock(corePage->geolocationController()->client());
+    return mockClient->numberOfPendingPermissionRequests();
+#else
+    return -1;
+#endif
+}
+
 bool DumpRenderTreeSupportQt::isTargetItem(const QWebHistoryItem& historyItem)
 {

trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

@@ -148 +148 @@
     static void setMockGeolocationPosition(QWebPage*, double latitude, double longitude, double accuracy);
     static void setMockGeolocationError(QWebPage*, int errorCode, const QString& message);
+    static int numberOfPendingGeolocationPermissionRequests(QWebPage*);
 
     static int workerThreadCount();

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-06  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] LayoutTestController needs to implement numberOfPendingGeolocationPermissionRequests
+        https://bugs.webkit.org/show_bug.cgi?id=56086
+
+        Add the missing method.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::getAllPages): Add a method to return all the pages allocated for the current test.
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::numberOfPendingGeolocationPermissionRequests):
+
 2011-04-06  Dai Mikurube  <dmikurube@chromium.org>
 

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -1137 +1137 @@
 }
 
+QList<WebPage*> DumpRenderTree::getAllPages() const
+{
+    QList<WebPage*> pages;
+    pages.append(m_page);
+    foreach (QObject* widget, windows) {
+        if (WebPage* page = widget->findChild<WebPage*>())
+            pages.append(page);
+    }
+    return pages;
+}
+
 #if defined(Q_WS_X11)
 void DumpRenderTree::initializeFonts()

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h

@@ -101 +101 @@
 
     WebPage *webPage() const { return m_page; }
+    QList<WebPage*> getAllPages() const;
 
 #if defined(Q_WS_X11)

trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -783 +783 @@
 int LayoutTestController::numberOfPendingGeolocationPermissionRequests()
 {
-    // FIXME: Implement for Geolocation layout tests.
-    return -1;
+    int pendingPermissionCount = 0;
+    QList<WebCore::WebPage*> pages = m_drt->getAllPages();
+    foreach (WebCore::WebPage* page, pages)
+        pendingPermissionCount += DumpRenderTreeSupportQt::numberOfPendingGeolocationPermissionRequests(page);
+
+    return pendingPermissionCount;
 }