Changeset 86049 in webkit

Timestamp:

May 9, 2011 4:22:56 AM (13 years ago)

Author:

mahesh.kulkarni@nokia.com

Message:

2011-05-09 Mahesh Kulkarni <​mahesh.kulkarni@nokia.com>

Reviewed by Andreas Kling.

[Qt] fix fast/dom/Geolocation/window-close-crash.html
​https://bugs.webkit.org/show_bug.cgi?id=60458

Update all pages with Mock position/error/permission.

• DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::setGeolocationPermission): (LayoutTestController::setMockGeolocationError): (LayoutTestController::setMockGeolocationPosition):

2011-05-09 Mahesh Kulkarni <​mahesh.kulkarni@nokia.com>

Reviewed by Andreas Kling.

[Qt] fix fast/dom/Geolocation/window-close-crash.html
​https://bugs.webkit.org/show_bug.cgi?id=60458

Unskipping fast/dom/Geolocation/window-close-crash.html.

• platform/qt/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-09  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] fix fast/dom/Geolocation/window-close-crash.html
+        https://bugs.webkit.org/show_bug.cgi?id=60458
+
+        Unskipping fast/dom/Geolocation/window-close-crash.html.
+
+        * platform/qt/Skipped:
+
 2011-05-09  Srinivasulu Chereddy  <srinivasulu.chereddy@nokia.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -2360 +2360 @@
 http/tests/xmlviewer/dumpAsText/xul.xml
 
-# [Qt] geolocation case failing as needs implementation in DumpRenderTree : TODO bug
-fast/dom/Geolocation/window-close-crash.html
-
 # [Qt] Two http auth tests fail with Qt 4.7.2
 # https://bugs.webkit.org/show_bug.cgi?id=55767

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-09  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] fix fast/dom/Geolocation/window-close-crash.html
+        https://bugs.webkit.org/show_bug.cgi?id=60458
+
+        Update all pages with Mock position/error/permission.
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::setGeolocationPermission):
+        (LayoutTestController::setMockGeolocationError):
+        (LayoutTestController::setMockGeolocationPosition):
+
 2011-05-09  Shishir Agrawal  <shishir@chromium.org>
 

trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -779 +779 @@
 }
 
+QVariant LayoutTestController::shadowRoot(const QWebElement& element)
+{
+    return DumpRenderTreeSupportQt::shadowRoot(element);
+}
+
+QVariant LayoutTestController::ensureShadowRoot(const QWebElement& element)
+{
+    return DumpRenderTreeSupportQt::ensureShadowRoot(element);
+}
+
+void LayoutTestController::removeShadowRoot(const QWebElement& element)
+{
+    DumpRenderTreeSupportQt::removeShadowRoot(element);
+}
+
+QString LayoutTestController::shadowPseudoId(const QWebElement& element)
+{
+    return DumpRenderTreeSupportQt::shadowPseudoId(element);
+}
+
 void LayoutTestController::setGeolocationPermission(bool allow)
 {
     setGeolocationPermissionCommon(allow);
-    DumpRenderTreeSupportQt::setMockGeolocationPermission(m_drt->webPage(), allow);
-}
-
-QVariant LayoutTestController::shadowRoot(const QWebElement& element)
-{
-    return DumpRenderTreeSupportQt::shadowRoot(element);
-}
-
-QVariant LayoutTestController::ensureShadowRoot(const QWebElement& element)
-{
-    return DumpRenderTreeSupportQt::ensureShadowRoot(element);
-}
-
-void LayoutTestController::removeShadowRoot(const QWebElement& element)
-{
-    DumpRenderTreeSupportQt::removeShadowRoot(element);
-}
-
-QString LayoutTestController::shadowPseudoId(const QWebElement& element)
-{
-    return DumpRenderTreeSupportQt::shadowPseudoId(element);
+    QList<WebCore::WebPage*> pages = m_drt->getAllPages();
+    foreach (WebCore::WebPage* page, pages)
+        DumpRenderTreeSupportQt::setMockGeolocationPermission(page, allow);
 }
 
@@ -823 +825 @@
 void LayoutTestController::setMockGeolocationError(int code, const QString& message)
 {
-    DumpRenderTreeSupportQt::setMockGeolocationError(m_drt->webPage(), code, message);
+    QList<WebCore::WebPage*> pages = m_drt->getAllPages();
+    foreach (WebCore::WebPage* page, pages)
+        DumpRenderTreeSupportQt::setMockGeolocationError(page, code, message);
 }
 
 void LayoutTestController::setMockGeolocationPosition(double latitude, double longitude, double accuracy)
 {
-    DumpRenderTreeSupportQt::setMockGeolocationPosition(m_drt->webPage(), latitude, longitude, accuracy);
+    QList<WebCore::WebPage*> pages = m_drt->getAllPages();
+    foreach (WebCore::WebPage* page, pages)
+        DumpRenderTreeSupportQt::setMockGeolocationPosition(page, latitude, longitude, accuracy);
 }