wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 11:57:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1379762 part 2. Use a more reliable test to figure out when we can skip firing onload in nsDocumentViewer::LoadComplete

Browse source 
Issue #357
This commit is contained in:
janekptacijarabaci 2018-05-15 22:45:40 +02:00 • committed by Roy Tam
commit e29bf72ab4
4 changed files with 59 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

43
docshell/test/navigation/file_bug1379762-2.html Normal file
View file

@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Bug 1379762</title>
</head>
<script type="text/just-data">
onunload = null; // enable bfcache
++opener.testCount;
onpageshow = function(e) {
opener.ok(!e.persisted, "Pageshow should not be coming from bfcache " + opener.testCount);
}
if (opener.testCount == 1) {
onload = function () {
setTimeout(function() {
document.write(testScript);
}, 0);
}
} else if (opener.testCount == 2) {
// Do this async, just in case.
setTimeout(function() {
history.back();
}, 0);
} else if (opener.testCount == 3) {
// Do this async, just in case.
setTimeout(function() {
history.forward();
}, 0);
} else if (opener.testCount == 4) {
onload = function() {
opener.nextTest();
window.close();
}
}
</script>
<script>
var data = document.querySelector("script[type='text/just-data']").textContent;
// Store the string that does all out work in a global variable, so we can
// get at it later.
var testScript = "<script>" + data + "</" + "script>";
document.write(testScript);
</script>
</html>

2
docshell/test/navigation/mochitest.ini
View file

@ -59,7 +59,7 @@ skip-if = (toolkit == 'android') || (!debug && (os == 'mac' || os == 'win')) # B
skip-if = (toolkit == 'android') || (debug && e10s) #too slow on Android 4.3 aws only; bug 1030403; bug 1263213 for debug e10s skip-if = (toolkit == 'android') || (debug && e10s) #too slow on Android 4.3 aws only; bug 1030403; bug 1263213 for debug e10s
[test_sessionhistory.html] [test_sessionhistory.html]
skip-if = toolkit == 'android' #RANDOM skip-if = toolkit == 'android' #RANDOM
support-files = file_bug1379762-1.html support-files = file_bug1379762-1.html file_bug1379762-2.html
[test_sibling-matching-parent.html] [test_sibling-matching-parent.html]
[test_sibling-off-domain.html] [test_sibling-off-domain.html]
[test_triggeringprincipal_frame_nav.html] [test_triggeringprincipal_frame_nav.html]

1
docshell/test/navigation/test_sessionhistory.html
View file

@ -33,6 +33,7 @@ var testFiles =
"file_scrollRestoration.html", "file_scrollRestoration.html",
"file_bug1300461.html", "file_bug1300461.html",
"file_bug1379762-1.html", "file_bug1379762-1.html",
"file_bug1379762-2.html",
]; ];
var testCount = 0; // Used by the test files. var testCount = 0; // Used by the test files.

15
layout/base/nsDocumentViewer.cpp
View file

@ -1012,7 +1012,13 @@ nsDocumentViewer::LoadComplete(nsresult aStatus)
nsIDocShell *docShell = window->GetDocShell(); nsIDocShell *docShell = window->GetDocShell();
NS_ENSURE_TRUE(docShell, NS_ERROR_UNEXPECTED); NS_ENSURE_TRUE(docShell, NS_ERROR_UNEXPECTED);
docShell->GetRestoringDocument(&restoring); // Unfortunately, docShell->GetRestoringDocument() might no longer be set
// correctly. In particular, it can be false by now if someone took it upon
// themselves to block onload from inside restoration and unblock it later.
// But we can detect the restoring case very simply: by whether our
// document's readyState is COMPLETE.
restoring = (mDocument->GetReadyStateEnum() ==
nsIDocument::READYSTATE_COMPLETE);
if (!restoring) { if (!restoring) {
NS_ASSERTION(mDocument->IsXULDocument() || // readyState for XUL is bogus NS_ASSERTION(mDocument->IsXULDocument() || // readyState for XUL is bogus
mDocument->GetReadyStateEnum() == mDocument->GetReadyStateEnum() ==
@ -1023,6 +1029,13 @@ nsDocumentViewer::LoadComplete(nsresult aStatus)
nsIDocument::READYSTATE_UNINITIALIZED && nsIDocument::READYSTATE_UNINITIALIZED &&
NS_IsAboutBlank(mDocument->GetDocumentURI())), NS_IsAboutBlank(mDocument->GetDocumentURI())),
"Bad readystate"); "Bad readystate");
#ifdef DEBUG
bool docShellThinksWeAreRestoring;
docShell->GetRestoringDocument(&docShellThinksWeAreRestoring);
MOZ_ASSERT(!docShellThinksWeAreRestoring,
"How can docshell think we are restoring if we don't have a "
"READYSTATE_COMPLETE document?");
#endif // DEBUG
nsCOMPtr<nsIDocument> d = mDocument; nsCOMPtr<nsIDocument> d = mDocument;
mDocument->SetReadyStateInternal(nsIDocument::READYSTATE_COMPLETE); mDocument->SetReadyStateInternal(nsIDocument::READYSTATE_COMPLETE);