[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 707aa3f34d58fffe16c22de5fbe21037044405c5
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 09:27:37 2010 +0000

    No review, rolling out 53615 as it causes two
    crashes on the bot.
    
    WebKitTools:
    
    * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
    (WebCore::DumpRenderTree::DumpRenderTree):
    (WebCore::DumpRenderTree::createWindow):
    * DumpRenderTree/qt/DumpRenderTreeQt.h:
    * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
    (LayoutTestController::maybeDump):
    
    LayoutTests:
    
    * platform/qt/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53616 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5580a26..a9cd4d4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-21  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        No review, rolling out 53615 as it causes two
+        crashes on the bot.
+
+        * platform/qt/Skipped:
+
 2010-01-21  Robert Hogan  <robert at roberthogan.net>
 
         Reviewed by Simon Hausmann.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index a5f7098..ffc59de 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -520,6 +520,7 @@ fast/text/midword-break-after-breakable-char.html
 fast/text/textIteratorNilRenderer.html
 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
 plugins/get-url-with-blank-target.html
@@ -5022,6 +5023,10 @@ fast/css/namespaces/namespaces-empty.xml
 # https://bugs.webkit.org/show_bug.cgi?id=31626
 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
 http/tests/security/aboutBlank/xss-DENIED-set-opener.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 500159b..92d449d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-21  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        No review, rolling out 53615 as it causes two
+        crashes on the bot.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::DumpRenderTree):
+        (WebCore::DumpRenderTree::createWindow):
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::maybeDump):
+
 2010-01-21  Robert Hogan  <robert at roberthogan.net>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 8151475..88af665 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -344,7 +344,6 @@ DumpRenderTree::DumpRenderTree()
     // dump results itself when the last page loaded in the test has finished loading.
     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&)),
             SLOT(titleChanged(const QString&)));
@@ -783,18 +782,9 @@ QWebPage *DumpRenderTree::createWindow()
     connect(page, SIGNAL(frameCreated(QWebFrame*)), this, SLOT(connectFrame(QWebFrame*)));
     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();
-}
-
 int DumpRenderTree::windowCount() const
 {
 // include the main view in the count
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
index ee7acb0..9c3428b 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
@@ -109,7 +109,6 @@ public Q_SLOTS:
     void connectFrame(QWebFrame *frame);
     void dumpDatabaseQuota(QWebFrame* frame, const QString& dbName);
     void statusBarMessage(const QString& message);
-    void windowCloseRequested();
 
 Q_SIGNALS:
     void quit();
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 9948eba..c2e097b 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -88,11 +88,7 @@ void LayoutTestController::processWork()
 // Called on loadFinished on mainFrame.
 void LayoutTestController::maybeDump(bool success)
 {
-    // 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;
+    Q_ASSERT(sender() == m_topLoadingFrame->page());
 
     m_loadFinished = true;
     // as the function is called on loadFinished, the test might

-- 
WebKit Debian packaging