[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ossy at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit c1bc34d519e4f2951243af539cf48d20f81f4177
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 21:10:12 2011 +0000

    Unreviewed trivial fix.
    
    FrameLoader::checkLoadCompleteForThisFrame uses wrong history item
    https://bugs.webkit.org/show_bug.cgi?id=48812
    
    * platform/qt/http/tests/navigation/forward-and-cancel-expected.txt: Updated after r76357.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e141449..5198315 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-21  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed trivial fix.
+
+        FrameLoader::checkLoadCompleteForThisFrame uses wrong history item
+        https://bugs.webkit.org/show_bug.cgi?id=48812
+
+        * platform/qt/http/tests/navigation/forward-and-cancel-expected.txt: Updated after r76357.
+
 2011-01-21  Jessie Berlin  <jberlin at apple.com>
 
         Skip transitions/transition-end-event-destroy-iframe.html on Windows in order to get the
diff --git a/LayoutTests/platform/qt/http/tests/navigation/forward-and-cancel-expected.txt b/LayoutTests/platform/qt/http/tests/navigation/forward-and-cancel-expected.txt
index 9e3d12a..efc23ba 100644
--- a/LayoutTests/platform/qt/http/tests/navigation/forward-and-cancel-expected.txt
+++ b/LayoutTests/platform/qt/http/tests/navigation/forward-and-cancel-expected.txt
@@ -1,15 +1,13 @@
-This test checks that the backForward list is not corrupted when a frame load is canceled.
-
-If testing manually, click here.
+ 
 
 ============== Back Forward List ==============
-curr->  http://127.0.0.1:8000/navigation/forward-and-cancel.html  **nav target**
+        http://127.0.0.1:8000/navigation/forward-and-cancel.html  **nav target**
         http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames-container.html  **nav target**
             http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames.html (in frame "<!--framePath //<!--frame0-->-->")
             about:blank (in frame "frame1")
             http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "<!--framePath //<!--frame1-->-->")
-        http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames-container.html
+curr->  http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames-container.html
             http://127.0.0.1:8000/navigation/resources/forward-and-cancel-frames.html (in frame "<!--framePath //<!--frame0-->-->")
-            http://127.0.0.1:8000/navigation/resources/slow-resource-1-sec.pl (in frame "frame1")  **nav target**
+            http://127.0.0.1:8000/navigation/resources/slow-resource.pl?delay=250 (in frame "frame1")  **nav target**
             http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "<!--framePath //<!--frame1-->-->")
 ===============================================

-- 
WebKit Debian packaging