diff options
| author | commit-queue@webkit.org <commit-queue@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2010-08-13 23:35:34 +0000 |
|---|---|---|
| committer | commit-queue@webkit.org <commit-queue@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2010-08-13 23:35:34 +0000 |
| commit | b29b7235f9d978c5ddf6e8530e558150f314ee5a (patch) | |
| tree | acabfaf8e8b616152fbc9a0016ffb3bab71deb8a /third_party/WebKit/LayoutTests/http | |
| parent | 26ed3cdb76cd4d44ca0147052a30f396a216379a (diff) | |
| download | chromium_src-b29b7235f9d978c5ddf6e8530e558150f314ee5a.zip chromium_src-b29b7235f9d978c5ddf6e8530e558150f314ee5a.tar.gz chromium_src-b29b7235f9d978c5ddf6e8530e558150f314ee5a.tar.bz2 | |
2010-08-13 Mihai Parparita <mihaip@chromium.org>
Reviewed by Dimitri Glazkov.
Session history should skip over JS redirects
https://bugs.webkit.org/show_bug.cgi?id=42861
Lock the back/forward list for location changes and form submits that
happen before the onload event fires that are not the result of user
gestures.
http/tests/history tests now pass, their expectations were updated
accordingly. Other tests needed a setTimeout wrapper around location
changes and form submits during onload, otherwise they would not
generate history entries as expected anymore.
* fast/css/target-fragment-match.html:
* fast/dom/location-hash.html:
* fast/dom/Geolocation/resources/cached-page-1.html:
* fast/dom/Window/timer-resume-on-navigation-back.html:
* fast/events/pageshow-pagehide-on-back-cached-with-frames-expected.txt:
* fast/events/pageshow-pagehide-on-back-cached-with-frames.html:
* fast/forms/button-state-restore.html:
* fast/forms/state-restore-to-non-autocomplete-form.html:
* fast/forms/state-restore-to-non-edited-controls.html:
* fast/frames/resources/cached-page-1.html:
* fast/frames/resources/cached-page-2.html:
* fast/harness/resources/cached-page-1.html:
* fast/harness/resources/cached-page-with-data-urls.html:
* fast/history/gesture-before-onload-expected.txt: Added.
* fast/history/gesture-before-onload.html: Added.
* fast/history/history-length.html:
* fast/history/resources/gesture-before-onload-target.html: Added.
* fast/history/saves-state-after-fragment-nav.html:
* fast/loader/input-element-page-cache-crash.html:
* fast/loader/stateobjects/document-destroyed-navigate-back.html:
* fast/loader/stateobjects/pushstate-clears-forward-history.html:
* fast/loader/subframe-navigate-during-main-frame-load.html:
* http/tests/history/back-to-post.php:
* http/tests/history/redirect-js-document-location-before-load-expected.txt:
* http/tests/history/redirect-js-form-submit-before-load-expected.txt:
* http/tests/history/redirect-js-location-assign-before-load-expected.txt:
* http/tests/history/redirect-js-location-before-load-expected.txt:
* http/tests/history/redirect-js-location-href-before-load-expected.txt:
* http/tests/loading/307-after-303-after-post-expected.txt:
* http/tests/loading/redirect-methods-expected.txt:
* http/tests/navigation/resources/back-send-referrer-helper.php:
* http/tests/navigation/resources/document-location.js:
(start):
* http/tests/navigation/resources/submit-to-fragment.pl:
* security/autocomplete-cleared-on-back.html:
* storage/hash-change-with-xhr.js:
(updateDatabase):
(invokeBack):
(runTest):
(runTestsInner):
2010-08-13 Mihai Parparita <mihaip@chromium.org>
Reviewed by Dimitri Glazkov.
Session history should skip over JS redirects
https://bugs.webkit.org/show_bug.cgi?id=42861
Lock the back/forward list for location changes and form submits that
happen before the onload event fires that are not the result of user
gestures.
Made form submission (at the ScheduledFormSubmission level) more similar
to ScheduledURLNavigation by having it call clientRedirected too, fixing
a long-standing FIXME.
Test: fast/history/gesture-before-onload-location-href.html,
fast/history/gesture-before-onload-form-submit.html and updated
expectations for http/tests/history tests that used to fail.
* loader/FormSubmission.cpp:
(WebCore::FormSubmission::requestURL):
(WebCore::FormSubmission::populateFrameLoadRequest):
* loader/FormSubmission.h:
* loader/RedirectScheduler.cpp:
(WebCore::ScheduledFormSubmission::ScheduledFormSubmission):
(WebCore::ScheduledFormSubmission::fire):
(WebCore::ScheduledFormSubmission::didStartTimer):
(WebCore::ScheduledFormSubmission::didStopTimer):
(WebCore::RedirectScheduler::scheduleRedirect):
(WebCore::RedirectScheduler::mustLockBackForwardList):
(WebCore::RedirectScheduler::scheduleLocationChange):
(WebCore::RedirectScheduler::scheduleFormSubmission):
* loader/RedirectScheduler.h:
git-svn-id: svn://svn.chromium.org/blink/trunk@65340 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/http')
47 files changed, 150 insertions, 136 deletions
diff --git a/third_party/WebKit/LayoutTests/http/tests/history/back-to-post.php b/third_party/WebKit/LayoutTests/http/tests/history/back-to-post.php index 884b32b..960b04b 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/back-to-post.php +++ b/third_party/WebKit/LayoutTests/http/tests/history/back-to-post.php @@ -14,6 +14,13 @@ Getting an error page instead of login page navigating back in gmail.</p> <input id="mysubmit" type="submit" name="Submit" value="Submit"> </form> <script> + +function submitForm() +{ + // Submit form in a timeout to make sure that we create a new back/forward list item. + setTimeout(function() {document.forms[0].submit()}, 0); +} + if (window.layoutTestController) { layoutTestController.dumpAsText(); layoutTestController.waitUntilDone(); @@ -25,7 +32,7 @@ if (!window.layoutTestController) if (document.location.search == "") { window.name = ""; // Use window.name to communicate between steps. - document.forms[0].submit(); + submitForm(); } else if (document.location.search == "?1") { if (window.name == "finish") { window.name = ""; @@ -34,7 +41,7 @@ if (document.location.search == "") { layoutTestController.notifyDone(); } else { document.forms[0].action = "?2"; - document.forms[0].submit(); + submitForm(); } } else { // Test that going back to form submission result works. diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-200-refresh-0-seconds.pl b/third_party/WebKit/LayoutTests/http/tests/history/redirect-200-refresh-0-seconds.pl index db2340e..9f0bf3d 100755 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-200-refresh-0-seconds.pl +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-200-refresh-0-seconds.pl @@ -12,7 +12,7 @@ print <<HERE_DOC_END <title>200 Refresh Redirect</title> <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } </script> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-200-refresh-2-seconds.pl b/third_party/WebKit/LayoutTests/http/tests/history/redirect-200-refresh-2-seconds.pl index 734443a..f11cb6b 100755 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-200-refresh-2-seconds.pl +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-200-refresh-2-seconds.pl @@ -12,7 +12,7 @@ print <<HERE_DOC_END <title>200 Refresh Redirect</title> <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } </script> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-301-expected.txt b/third_party/WebKit/LayoutTests/http/tests/history/redirect-301-expected.txt index 062b69b..77a6ef6 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-301-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-301-expected.txt @@ -1,8 +1,9 @@ This page is the target of a redirect. -PASS: History item count should be 1 and is. +PASS: History item count should be 2 and is. ============== Back Forward List ============== -curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#1 **nav target** + http://127.0.0.1:8000/history/redirect-301.html **nav target** +curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#2 **nav target** =============================================== diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-301.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-301.html new file mode 100644 index 0000000..43f9520 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-301.html @@ -0,0 +1,15 @@ +<html> +<head> +<title>301 Redirect</title> +<script> + function runTest() { + if (window.layoutTestController) { + layoutTestController.clearBackForwardList(); + layoutTestController.waitUntilDone(); + } + window.setTimeout(function() {window.location = 'resources/redirect-helper.pl?301';}, 0); + } +</script> + +<body onload="runTest()">This page is a 301 redirect.</body> +</html> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-301.pl b/third_party/WebKit/LayoutTests/http/tests/history/redirect-301.pl deleted file mode 100755 index f0f15ec..0000000 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-301.pl +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/perl -# Script to generate a 301 HTTP redirect - -print "Status: 301 Moved Permanently\r\n"; -print "Location: resources/redirect-target.html#1\r\n"; -print "Content-type: text/html\r\n"; -print "\r\n"; - -print <<HERE_DOC_END -<html> -<head> -<title>301 Redirect</title> -<script> -if (window.layoutTestController) { - layoutTestController.keepWebHistory(); - layoutTestController.waitUntilDone(); -} -</script> - -<body>This page is a 301 redirect.</body> -</html> -HERE_DOC_END diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-302-expected.txt b/third_party/WebKit/LayoutTests/http/tests/history/redirect-302-expected.txt index 062b69b..4d69275 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-302-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-302-expected.txt @@ -1,8 +1,9 @@ This page is the target of a redirect. -PASS: History item count should be 1 and is. +PASS: History item count should be 2 and is. ============== Back Forward List ============== -curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#1 **nav target** + http://127.0.0.1:8000/history/redirect-302.html **nav target** +curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#2 **nav target** =============================================== diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-302.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-302.html new file mode 100755 index 0000000..e83c792 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-302.html @@ -0,0 +1,15 @@ +<html> +<head> +<title>302 Redirect</title> +<script> + function runTest() { + if (window.layoutTestController) { + layoutTestController.clearBackForwardList(); + layoutTestController.waitUntilDone(); + } + window.setTimeout(function() {window.location = 'resources/redirect-helper.pl?302';}, 0); + } +</script> + +<body onload="runTest()">This page is a 302 redirect.</body> +</html> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-302.pl b/third_party/WebKit/LayoutTests/http/tests/history/redirect-302.pl deleted file mode 100755 index e06310f..0000000 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-302.pl +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/perl -# Script to generate a 302 HTTP redirect - -print "Status: 302 Moved Temporarily\r\n"; -print "Location: resources/redirect-target.html#1\r\n"; -print "Content-type: text/html\r\n"; -print "\r\n"; - -print <<HERE_DOC_END -<html> -<head> -<title>302 Redirect</title> -<script> -if (window.layoutTestController) { - layoutTestController.keepWebHistory(); - layoutTestController.waitUntilDone(); -} -</script> - -<body>This page is a 302 redirect.</body> -</html> -HERE_DOC_END diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-303-expected.txt b/third_party/WebKit/LayoutTests/http/tests/history/redirect-303-expected.txt index 062b69b..9d7e86e 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-303-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-303-expected.txt @@ -1,8 +1,9 @@ This page is the target of a redirect. -PASS: History item count should be 1 and is. +PASS: History item count should be 2 and is. ============== Back Forward List ============== -curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#1 **nav target** + http://127.0.0.1:8000/history/redirect-303.html **nav target** +curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#2 **nav target** =============================================== diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-303.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-303.html new file mode 100755 index 0000000..1107adb --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-303.html @@ -0,0 +1,15 @@ +<html> +<head> +<title>303 Redirect</title> +<script> + function runTest() { + if (window.layoutTestController) { + layoutTestController.clearBackForwardList(); + layoutTestController.waitUntilDone(); + } + window.setTimeout(function() {window.location = 'resources/redirect-helper.pl?303';}, 0); + } +</script> + +<body onload="runTest()">This page is a 303 redirect.</body> +</html> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-303.pl b/third_party/WebKit/LayoutTests/http/tests/history/redirect-303.pl deleted file mode 100755 index c7891bf..0000000 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-303.pl +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/perl -# Script to generate a 303 HTTP redirect - -print "Status: 303 See Other\r\n"; -print "Location: resources/redirect-target.html#1\r\n"; -print "Content-type: text/html\r\n"; -print "\r\n"; - -print <<HERE_DOC_END -<html> -<head> -<title>303 Redirect</title> -<script> -if (window.layoutTestController) { - layoutTestController.keepWebHistory(); - layoutTestController.waitUntilDone(); -} -</script> - -<body>This page is a 303 redirect.</body> -</html> -HERE_DOC_END diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-307-expected.txt b/third_party/WebKit/LayoutTests/http/tests/history/redirect-307-expected.txt index 062b69b..721ed2e 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-307-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-307-expected.txt @@ -1,8 +1,9 @@ This page is the target of a redirect. -PASS: History item count should be 1 and is. +PASS: History item count should be 2 and is. ============== Back Forward List ============== -curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#1 **nav target** + http://127.0.0.1:8000/history/redirect-307.html **nav target** +curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#2 **nav target** =============================================== diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-307.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-307.html new file mode 100755 index 0000000..c34ca77 --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-307.html @@ -0,0 +1,15 @@ +<html> +<head> +<title>307 Redirect</title> +<script> + function runTest() { + if (window.layoutTestController) { + layoutTestController.clearBackForwardList(); + layoutTestController.waitUntilDone(); + } + window.setTimeout(function() {window.location = 'resources/redirect-helper.pl?307';}, 0); + } +</script> + +<body onload="runTest()">This page is a 307 redirect.</body> +</html> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-307.pl b/third_party/WebKit/LayoutTests/http/tests/history/redirect-307.pl deleted file mode 100755 index c44db9e..0000000 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-307.pl +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/perl -# Script to generate a 307 HTTP redirect - -print "Status: 307 Moved Temporarily\r\n"; -print "Location: resources/redirect-target.html#1\r\n"; -print "Content-type: text/html\r\n"; -print "\r\n"; - -print <<HERE_DOC_END -<html> -<head> -<title>307 Redirect</title> -<script> -if (window.layoutTestController) { - layoutTestController.keepWebHistory(); - layoutTestController.waitUntilDone(); -} -</script> -</head> - -<body>This page is a 307 redirect.</body> -</html> -HERE_DOC_END diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-0-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-0-seconds.html index 513305b..0ce306e 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-0-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-0-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } setTimeout(function () { document.location = "resources/redirect-target.html#1"; }, 0); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-2-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-2-seconds.html index f175e51..99ba397 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-2-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-2-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } setTimeout(function () { document.location = "resources/redirect-target.html#1"; }, 2000); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-before-load-expected.txt b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-before-load-expected.txt index efbe835..062b69b 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-before-load-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-before-load-expected.txt @@ -1,9 +1,8 @@ This page is the target of a redirect. -FAIL: History item count should be 1 but instead is 2. +PASS: History item count should be 1 and is. ============== Back Forward List ============== - http://127.0.0.1:8000/history/redirect-js-document-location-before-load.html **nav target** curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#1 **nav target** =============================================== diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-before-load.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-before-load.html index f6240eb..26b0c57 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-before-load.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-document-location-before-load.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } document.location = "resources/redirect-target.html#1"; diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-0-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-0-seconds.html index d62c631..cf46247 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-0-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-0-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } </script> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-2-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-2-seconds.html index a49b51d..eafde40 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-2-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-2-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } </script> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-before-load-expected.txt b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-before-load-expected.txt index 759b4c8..4cba496 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-before-load-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-before-load-expected.txt @@ -1,9 +1,8 @@ This page is the target of a redirect. -FAIL: History item count should be 1 but instead is 2. +PASS: History item count should be 1 and is. ============== Back Forward List ============== - http://127.0.0.1:8000/history/redirect-js-form-submit-before-load.html **nav target** curr-> http://127.0.0.1:8000/history/resources/redirect-target.html?#1 **nav target** =============================================== diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-before-load.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-before-load.html index c336b7a4..bca6d77 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-before-load.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-form-submit-before-load.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } </script> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-0-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-0-seconds.html index 3259d64..1fd7b6f 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-0-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-0-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } setTimeout(function () { location = "resources/redirect-target.html#1"; }, 0); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-2-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-2-seconds.html index 4b1e76c..ab05ba4 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-2-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-2-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } setTimeout(function () { location = "resources/redirect-target.html#1"; }, 2000); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-0-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-0-seconds.html index 5c0bd67..07bf3aa 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-0-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-0-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } setTimeout(function () { location.assign("resources/redirect-target.html#1"); }, 0); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-2-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-2-seconds.html index c8b2e28..6499aff 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-2-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-2-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } setTimeout(function () { location.assign("resources/redirect-target.html#1"); }, 2000); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-before-load-expected.txt b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-before-load-expected.txt index 42a1259..062b69b 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-before-load-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-before-load-expected.txt @@ -1,9 +1,8 @@ This page is the target of a redirect. -FAIL: History item count should be 1 but instead is 2. +PASS: History item count should be 1 and is. ============== Back Forward List ============== - http://127.0.0.1:8000/history/redirect-js-location-assign-before-load.html **nav target** curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#1 **nav target** =============================================== diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-before-load.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-before-load.html index 7717b04..75173ec 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-before-load.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-assign-before-load.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } location.assign("resources/redirect-target.html#1"); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-before-load-expected.txt b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-before-load-expected.txt index b6daf9e..062b69b 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-before-load-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-before-load-expected.txt @@ -1,9 +1,8 @@ This page is the target of a redirect. -FAIL: History item count should be 1 but instead is 2. +PASS: History item count should be 1 and is. ============== Back Forward List ============== - http://127.0.0.1:8000/history/redirect-js-location-before-load.html **nav target** curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#1 **nav target** =============================================== diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-before-load.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-before-load.html index 722c75b..fe204df 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-before-load.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-before-load.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } location = "resources/redirect-target.html#1"; diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-0-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-0-seconds.html index 3e84d1e..104d0e5 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-0-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-0-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } setTimeout(function () { location.href = "resources/redirect-target.html#1"; }, 0); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-2-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-2-seconds.html index 8083185..299a449 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-2-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-2-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } setTimeout(function () { location.href = "resources/redirect-target.html#1"; }, 2000); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-before-load-expected.txt b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-before-load-expected.txt index 3cc9c6b..062b69b 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-before-load-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-before-load-expected.txt @@ -1,9 +1,8 @@ This page is the target of a redirect. -FAIL: History item count should be 1 but instead is 2. +PASS: History item count should be 1 and is. ============== Back Forward List ============== - http://127.0.0.1:8000/history/redirect-js-location-href-before-load.html **nav target** curr-> http://127.0.0.1:8000/history/resources/redirect-target.html#1 **nav target** =============================================== diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-before-load.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-before-load.html index b963ccd..6862ed5 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-before-load.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-href-before-load.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } location.href = "resources/redirect-target.html#1"; diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-0-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-0-seconds.html index 05c0ca4..9a7057b 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-0-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-0-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } setTimeout(function () { location.replace("resources/redirect-target.html#1"); }, 0); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-2-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-2-seconds.html index 2c31588..0fa448e 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-2-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-2-seconds.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } setTimeout(function () { location.replace("resources/redirect-target.html#1"); }, 2000); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-before-load.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-before-load.html index 32266a6..33d5ea0 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-before-load.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-js-location-replace-before-load.html @@ -4,7 +4,7 @@ <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } location.replace("resources/redirect-target.html#1"); diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-meta-refresh-0-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-meta-refresh-0-seconds.html index 6e78ec5..0f0e171 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-meta-refresh-0-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-meta-refresh-0-seconds.html @@ -4,7 +4,7 @@ <title>Meta Refresh Redirect</title> <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } </script> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/redirect-meta-refresh-2-seconds.html b/third_party/WebKit/LayoutTests/http/tests/history/redirect-meta-refresh-2-seconds.html index b9f6549..e8d7833 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/redirect-meta-refresh-2-seconds.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/redirect-meta-refresh-2-seconds.html @@ -4,7 +4,7 @@ <title>Meta Refresh Redirect</title> <script> if (window.layoutTestController) { - layoutTestController.keepWebHistory(); + layoutTestController.clearBackForwardList(); layoutTestController.waitUntilDone(); } </script> diff --git a/third_party/WebKit/LayoutTests/http/tests/history/resources/redirect-helper.pl b/third_party/WebKit/LayoutTests/http/tests/history/resources/redirect-helper.pl new file mode 100755 index 0000000..80f2e7d --- /dev/null +++ b/third_party/WebKit/LayoutTests/http/tests/history/resources/redirect-helper.pl @@ -0,0 +1,25 @@ +#!/usr/bin/perl +# Script to generate a 30x HTTP redirect (determined by the query parameter) + +$REDIRECT_CODE = $ENV{'QUERY_STRING'} || '301'; + +$STATUS_TEXTS = { + '301' => 'Moved Permanently', + '302' => 'Moved Temporarily', + '303' => 'See Other', + '307' => 'Moved Temporarily' +}; + +print "Status: $REDIRECT_CODE $STATUS_TEXTS{$REDIRECT_CODE}\r\n"; +print "Location: redirect-target.html#2\r\n"; +print "Content-type: text/html\r\n"; +print "\r\n"; + +print <<HERE_DOC_END +<html> +<head> +<title>$REDIRECT_CODE Redirect</title> + +<body>This page is a $REDIRECT_CODE redirect.</body> +</html> +HERE_DOC_END diff --git a/third_party/WebKit/LayoutTests/http/tests/history/resources/redirect-target.html b/third_party/WebKit/LayoutTests/http/tests/history/resources/redirect-target.html index b3ea4ee..92059ae 100644 --- a/third_party/WebKit/LayoutTests/http/tests/history/resources/redirect-target.html +++ b/third_party/WebKit/LayoutTests/http/tests/history/resources/redirect-target.html @@ -14,7 +14,7 @@ function log(s) function testHistoryItemCount() { var expected = parseInt(location.hash.slice(1)); - var actual = layoutTestController.webHistoryItemCount + 1; // Add one to include the referring page, which loaded before we started recording history. + var actual = history.length; if (actual === expected) log("PASS: History item count should be " + expected + " and is."); else diff --git a/third_party/WebKit/LayoutTests/http/tests/loading/307-after-303-after-post-expected.txt b/third_party/WebKit/LayoutTests/http/tests/loading/307-after-303-after-post-expected.txt index a0ad674..cf00ef8 100644 --- a/third_party/WebKit/LayoutTests/http/tests/loading/307-after-303-after-post-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/loading/307-after-303-after-post-expected.txt @@ -1,6 +1,7 @@ main frame - didStartProvisionalLoadForFrame main frame - didCommitLoadForFrame main frame - didFinishDocumentLoadForFrame +main frame - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/post-to-303-target.php main frame - didHandleOnloadEventsForFrame main frame - didFinishLoadForFrame <unknown> - didFinishLoading @@ -11,6 +12,7 @@ main frame - didReceiveServerRedirectForProvisionalLoadForFrame http://127.0.0.1:8000/loading/resources/post-to-303-target.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/307-post-output-target.php, main document URL http://127.0.0.1:8000/loading/resources/307-post-output-target.php, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/303-to-307-target.php, http status code 307> main frame - didReceiveServerRedirectForProvisionalLoadForFrame http://127.0.0.1:8000/loading/resources/post-to-303-target.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/307-post-output-target.php, http status code 200> +main frame - didCancelClientRedirectForFrame main frame - didCommitLoadForFrame main frame - didFinishDocumentLoadForFrame main frame - didHandleOnloadEventsForFrame diff --git a/third_party/WebKit/LayoutTests/http/tests/loading/redirect-methods-expected.txt b/third_party/WebKit/LayoutTests/http/tests/loading/redirect-methods-expected.txt index 8ada636..049f4be 100644 --- a/third_party/WebKit/LayoutTests/http/tests/loading/redirect-methods-expected.txt +++ b/third_party/WebKit/LayoutTests/http/tests/loading/redirect-methods-expected.txt @@ -19,6 +19,7 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didReceiveR frame "0" - didCancelClientRedirectForFrame frame "0" - didCommitLoadForFrame frame "0" - didFinishDocumentLoadForFrame +frame "0" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php frame "0" - didHandleOnloadEventsForFrame frame "0" - didFinishLoadForFrame http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading @@ -27,6 +28,7 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRe http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, main document URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 301> frame "0" - didReceiveServerRedirectForProvisionalLoadForFrame http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, http status code 200> +frame "0" - didCancelClientRedirectForFrame frame "0" - didCommitLoadForFrame frame "0" - didFinishDocumentLoadForFrame frame "1" - didStartProvisionalLoadForFrame @@ -47,6 +49,7 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didReceiveR frame "1" - didCancelClientRedirectForFrame frame "1" - didCommitLoadForFrame frame "1" - didFinishDocumentLoadForFrame +frame "1" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php frame "1" - didHandleOnloadEventsForFrame frame "1" - didFinishLoadForFrame http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading @@ -55,6 +58,7 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRe http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, main document URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 302> frame "1" - didReceiveServerRedirectForProvisionalLoadForFrame http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, http status code 200> +frame "1" - didCancelClientRedirectForFrame frame "1" - didCommitLoadForFrame frame "1" - didFinishDocumentLoadForFrame frame "2" - didStartProvisionalLoadForFrame @@ -75,6 +79,7 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didReceiveR frame "2" - didCancelClientRedirectForFrame frame "2" - didCommitLoadForFrame frame "2" - didFinishDocumentLoadForFrame +frame "2" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php frame "2" - didHandleOnloadEventsForFrame frame "2" - didFinishLoadForFrame http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading @@ -83,6 +88,7 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRe http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, main document URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 303> frame "2" - didReceiveServerRedirectForProvisionalLoadForFrame http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, http status code 200> +frame "2" - didCancelClientRedirectForFrame frame "2" - didCommitLoadForFrame frame "2" - didFinishDocumentLoadForFrame frame "3" - didStartProvisionalLoadForFrame @@ -103,6 +109,7 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didReceiveR frame "3" - didCancelClientRedirectForFrame frame "3" - didCommitLoadForFrame frame "3" - didFinishDocumentLoadForFrame +frame "3" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php frame "3" - didHandleOnloadEventsForFrame frame "3" - didFinishLoadForFrame http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading @@ -111,6 +118,7 @@ http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRe http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, main document URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http method POST> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 307> frame "3" - didReceiveServerRedirectForProvisionalLoadForFrame http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, http status code 200> +frame "3" - didCancelClientRedirectForFrame frame "3" - didCommitLoadForFrame frame "3" - didFinishDocumentLoadForFrame frame "3" - didHandleOnloadEventsForFrame diff --git a/third_party/WebKit/LayoutTests/http/tests/navigation/resources/back-send-referrer-helper.php b/third_party/WebKit/LayoutTests/http/tests/navigation/resources/back-send-referrer-helper.php index bf629ef..b54956a 100644 --- a/third_party/WebKit/LayoutTests/http/tests/navigation/resources/back-send-referrer-helper.php +++ b/third_party/WebKit/LayoutTests/http/tests/navigation/resources/back-send-referrer-helper.php @@ -18,8 +18,8 @@ window.name: <script>document.write(window.name)</script> <script> if (window.name == 1) { - // Navigate once more to add a history entry. - document.loopback.submit(); + // Navigate once more (in a timeout) to add a history entry. + setTimeout(function() {document.loopback.submit();}, 0); } else if (window.name == 2) { history.go(-1); } else { diff --git a/third_party/WebKit/LayoutTests/http/tests/navigation/resources/document-location.js b/third_party/WebKit/LayoutTests/http/tests/navigation/resources/document-location.js index 1db48cd..a0ab4d8 100644 --- a/third_party/WebKit/LayoutTests/http/tests/navigation/resources/document-location.js +++ b/third_party/WebKit/LayoutTests/http/tests/navigation/resources/document-location.js @@ -7,7 +7,8 @@ function start() { layoutTestController.dumpAsText(); layoutTestController.waitUntilDone(); - runTest(); + // Location changes need to happen outside the onload handler to generate history entries. + setTimeout(runTest, 0); } else { // loaded the ?1 navigation layoutTestController.notifyDone(); diff --git a/third_party/WebKit/LayoutTests/http/tests/navigation/resources/submit-to-fragment.pl b/third_party/WebKit/LayoutTests/http/tests/navigation/resources/submit-to-fragment.pl index 30bf156..97ee97b 100755 --- a/third_party/WebKit/LayoutTests/http/tests/navigation/resources/submit-to-fragment.pl +++ b/third_party/WebKit/LayoutTests/http/tests/navigation/resources/submit-to-fragment.pl @@ -22,7 +22,8 @@ onload = function() { alert("stage: " + sessionStorage.stage); switch (sessionStorage.stage++) { case 1: - document.forms[0].submit(); + // Submit form in a timeout to make sure that we create a new back/forward list item. + setTimeout(function() {document.forms[0].submit();}, 0); break; case 2: history.back(); |