[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

robert at webkit.org robert at webkit.org
Wed Dec 22 14:28:18 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit b009f2cbb7150395e06b4cc26d0a3d802fdd29cd
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 10 21:05:00 2010 +0000

    2010-10-10  Robert Hogan  <robert at webkit.org>
    
            Unreviewed, fix failing test from r69468.
    
            [Qt] Put all DRT-created pages in a page group
    
            Fix on r69468.
    
            Because we don't delete closed pages immediately in DRT we need
            to remove them from the page group explicitly instead.
    
            Fixes failure of fast/events/popup-blocked-from-fake-user-gesture.html
    
            https://bugs.webkit.org/show_bug.cgi?id=47469
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            (WebCore::DumpRenderTree::windowCloseRequested):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69473 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5726b61..b038c5b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-10  Robert Hogan  <robert at webkit.org>
+
+        Unreviewed, fix failing test from r69468.
+
+        [Qt] Put all DRT-created pages in a page group
+
+        Fix on r69468.
+
+        Because we don't delete closed pages immediately in DRT we need
+        to remove them from the page group explicitly instead.
+
+        Fixes failure of fast/events/popup-blocked-from-fake-user-gesture.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=47469
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::windowCloseRequested):
+
 2010-10-10  Leandro Pereira  <leandro at profusion.mobi>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 889c1e9..50ae605 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -1078,6 +1078,9 @@ void DumpRenderTree::windowCloseRequested()
     QWebPage* page = qobject_cast<QWebPage*>(sender());
     QObject* container = page->parent();
     windows.removeAll(container);
+    // Our use of container->deleteLater() means we need to remove closed pages
+    // from the org.webkit.qt.DumpRenderTree group explicitly.
+    DumpRenderTreeSupportQt::webPageSetGroupName(page, "");
     container->deleteLater();
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list