[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
darin at chromium.org
darin at chromium.org
Wed Jan 20 22:26:18 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 4bc9f3f8ddd139bce534ebb2e76bb8a53c3da99d
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 16 00:58:42 2010 +0000
2010-01-15 Darin Fisher <darin at chromium.org>
Reviewed by Dimitri Glazkov.
Disable page cache and add diagnostic output in the failure case.
https://bugs.webkit.org/show_bug.cgi?id=33749
* fast/history/history-length-expected.txt:
* fast/history/history-length.html: Copied from fast/history/history-length.html-disabled.
* fast/history/history-length.html-disabled: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53350 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ab8218e..0649bf0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
2010-01-15 Darin Fisher <darin at chromium.org>
+ Reviewed by Dimitri Glazkov.
+
+ Disable page cache and add diagnostic output in the failure case.
+ https://bugs.webkit.org/show_bug.cgi?id=33749
+
+ * fast/history/history-length-expected.txt:
+ * fast/history/history-length.html: Copied from fast/history/history-length.html-disabled.
+ * fast/history/history-length.html-disabled: Removed.
+
+2010-01-15 Darin Fisher <darin at chromium.org>
+
Disable this test temporarily since it is failing on all of the
builders.
diff --git a/LayoutTests/fast/history/history-length-expected.txt b/LayoutTests/fast/history/history-length-expected.txt
index 7ef22e9..653e421 100644
--- a/LayoutTests/fast/history/history-length-expected.txt
+++ b/LayoutTests/fast/history/history-length-expected.txt
@@ -1 +1,5 @@
+main frame - has 1 onunload handler(s)
+main frame - has 1 onunload handler(s)
+main frame - has 1 onunload handler(s)
+main frame - has 1 onunload handler(s)
PASS
diff --git a/LayoutTests/fast/history/history-length.html b/LayoutTests/fast/history/history-length.html
new file mode 100644
index 0000000..41b0b2f
--- /dev/null
+++ b/LayoutTests/fast/history/history-length.html
@@ -0,0 +1,39 @@
+<script>
+onload = function() {
+ if (location.search.substring(1).length == 0) {
+ sessionStorage.testStage = 0;
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ }
+ }
+ // This test advances history by 2 pages, then navigates back one, and
+ // records history.length. We expect history.length to indicate the total
+ // length of session history. At the end of the test, it should be 2 greater
+ // than it was at the start of the test.
+ switch (sessionStorage.testStage++) {
+ case 0:
+ sessionStorage.initialLength = history.length;
+ location = "?a";
+ break;
+ case 1:
+ location = "?b";
+ break;
+ case 2:
+ history.back();
+ break;
+ case 3:
+ if (history.length == (sessionStorage.initialLength - 0) + 2)
+ document.body.innerHTML = "PASS";
+ else
+ document.body.innerHTML = "FAIL: initialLength=" + sessionStorage.initialLength + ", history.length=" + history.length;
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ break;
+ }
+}
+onunload = function() {
+ // disable page cache
+}
+</script>
+<body></body>
diff --git a/LayoutTests/fast/history/history-length.html-disabled b/LayoutTests/fast/history/history-length.html-disabled
deleted file mode 100644
index 4bf9932..0000000
--- a/LayoutTests/fast/history/history-length.html-disabled
+++ /dev/null
@@ -1,36 +0,0 @@
-<script>
-onload = function() {
- if (location.search.substring(1).length == 0) {
- sessionStorage.testStage = 0;
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
- }
- // This test advances history by 2 pages, then navigates back one, and
- // records history.length. We expect history.length to indicate the total
- // length of session history. At the end of the test, it should be 2 greater
- // than it was at the start of the test.
- switch (sessionStorage.testStage++) {
- case 0:
- sessionStorage.initialLength = history.length;
- location = "?a";
- break;
- case 1:
- location = "?b";
- break;
- case 2:
- history.back();
- break;
- case 3:
- if (history.length == (sessionStorage.initialLength - 0) + 2)
- document.body.innerHTML = "PASS";
- else
- document.body.innerHTML = "FAIL";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- break;
- }
-}
-</script>
-<body></body>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list