Changeset 53615 in webkit
- Timestamp:
- Jan 21, 2010 1:12:25 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r53612 r53615 1 2010-01-21 Robert Hogan <robert@roberthogan.net> 2 3 Reviewed by Simon Hausmann. 4 5 Qt DRT: respect window.close() and window.closed() 6 7 Qt DRT needs to maintain a correct count of open windows 8 for windowCount(). It also needs to delete windows that 9 have been closed by window.close(). 10 11 This fixes the following tests: 12 13 plugins/destroy-during-npp-new.html 14 fast/dom/Document/early-document-access.html 15 fast/dom/Window/window-early-properties.html 16 fast/events/open-window-from-another-frame.html 17 fast/events/popup-blocking-click-in-iframe.html 18 19 https://bugs.webkit.org/show_bug.cgi?id=32953 20 21 * platform/qt/Skipped: 22 1 23 2010-01-20 Philippe Normand <pnormand@igalia.com> 2 24 -
trunk/LayoutTests/platform/qt/Skipped
r53564 r53615 521 521 fast/text/international/002.html 522 522 523 plugins/destroy-during-npp-new.html524 523 plugins/embed-attributes-setting.html 525 524 plugins/get-url-that-the-resource-load-delegate-will-disallow.html … … 5024 5023 fast/dom/javascript-url-crash-function.html 5025 5024 fast/dom/location-new-window-no-crash.html 5026 fast/dom/Document/early-document-access.html5027 fast/dom/Window/window-early-properties.html5028 fast/events/open-window-from-another-frame.html5029 fast/events/popup-blocking-click-in-iframe.html5030 5025 inspector/console-clear.html 5031 5026 http/tests/misc/set-window-opener-to-null.html -
trunk/WebKitTools/ChangeLog
r53609 r53615 1 2010-01-21 Robert Hogan <robert@roberthogan.net> 2 3 Reviewed by Simon Hausmann. 4 5 Qt DRT: respect window.close() and window.closed() 6 7 Qt DRT needs to maintain a correct count of open windows 8 for windowCount(). It also needs to delete windows that 9 have been closed by window.close(). 10 11 This fixes the following tests: 12 13 plugins/destroy-during-npp-new.html 14 fast/dom/Document/early-document-access.html 15 fast/dom/Window/window-early-properties.html 16 fast/events/open-window-from-another-frame.html 17 fast/events/popup-blocking-click-in-iframe.html 18 19 https://bugs.webkit.org/show_bug.cgi?id=32953 20 21 * DumpRenderTree/qt/DumpRenderTreeQt.cpp: 22 (WebCore::DumpRenderTree::DumpRenderTree): 23 (WebCore::DumpRenderTree::createWindow): 24 (WebCore::DumpRenderTree::windowCloseRequested): 25 * DumpRenderTree/qt/DumpRenderTreeQt.h: 26 * DumpRenderTree/qt/LayoutTestControllerQt.cpp: 27 (LayoutTestController::maybeDump): 28 1 29 2010-01-20 Eric Seidel <eric@webkit.org> 2 30 -
trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
r53543 r53615 345 345 connect(m_page, SIGNAL(loadStarted()), 346 346 m_controller, SLOT(resetLoadFinished())); 347 connect(m_page, SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested())); 347 348 348 349 connect(m_page->mainFrame(), SIGNAL(titleChanged(const QString&)), … … 783 784 connectFrame(page->mainFrame()); 784 785 connect(page, SIGNAL(loadFinished(bool)), m_controller, SLOT(maybeDump(bool))); 786 connect(page, SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested())); 785 787 return page; 788 } 789 790 void DumpRenderTree::windowCloseRequested() 791 { 792 QWebPage* page = qobject_cast<QWebPage*>(sender()); 793 QObject* container = page->parent(); 794 windows.removeAll(container); 795 container->deleteLater(); 786 796 } 787 797 -
trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
r53543 r53615 110 110 void dumpDatabaseQuota(QWebFrame* frame, const QString& dbName); 111 111 void statusBarMessage(const QString& message); 112 void windowCloseRequested(); 112 113 113 114 Q_SIGNALS: -
trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
r53281 r53615 89 89 void LayoutTestController::maybeDump(bool success) 90 90 { 91 Q_ASSERT(sender() == m_topLoadingFrame->page()); 91 // It is possible that we get called by windows created from the main page that have finished 92 // loading, so we don't ASSERT here. At the moment we do not gather results from such windows, 93 // but may need to in future. 94 if (sender() != m_topLoadingFrame->page()) 95 return; 92 96 93 97 m_loadFinished = true;
Note: See TracChangeset
for help on using the changeset viewer.