Skip to content
Permalink
Browse files
2010-07-30 Sheriff Bot <webkit.review.bot@gmail.com>
        Unreviewed, rolling out r64408.
        http://trac.webkit.org/changeset/64408
        https://bugs.webkit.org/show_bug.cgi?id=43292

        Causing failed tests on Chromium canaries due to wrong history
        item counts (Requested by atwilson on #webkit).

        * fast/css/target-fragment-match.html:
        * fast/dom/Window/timer-resume-on-navigation-back.html:
        * fast/dom/location-hash.html:
        * fast/events/pageshow-pagehide-on-back-cached-with-frames-expected.txt:
        * fast/events/pageshow-pagehide-on-back-cached-with-frames.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: Removed.
        * fast/history/gesture-before-onload.html: Removed.
        * fast/history/history-length.html:
        * fast/history/resources/gesture-before-onload-target.html: Removed.
        * 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/redirect-js-document-location-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/navigation/resources/document-location.js:
        (start):
        * security/autocomplete-cleared-on-back.html:
        * storage/hash-change-with-xhr.js:
        (runTest):
2010-07-30  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r64408.
        http://trac.webkit.org/changeset/64408
        https://bugs.webkit.org/show_bug.cgi?id=43292

        Causing failed tests on Chromium canaries due to wrong history
        item counts (Requested by atwilson on #webkit).

        * loader/RedirectScheduler.cpp:
        (WebCore::RedirectScheduler::scheduleRedirect):
        (WebCore::RedirectScheduler::mustLockBackForwardList):
        (WebCore::RedirectScheduler::scheduleLocationChange):
        (WebCore::RedirectScheduler::scheduleFormSubmission):
        * loader/RedirectScheduler.h:

Canonical link: https://commits.webkit.org/55233@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@64411 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed Jul 31, 2010
1 parent 8defe30 commit 3158e95e1f31d895971d159c568407b19fa184dd
Showing 29 changed files with 145 additions and 213 deletions.
@@ -1,3 +1,40 @@
2010-07-30 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r64408.
http://trac.webkit.org/changeset/64408
https://bugs.webkit.org/show_bug.cgi?id=43292

Causing failed tests on Chromium canaries due to wrong history
item counts (Requested by atwilson on #webkit).

* fast/css/target-fragment-match.html:
* fast/dom/Window/timer-resume-on-navigation-back.html:
* fast/dom/location-hash.html:
* fast/events/pageshow-pagehide-on-back-cached-with-frames-expected.txt:
* fast/events/pageshow-pagehide-on-back-cached-with-frames.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: Removed.
* fast/history/gesture-before-onload.html: Removed.
* fast/history/history-length.html:
* fast/history/resources/gesture-before-onload-target.html: Removed.
* 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/redirect-js-document-location-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/navigation/resources/document-location.js:
(start):
* security/autocomplete-cleared-on-back.html:
* storage/hash-change-with-xhr.js:
(runTest):

2010-07-30 Dan Bernstein <mitz@apple.com>

Reviewed by Darin Adler.
@@ -11,12 +11,6 @@
{
if (window.layoutTestController)
layoutTestController.waitUntilDone();

// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(runTest, 0);
}

function runTest() {
window.location.hash ='#target-01';
document.body.offsetTop;
window.history.back(); // This queues up a navigation, so we need to delay the call to notifyDone.
@@ -18,12 +18,9 @@
layoutTestController.waitUntilDone();
layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
}
// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(function() {
window.setTimeout(verify, timeoutValue);
timestamp = new Date().getTime();
window.location.href = "data:text/html,<body onload='history.back()'></body>";
}, 0);
window.setTimeout("verify()", timeoutValue);
timestamp = new Date().getTime();
window.location.href = "data:text/html,<body onload='history.back()'></body>";
}

</script>
@@ -87,9 +87,8 @@
numErrors = 0;
originalLocation = window.location.href;
originalHistoryLength = window.history.length;

// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(step, 0);

