[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

Fri Feb 26 22:16:54 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 09102b42b6c1ad58d6f1c6c287ffa1ccc6a98808
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 10 16:06:17 2010 +0000

    2010-02-10  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Adam Barth.
    
            Add test to ensure that a call to history.forward() at the top of
            a page doesn't prevent the page from loading when there is no
            forward list.
    
            https://bugs.webkit.org/show_bug.cgi?id=34722
    
            * fast/history/forward-during-load-expected.txt: Added.
            * fast/history/forward-during-load.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54600 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 65b007f..54ec801 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-10  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add test to ensure that a call to history.forward() at the top of
+        a page doesn't prevent the page from loading when there is no
+        forward list.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34722
+
+        * fast/history/forward-during-load-expected.txt: Added.
+        * fast/history/forward-during-load.html: Added.
+
 2010-02-10  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/LayoutTests/fast/history/forward-during-load-expected.txt b/LayoutTests/fast/history/forward-during-load-expected.txt
new file mode 100644
index 0000000..1419f2f
--- /dev/null
+++ b/LayoutTests/fast/history/forward-during-load-expected.txt
@@ -0,0 +1 @@
+PASS Calling history.forward() above shouldn't prevent the rest of the page from loading.
diff --git a/LayoutTests/fast/history/forward-during-load.html b/LayoutTests/fast/history/forward-during-load.html
new file mode 100644
index 0000000..5dfe832
--- /dev/null
+++ b/LayoutTests/fast/history/forward-during-load.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+history.forward();
+</script>
+</head>
+<body>
+PASS Calling history.forward() above shouldn't prevent the rest of the page from loading.
+</body>
+</html>

-- 
WebKit Debian packaging

