Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1723282, let nonbfcacheable page update layout history state when the new page is coming from the bfcache, r=peterv

Browse Source 
The fix let's ContentParent::RecvSynchronizeLayoutHistoryState update the layout history state.

Using an existing test to launch a subtest for this. Hopefully the description of the test helps with reviewing it.
(These BroadcastChannel based tests can be hard to follow.)

Differential Revision: https://phabricator.services.mozilla.com/D122376
This commit is contained in:
Olli Pettay 2021-08-30 19:50:05 +00:00
parent 1174bbec6b
commit 4d366e1861
6 changed files with 137 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docshell/shistory/nsSHistory.cpp
View File

@ -1227,9 +1227,10 @@ static void FinishRestore(CanonicalBrowsingContext* aBrowsingContext,
frameLoaderOwner->GetFrameLoader();
// The current page can be bfcached, store the
// nsFrameLoader in the current SessionHistoryEntry.
if (aCanSave && aBrowsingContext->GetActiveSessionHistoryEntry()) {
aBrowsingContext->GetActiveSessionHistoryEntry()->SetFrameLoader(
currentFrameLoader);
RefPtr<SessionHistoryEntry> currentSHEntry =
aBrowsingContext->GetActiveSessionHistoryEntry();
if (aCanSave && currentSHEntry) {
currentSHEntry->SetFrameLoader(currentFrameLoader);
Unused << aBrowsingContext->SetIsInBFCache(true);
}
@ -1262,6 +1263,10 @@ static void FinishRestore(CanonicalBrowsingContext* aBrowsingContext,
// The old page can't be stored in the bfcache,
// destroy the nsFrameLoader.
if (!aCanSave && currentFrameLoader) {
// Since destroying the browsing context may need to update layout
// history state, the browsing context needs to have still access to the
// correct entry.
aBrowsingContext->SetActiveSessionHistoryEntry(currentSHEntry);
currentFrameLoader->Destroy();
}

30
docshell/test/navigation/file_scrollRestoration_bfcache_and_nobfcache.html Normal file
View File

@ -0,0 +1,30 @@
<html>
<head>
<script>
// Ensure layout is flushed before doing anything with scrolling.
function flushAndExecute(callback) {
window.requestAnimationFrame(function() {
setTimeout(callback);
});
}
var bc = new BroadcastChannel("bfcached");
bc.onmessage = (msgEvent) => {
if (msgEvent.data == "loadNext") {
flushAndExecute(() => {
location.href = "file_scrollRestoration_bfcache_and_nobfcache_part2.html";
});
} else if (msgEvent.data == "forward") {
flushAndExecute(() => {
history.forward();
});
}
};
window.onpageshow = (event) => {
bc.postMessage({command: "pageshow", persisted: event.persisted});
};
</script>
</head>
<body>
</body>
</html>

35
docshell/test/navigation/file_scrollRestoration_bfcache_and_nobfcache_part2.html Normal file
View File

@ -0,0 +1,35 @@
<html>
<head>
<script>
// Note, this page does not enter bfcache because of an HTTP header.
// Ensure layout is flushed before doing anything with scrolling.
function flushAndExecute(callback) {
window.requestAnimationFrame(function() {
setTimeout(callback);
});
}
var bc = new BroadcastChannel("notbfcached");
bc.onmessage = (msgEvent) => {
if (msgEvent.data == "scroll") {
flushAndExecute(() => { window.scrollTo(0, 4000); });
} else if (msgEvent.data == "getScrollY") {
flushAndExecute(() => { bc.postMessage({ scrollY: window.scrollY}); });
} else if (msgEvent.data == "back") {
flushAndExecute(() => { bc.close(); history.back(); });
} else if (msgEvent.data == "close") {
bc.postMessage("closed");
bc.close();
window.close();
}
};
window.onpageshow = (event) => {
bc.postMessage({command: "pageshow", persisted: event.persisted});
};
</script>
</head>
<body>
<div style="height: 5000px; border: 1px solid black;">content</div>
</body>
</html>

1
docshell/test/navigation/file_scrollRestoration_bfcache_and_nobfcache_part2.html^headers^ Normal file
View File

@ -0,0 +1 @@
Cache-control: no-store

3
docshell/test/navigation/mochitest.ini
View File

@ -60,6 +60,9 @@ support-files =
test_bug145971.html
file_bug1609475.html
file_bug1379762-1.html
file_scrollRestoration_bfcache_and_nobfcache.html
file_scrollRestoration_bfcache_and_nobfcache_part2.html
file_scrollRestoration_bfcache_and_nobfcache_part2.html^headers^
file_scrollRestoration_navigate.html
file_scrollRestoration_part1_nobfcache.html
file_scrollRestoration_part1_nobfcache.html^headers^

61
docshell/test/navigation/test_scrollRestoration.html
View File

@ -127,7 +127,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
currentCase++;
} else if (command == "finishing") {
bc3.close();
SimpleTest.finish();
test4();
}
}
@ -142,6 +142,65 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=
window.open("file_scrollRestoration_part3_nobfcache.html", "", "width=360,height=480,noopener");
}
// test4 opens a new page which can enter bfcache. That page then loads
// another page which can't enter bfcache. That second page then scrolls
// down. History API is then used to navigate back and forward. When the
// second page loads again, it should scroll down automatically.
var bc4a, bc4b;
var scrollYCounter = 0;
function test4() {
currentCase = 0;
bc4a = new BroadcastChannel("bfcached");
bc4a.onmessage = (msgEvent) => {
var msg = msgEvent.data;
var command = msg.command;
if (command == "pageshow") {
++currentCase;
if (currentCase == 1) {
ok(!msg.persisted, "The first page should not be persisted initially.");
bc4a.postMessage("loadNext");
} else if (currentCase == 3) {
ok(msg.persisted, "The first page should be persisted.");
bc4a.postMessage("forward");
bc4a.close();
}
}
}
bc4b = new BroadcastChannel("notbfcached");
bc4b.onmessage = (event) => {
var msg = event.data;
var command = msg.command;
if (command == "pageshow") {
++currentCase;
if (currentCase == 2) {
ok(!msg.persisted, "The second page should not be persisted.");
bc4b.postMessage("getScrollY");
bc4b.postMessage("scroll");
bc4b.postMessage("getScrollY");
bc4b.postMessage("back");
} else if (currentCase == 4) {
ok(!msg.persisted, "The second page should not be persisted.");
bc4b.postMessage("getScrollY");
}
} else if (msg == "closed") {
bc4b.close();
SimpleTest.finish();
} else if ("scrollY" in msg) {
++scrollYCounter;
if (scrollYCounter == 1) {
is(msg.scrollY, 0, "The page should be initially scrolled to top.");
} else if (scrollYCounter == 2) {
isnot(msg.scrollY, 0, "The page should be then scrolled down.");
} else if (scrollYCounter == 3) {
isnot(msg.scrollY, 0, "The page should be scrolled down after being restored from the session history.");
bc4b.postMessage("close");
}
}
}
window.open("file_scrollRestoration_bfcache_and_nobfcache.html", "", "width=360,height=480,noopener");
}
function runTest() {
// If Fission is disabled, the pref is no-op.
SpecialPowers.pushPrefEnv({set: [["fission.bfcacheInParent", true]]}, () => {