[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

eric at webkit.org eric at webkit.org
Wed Apr 7 23:54:24 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 303b32405794aa9355f6050cbb517f66da5f3886
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 23 21:48:11 2009 +0000

    2009-11-23  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] DRT: dumpBackForwardList() does not work properly with non-file URLs.
            https://bugs.webkit.org/show_bug.cgi?id=31775
    
            LayoutTestController::dumpBackForwardList() should work with local URLs
            as well as with normal URLs (in http tests for instance).
            Currently it does not output the latter properly.
    
            Unskip a bunch of passing http/navigation tests.
    
            * platform/qt/Skipped:
    2009-11-23  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] DRT: dumpBackForwardList() does not work properly with non-file URLs.
            https://bugs.webkit.org/show_bug.cgi?id=31775
    
            LayoutTestController::dumpBackForwardList() should work with local URLs
            as well as with normal URLs (in http tests for instance).
            Currently it does not output the latter properly.
    
            Unskip a bunch of passing http/navigation tests.
    
            * DumpRenderTree/qt/DumpRenderTree.cpp:
            (WebCore::dumpHistoryItem):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51316 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c91fb2b..231eec0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-23  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] DRT: dumpBackForwardList() does not work properly with non-file URLs.
+        https://bugs.webkit.org/show_bug.cgi?id=31775
+
+        LayoutTestController::dumpBackForwardList() should work with local URLs
+        as well as with normal URLs (in http tests for instance).
+        Currently it does not output the latter properly.
+
+        Unskip a bunch of passing http/navigation tests.
+
+        * platform/qt/Skipped:
+
 2009-11-22  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 58fff99..14940c9 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -35,7 +35,6 @@ http/tests/globalhistory
 http/tests/history
 http/tests/incremental
 http/tests/media
-http/tests/navigation
 http/tests/plugins
 http/tests/webarchive
 http/tests/wml
@@ -68,6 +67,53 @@ http/tests/loading/text-content-type-with-binary-extension.html
 http/tests/local/drag-over-remote-content.html
 http/tests/local/send-dragged-file.html
 
+# Failing navigation tests
+http/tests/navigation/anchor-frames.html
+http/tests/navigation/anchor-subframeload.html
+http/tests/navigation/back-to-slow-frame.html
+http/tests/navigation/changing-frame-hierarchy-in-onload.html
+http/tests/navigation/error404-basic.html
+http/tests/navigation/error404-frames.html
+http/tests/navigation/error404-goback.html
+http/tests/navigation/error404-subframeload.html
+http/tests/navigation/javascriptlink-basic.html
+http/tests/navigation/javascriptlink-frames.html
+http/tests/navigation/javascriptlink-goback.html
+http/tests/navigation/javascriptlink-subframeload.html
+http/tests/navigation/lockedhistory-iframe.html
+http/tests/navigation/metaredirect-basic.html
+http/tests/navigation/metaredirect-frames.html
+http/tests/navigation/metaredirect-goback.html
+http/tests/navigation/metaredirect-subframeload.html
+http/tests/navigation/new-window-redirect-history.html
+http/tests/navigation/no-referrer-reset.html
+http/tests/navigation/no-referrer-target-blank.html
+http/tests/navigation/onload-navigation-iframe-2.html
+http/tests/navigation/onload-navigation-iframe-timeout.html
+http/tests/navigation/onload-navigation-iframe.html
+http/tests/navigation/post-basic.html
+http/tests/navigation/post-frames.html
+http/tests/navigation/post-goback1.html
+http/tests/navigation/post-goback2.html
+http/tests/navigation/postredirect-basic.html
+http/tests/navigation/postredirect-frames.html
+http/tests/navigation/postredirect-goback1.html
+http/tests/navigation/postredirect-goback2.html
+http/tests/navigation/redirect302-frames.html
+http/tests/navigation/redirect302-subframeload.html
+http/tests/navigation/relativeanchor-frames.html
+http/tests/navigation/reload-subframe-object.html
+http/tests/navigation/slowmetaredirect-basic.html
+http/tests/navigation/slowtimerredirect-basic.html
+http/tests/navigation/success200-frames-loadsame.html
+http/tests/navigation/success200-frames.html
+http/tests/navigation/success200-subframeload.html
+http/tests/navigation/target-frame-from-window.html
+http/tests/navigation/timerredirect-basic.html
+http/tests/navigation/timerredirect-frames.html
+http/tests/navigation/timerredirect-goback.html
+http/tests/navigation/timerredirect-subframeload.html
+
 # Failing security tests
 http/tests/security/frame-loading-via-document-write.html
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3215fe7..307b86e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-23  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] DRT: dumpBackForwardList() does not work properly with non-file URLs.
+        https://bugs.webkit.org/show_bug.cgi?id=31775
+
+        LayoutTestController::dumpBackForwardList() should work with local URLs
+        as well as with normal URLs (in http tests for instance).
+        Currently it does not output the latter properly.
+
+        Unskip a bunch of passing http/navigation tests.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::dumpHistoryItem):
+
 2009-11-22  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index 8655931..ebb3146 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -509,10 +509,12 @@ static QString dumpHistoryItem(const QWebHistoryItem& item, int indent, bool cur
 
         result.append(fileTestString);
         result.append(res);
-
-        // FIXME: Wrong, need (private?) API for determining this.
-        result.append(QLatin1String("  **nav target**"));
+    } else {
+        result.append(url);
     }
+
+    // FIXME: Wrong, need (private?) API for determining this.
+    result.append(QLatin1String("  **nav target**"));
     result.append(QLatin1String("\n"));
 
     return result;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list