step();
}
</script>
</head>
@@ -1,16 +1,16 @@
CONSOLE MESSAGE: line 20: ***Top level frame being parsed for the initial page load***
CONSOLE MESSAGE: line 20: Subsubframe window.onload
CONSOLE MESSAGE: line 20: Subsubframe window.onpageshow, target = [object HTMLDocument], persisted = false
CONSOLE MESSAGE: line 20: Subframe window.onload
CONSOLE MESSAGE: line 20: Subframe window.onpageshow, target = [object HTMLDocument], persisted = false
CONSOLE MESSAGE: line 20: Main frame window.onload
CONSOLE MESSAGE: line 20: Main frame window.onpageshow, target = [object HTMLDocument], persisted = false
CONSOLE MESSAGE: line 20: ***Navigating top-level frame to a page that will immediately navigate back to this one***
CONSOLE MESSAGE: line 20: Main frame window.onpagehide, target = [object HTMLDocument], persisted = true
CONSOLE MESSAGE: line 20: Subframe window.onpagehide, target = [object HTMLDocument], persisted = true
CONSOLE MESSAGE: line 20: Subsubframe window.onpagehide, target = [object HTMLDocument], persisted = true
CONSOLE MESSAGE: line 20: Subsubframe window.onpageshow, target = [object HTMLDocument], persisted = true
CONSOLE MESSAGE: line 20: Subframe window.onpageshow, target = [object HTMLDocument], persisted = true
CONSOLE MESSAGE: line 20: Main frame window.onpageshow, target = [object HTMLDocument], persisted = true
Test pageshow/pagehide event behavior when navigating away from a page with frames, putting the page in the page cache, then back to it.
***Top level frame being parsed for the initial page load***
Subsubframe window.onload
Subsubframe window.onpageshow, target = [object HTMLDocument], persisted = false
Subframe window.onload
Subframe window.onpageshow, target = [object HTMLDocument], persisted = false
Main frame window.onload
Main frame window.onpageshow, target = [object HTMLDocument], persisted = false
***Navigating top-level frame to a page that will immediately navigate back to this one***
Main frame window.onpagehide, target = [object HTMLDocument], persisted = true
Subframe window.onpagehide, target = [object HTMLDocument], persisted = true
Subsubframe window.onpagehide, target = [object HTMLDocument], persisted = true
Subsubframe window.onpageshow, target = [object HTMLDocument], persisted = true
Subframe window.onpageshow, target = [object HTMLDocument], persisted = true
Main frame window.onpageshow, target = [object HTMLDocument], persisted = true

@@ -14,10 +14,8 @@

function log(message)
{
// Logging to the console instead of the "log" DIV in the DOM because
// otherwise we trigger the assert mentioned at http://webkit.org/b/43152
// (since we log during pagehide)
console.log(message);
var log = document.getElementById("log");
log.innerHTML += message + "\n";
}

log("***Top level frame being parsed for the initial page load***");
@@ -33,8 +31,7 @@
layoutTestController.notifyDone();
} else {
log("***Navigating top-level frame to a page that will immediately navigate back to this one***");
// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(function() {window.location.href = "data:text/html,<script>history.back();</scr" + "ipt>";}, 0);
window.location.href = "data:text/html,<script>history.back();</scr" + "ipt>";
}
}

@@ -17,8 +17,7 @@
intervalId = setInterval(endTest, 100);

window.opener.log("page-1, about to navigate to page-2.")
// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(function() {location.href = "cached-page-2.html";}, 0);
location.href = "cached-page-2.html";
}

// This unload handler exists just to make sure this page is not added
@@ -19,8 +19,7 @@
intervalId = setInterval(goBack, 20);

window.opener.log("page-2, about to navigate to page-3.")
// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(function() {location.href = "cached-page-3.html";}, 0);
location.href = "cached-page-3.html";
}
</script>
<body onload="loadNext()">
@@ -22,8 +22,7 @@
intervalId = setInterval(check, 10);

window.opener.log("page-1, about to navigate to page-2.")
// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(function() {location.href = "cached-page-2.html";}, 0);
location.href = "cached-page-2.html";
}
</script>
<body onload="loadNext()"></body>
@@ -18,8 +18,7 @@
intervalId = setInterval(check, 10);

window.opener.log("page with data urls, about to navigate to page-2.")
// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(function() {location.href = "cached-page-2.html";}, 0);
location.href = "cached-page-2.html";
}
</script>
<body onload="loadNext()">

This file was deleted.

This file was deleted.

@@ -8,34 +8,30 @@
layoutTestController.waitUntilDone();
}
}

// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(function() {
// 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;
}
}, 0);
// 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

This file was deleted.

@@ -30,11 +30,8 @@
layoutTestController.dumpAsText();
layoutTestController.waitUntilDone();
}
// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(function() {
navigateToHash(field);
navigateAwayAndBack();
}, 0);
navigateToHash(field);
navigateAwayAndBack();
} else {
document.body.innerHTML = (field.value == '') ? 'FAIL' : 'PASS';
if (window.layoutTestController)
@@ -13,9 +13,8 @@
var input = document.getElementById("testinput");
input.setAttribute("autocomplete", "on");
input.parentNode.removeChild(input);

// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(function() {window.location = "data:text/html,<script>history.back();</scrip" + "t>";}, 0);

window.location = "data:text/html,<script>history.back();</scrip" + "t>";
}

function pageHidden()
@@ -33,10 +33,9 @@

function loaded()
{
if (!sessionStorage.stage) {
// Location changes need to happen outside the onload handler to generate history entries.
setTimeout(runFirstStageOfTest, 0);
} else if (sessionStorage.stage == 2)
if (!sessionStorage.stage)
runFirstStageOfTest();
else if (sessionStorage.stage == 2)
runSecondStageOfTest();
else if (sessionStorage.stage == 3)
runThirdStageOfTest();

0 comments on commit 3158e95

Please sign in to comment.