Changeset 53770 in webkit

Timestamp:

Jan 23, 2010 8:54:35 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-23 Robert Hogan <​robert@roberthogan.net>

Reviewed by Kenneth Rohde Christiansen.

Qt DRT: respect window.close() and window.closed()

Qt DRT needs to maintain a correct count of open windows
for windowCount(). It also needs to delete windows that
have been closed by window.close().

This fixes the following tests:

plugins/destroy-during-npp-new.html
fast/dom/Document/early-document-access.html
fast/dom/Window/window-early-properties.html
fast/events/open-window-from-another-frame.html
fast/events/popup-blocking-click-in-iframe.html

​https://bugs.webkit.org/show_bug.cgi?id=32953

• platform/qt/Skipped:

2010-01-23 Robert Hogan <​robert@roberthogan.net>

Reviewed by Kenneth Rohde Christiansen.

Qt DRT: respect window.close() and window.closed()

Qt DRT needs to maintain a correct count of open windows
for windowCount(). It also needs to delete windows that
have been closed by window.close().

This fixes the following tests:

plugins/destroy-during-npp-new.html
fast/dom/Document/early-document-access.html
fast/dom/Window/window-early-properties.html
fast/events/open-window-from-another-frame.html
fast/events/popup-blocking-click-in-iframe.html

​https://bugs.webkit.org/show_bug.cgi?id=32953

• DumpRenderTree/qt/DumpRenderTreeQt.cpp: (WebCore::DumpRenderTree::DumpRenderTree): (WebCore::DumpRenderTree::createWindow): (WebCore::DumpRenderTree::windowCloseRequested):
• DumpRenderTree/qt/DumpRenderTreeQt.h:
• DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::maybeDump):

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-23  Robert Hogan  <robert@roberthogan.net>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Qt DRT: respect window.close() and window.closed()
+        
+        Qt DRT needs to maintain a correct count of open windows
+        for windowCount(). It also needs to delete windows that
+        have been closed by window.close().
+        
+        This fixes the following tests:
+        
+        plugins/destroy-during-npp-new.html
+        fast/dom/Document/early-document-access.html
+        fast/dom/Window/window-early-properties.html
+        fast/events/open-window-from-another-frame.html
+        fast/events/popup-blocking-click-in-iframe.html
+        
+        https://bugs.webkit.org/show_bug.cgi?id=32953
+
+        * platform/qt/Skipped:
+
 2010-01-23  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -521 +521 @@
 fast/text/international/002.html
 
-plugins/destroy-during-npp-new.html
 plugins/embed-attributes-setting.html
 plugins/get-url-that-the-resource-load-delegate-will-disallow.html
@@ -5026 +5025 @@
 fast/dom/javascript-url-crash-function.html
 fast/dom/location-new-window-no-crash.html
-fast/dom/Document/early-document-access.html
-fast/dom/Window/window-early-properties.html
-fast/events/open-window-from-another-frame.html
-fast/events/popup-blocking-click-in-iframe.html
 inspector/console-clear.html
 http/tests/misc/set-window-opener-to-null.html

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-23  Robert Hogan  <robert@roberthogan.net>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Qt DRT: respect window.close() and window.closed()
+        
+        Qt DRT needs to maintain a correct count of open windows
+        for windowCount(). It also needs to delete windows that
+        have been closed by window.close().
+        
+        This fixes the following tests:
+        
+        plugins/destroy-during-npp-new.html
+        fast/dom/Document/early-document-access.html
+        fast/dom/Window/window-early-properties.html
+        fast/events/open-window-from-another-frame.html
+        fast/events/popup-blocking-click-in-iframe.html
+        
+        https://bugs.webkit.org/show_bug.cgi?id=32953
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::DumpRenderTree):
+        (WebCore::DumpRenderTree::createWindow):
+        (WebCore::DumpRenderTree::windowCloseRequested):
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::maybeDump):
+
 2010-01-23  Dan Bernstein  <mitz@apple.com>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -345 +345 @@
     connect(m_page, SIGNAL(loadStarted()),
             m_controller, SLOT(resetLoadFinished()));
+    connect(m_page, SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested()));
 
     connect(m_page->mainFrame(), SIGNAL(titleChanged(const QString&)),
@@ -783 +784 @@
     connectFrame(page->mainFrame());
     connect(page, SIGNAL(loadFinished(bool)), m_controller, SLOT(maybeDump(bool)));
+    connect(page, SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested()));
     return page;
+}
+
+void DumpRenderTree::windowCloseRequested()
+{
+    QWebPage* page = qobject_cast<QWebPage*>(sender());
+    QObject* container = page->parent();
+    windows.removeAll(container);
+    container->deleteLater();
 }
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h

@@ -110 +110 @@
     void dumpDatabaseQuota(QWebFrame* frame, const QString& dbName);
     void statusBarMessage(const QString& message);
+    void windowCloseRequested();
 
 Q_SIGNALS:

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -87 +87 @@
 }
 
-// Called on loadFinished on mainFrame.
+// Called on loadFinished on WebPage
 void LayoutTestController::maybeDump(bool success)
 {
-    Q_ASSERT(sender() == m_topLoadingFrame->page());
+
+    // This can happen on any of the http/tests/security/window-events-*.html tests, where the test opens
+    // a new window, calls the unload and load event handlers on the window's page, and then immediately
+    // issues a notifyDone. Needs investigation.
+    if (!m_topLoadingFrame)
+        return;
+
+    // It is possible that we get called by windows created from the main page that have finished
+    // loading, so we don't ASSERT here. At the moment we do not gather results from such windows,
+    // but may need to in future.
+    if (sender() != m_topLoadingFrame->page())
+        return;
 
     m_loadFinished = true;