[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:11 UTC 2010


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

    2010-10-10  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Put all DRT-created pages in a page group
    
            Unskip:
             http/tests/security/frameNavigation/not-opener.html
             http/tests/navigation/target-frame-from-window.html
    
            https://bugs.webkit.org/show_bug.cgi?id=47469
    
            * platform/qt/Skipped:
    2010-10-10  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Put all DRT-created pages in a page group
    
            https://bugs.webkit.org/show_bug.cgi?id=47469
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            (WebCore::DumpRenderTree::DumpRenderTree):
            (WebCore::DumpRenderTree::createWindow):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69468 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 454f5eb..fff04b9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-10  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Put all DRT-created pages in a page group
+
+        Unskip:
+         http/tests/security/frameNavigation/not-opener.html
+         http/tests/navigation/target-frame-from-window.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=47469
+
+        * platform/qt/Skipped:
+
 2010-10-10  Antonio Gomes  <agomes at rim.com>
 
         Reviewed by Andreas Kling.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index bfaa810..a9b58e4 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -170,8 +170,6 @@ http/tests/security/xss-DENIED-xsl-document.xml
 http/tests/security/cross-frame-access-callback-explicit-domain-ALLOW.html
 # - FAIL: Subframe did not finish loading.
 http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase.html
-# missing console message
-http/tests/security/frameNavigation/not-opener.html
 # missing origin header
 http/tests/security/originHeader/origin-header-for-empty.html
 
@@ -205,9 +203,6 @@ http/tests/navigation/javascriptlink-goback.html
 http/tests/navigation/metaredirect-goback.html
 http/tests/navigation/timerredirect-goback.html
 
-# new content not loaded from popup window
-http/tests/navigation/target-frame-from-window.html
-
 #CONSOLE MESSAGE: line 11: TypeError: Result of expression 'consoleWindow.log' [undefined] is not a function.
 http/tests/navigation/no-referrer-reset.html
 http/tests/navigation/no-referrer-target-blank.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a8bfea9..e621e49 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-10  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Put all DRT-created pages in a page group
+
+        https://bugs.webkit.org/show_bug.cgi?id=47469
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::DumpRenderTree):
+        (WebCore::DumpRenderTree::createWindow):
+
 2010-10-09  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index e2363b1..889c1e9 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -451,6 +451,9 @@ DumpRenderTree::DumpRenderTree()
         view->setPage(m_page);
         m_mainView = view;
     }
+    // Use a frame group name for all pages created by DumpRenderTree to allow
+    // testing of cross-page frame lookup.
+    DumpRenderTreeSupportQt::webPageSetGroupName(m_page, "org.webkit.qt.DumpRenderTree");
 
     m_mainView->setContextMenuPolicy(Qt::NoContextMenu);
     m_mainView->resize(QSize(LayoutTestController::maxViewWidth, LayoutTestController::maxViewHeight));
@@ -1062,6 +1065,11 @@ QWebPage *DumpRenderTree::createWindow()
     connectFrame(page->mainFrame());
     connect(page, SIGNAL(loadFinished(bool)), m_controller, SLOT(maybeDump(bool)));
     connect(page, SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested()));
+
+    // Use a frame group name for all pages created by DumpRenderTree to allow
+    // testing of cross-page frame lookup.
+    DumpRenderTreeSupportQt::webPageSetGroupName(page, "org.webkit.qt.DumpRenderTree");
+
     return page;
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list