From 32c76c820b7d2387eac649c32b445573dc10cdce Mon Sep 17 00:00:00 2001
From: Blink WPT Bot <blink-w3c-test-autoroller@chromium.org>
Date: Mon, 20 Nov 2023 10:20:36 +0000
Subject: [PATCH] Bug 1862325 [wpt PR 42873] - NavigationActivation prototype,
 a=testonly

Automatic update from web-platform-tests
NavigationActivation prototype (#42873)

NavigationActivation is a new object (exposed as
`navigation.activation`). It is updated when a new Document is
"activated": initial Document creation, restore from bfcache, or
(in a future CL) prerender activation. It has three pieces of state:
* `activation.entry`: The current NavigationHistoryEntry at the time
  of activation.
* `activation.from`: The current NavigationHistoryEntry immediately
  before activation (i.e., the entry we came from). This will be
  null if the navigation was cross-origin, or if the previous entry
  was not in the same-origin contiguous region of the back/forward
  list that is available in `navigation.entries()`.
* `activation.navigationType`: The navigationType ('push', 'replace',
  'reload', or 'traverse') of the navigation that activated the
  current Document.

Note that `entry` or `from` may be a NavigationHistoryEntry that is
no longer present in `navigation.entries()` (e.g., when doing a
replace navigation, `activation.from` will be the replaced entry).
In that case, the entry will remain visible, but because it is
a "disposed" entry, its index will be -1 and attempting to
`navigation.traverseTo()` its key will be rejected.

Initial discussion: https://github.com/whatwg/html/issues/9760
Draft spec PR: https://github.com/whatwg/html/pull/9856
I2p: https://groups.google.com/a/chromium.org/g/blink-dev/c/EfqxeH3Iwh4

Bug: 1492932
Change-Id: I2e090a8366906e4cb6778893ad9ffdca18d6ec37
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4990011
Reviewed-by: Domenic Denicola <domenic@chromium.org>
Commit-Queue: Nate Chapin <japhet@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1220983}

Co-authored-by: Nate Chapin <japhet@chromium.org>
--

wpt-commits: c2ca6ebdc7f92fbaf7308c91dda05bcaf24ef455
wpt-pr: 42873
---
 ...activation-after-bfcache-cross-origin.html | 28 +++++++++++
 .../activation-after-bfcache.html             | 34 ++++++++++++++
 .../activation-history-pushState.html         | 18 +++++++
 .../activation-history-replaceState.html      | 17 +++++++
 .../activation-initial-about-blank.html       | 23 +++++++++
 .../activation-push-cross-origin.html         | 25 ++++++++++
 .../activation-push.html                      | 30 ++++++++++++
 .../activation-reload.html                    | 21 +++++++++
 .../activation-replace-cross-origin.html      | 25 ++++++++++
 .../activation-replace.html                   | 44 +++++++++++++++++
 ...ion-same-document-then-cross-document.html | 24 ++++++++++
 .../activation-traverse-not-in-entries.html   | 32 +++++++++++++
 .../activation-traverse-then-clobber.html     | 47 +++++++++++++++++++
 .../activation-traverse.html                  | 38 +++++++++++++++
 .../no-referrer-dynamic-url-censored.html     |  3 ++
 .../no-referrer-from-meta-url-censored.html   |  3 ++
 .../no-referrer-url-censored.html             |  3 ++
 17 files changed, 415 insertions(+)
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-after-bfcache-cross-origin.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-after-bfcache.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-history-pushState.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-history-replaceState.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-initial-about-blank.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-push-cross-origin.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-push.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-reload.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-replace-cross-origin.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-replace.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-same-document-then-cross-document.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse-not-in-entries.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse-then-clobber.html
 create mode 100644 testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse.html

diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-after-bfcache-cross-origin.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-after-bfcache-cross-origin.html
new file mode 100644
index 0000000000000..3a0b8804b4091
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-after-bfcache-cross-origin.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js"></script>
+<script src="resources/is_uuid.js"></script>
+
+<script>
+// This test ensures that navigation.activation is properly updated when a page
+// is restored from bfcache.
+runBfcacheTest({
+  targetOrigin: originSameSite,
+  async funcAfterAssertion(pageA, pageB) {
+    const activationData = await pageA.execute_script(() => {
+      return { entryURL : navigation.activation.entry.url,
+               fromIsNull : navigation.activation.from === null,
+               navigationType : navigation.activation.navigationType }
+    });
+
+    // activation.entry should be the currently activated page, and
+    // activation.from should be omitted because it is a different origin.
+    assert_equals(activationData.entryURL, pageA.url);
+    assert_true(activationData.fromIsNull);
+    assert_equals(activationData.navigationType, "traverse");
+  }
+}, "navigation.activation must be updated when restored from bfcache");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-after-bfcache.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-after-bfcache.html
new file mode 100644
index 0000000000000..4c246e9d624a0
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-after-bfcache.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js"></script>
+<script src="resources/is_uuid.js"></script>
+
+<script>
+// This test ensures that navigation.activation is properly updated when a page
+// is restored from bfcache.
+runBfcacheTest({
+  targetOrigin: originSameOrigin,
+  async funcAfterAssertion(pageA, pageB) {
+    const activationData = await pageA.execute_script(() => {
+      return { entryURL : navigation.activation.entry.url,
+               fromURL : navigation.activation.from.url,
+               navigationType : navigation.activation.navigationType }
+    });
+
+    // activation.entry should be the currently activated page, and
+    // activation.from should be the page before restored from bfcache.
+    assert_equals(activationData.entryURL, pageA.url);
+    assert_equals(activationData.fromURL, pageB.url);
+    assert_equals(activationData.navigationType, "traverse");
+
+    const entryAndCurrentMatch = await pageA.execute_script(() => navigation.activation.entry === navigation.currentEntry);
+    assert_true(entryAndCurrentMatch);
+
+    const fromAndEntriesArrayMatch = await pageA.execute_script(() => navigation.activation.from === navigation.entries()[navigation.currentEntry.index + 1]);
+    assert_true(fromAndEntriesArrayMatch);
+  }
+}, "navigation.activation must be updated when restored from bfcache");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-history-pushState.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-history-pushState.html
new file mode 100644
index 0000000000000..bcc56136f7e2e
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-history-pushState.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  assert_equals(navigation.activation.entry, navigation.currentEntry);
+  let activationEntry = navigation.activation.entry;
+  let entryIndexBeforePush = activationEntry.index;
+  history.pushState("#fragment", "", "");
+  assert_not_equals(navigation.activation.entry, navigation.currentEntry);
+  assert_equals(navigation.activation.entry, activationEntry);
+  assert_equals(navigation.activation.entry.index, entryIndexBeforePush);
+}, "navigation.activation.entry should not change due to history.pushState()");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-history-replaceState.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-history-replaceState.html
new file mode 100644
index 0000000000000..70dc7b8eedee5
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-history-replaceState.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  assert_equals(navigation.activation.entry, navigation.currentEntry);
+  let activationEntry = navigation.activation.entry;
+  history.replaceState("#fragment", "", "");
+  assert_not_equals(navigation.activation.entry, navigation.currentEntry);
+  assert_equals(navigation.activation.entry, activationEntry);
+  assert_equals(navigation.activation.entry.index, -1);
+}, "navigation.activation.entry should be orphaned by history.replaceState()");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-initial-about-blank.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-initial-about-blank.html
new file mode 100644
index 0000000000000..402093809ca65
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-initial-about-blank.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="i"></iframe>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  assert_equals(i.contentWindow.navigation.activation, null);
+
+  i.contentWindow.navigation.navigate("/common/blank.html?a");
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  assert_equals(i.contentWindow.navigation.entries().length, 1);
+  assert_equals(i.contentWindow.navigation.activation.entry,
+                i.contentWindow.navigation.currentEntry);
+  assert_equals(i.contentWindow.navigation.activation.from.url, "about:blank");
+  assert_equals(i.contentWindow.navigation.activation.from.index, -1);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "replace");
+}, "navigation.activation interaction with initial about:blank");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-push-cross-origin.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-push-cross-origin.html
new file mode 100644
index 0000000000000..15651bf78aac9
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-push-cross-origin.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  let i = document.createElement("iframe");
+  i.src = get_host_info().HTTP_ORIGIN_WITH_DIFFERENT_PORT + "/common/blank.html";
+  document.body.appendChild(i);
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  i.contentWindow.location = "/common/blank.html";
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+  let current_entry_after_nav = i.contentWindow.navigation.currentEntry;
+
+  assert_equals(i.contentWindow.navigation.entries().length, 1);
+  assert_equals(i.contentWindow.navigation.activation.entry, current_entry_after_nav);
+  assert_equals(i.contentWindow.navigation.activation.from, null);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "push");
+}, "navigation.activation after push cross-origin");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-push.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-push.html
new file mode 100644
index 0000000000000..99548314c4606
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-push.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="i" src="/common/blank.html"></iframe>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  i.contentWindow.navigation.navigate("/common/blank.html?a");
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+  let current_entry_after_nav = i.contentWindow.navigation.currentEntry;
+
+  assert_equals(i.contentWindow.navigation.entries().length, 2);
+  assert_equals(i.contentWindow.navigation.activation.entry, current_entry_after_nav);
+  assert_equals(i.contentWindow.navigation.activation.from,
+                i.contentWindow.navigation.entries()[0]);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "push");
+
+  // Same-document navigation doesn't change navigation.activation.
+  await i.contentWindow.navigation.navigate("/common/blank.html?a#fragment").finished;
+
+  assert_equals(i.contentWindow.navigation.entries().length, 3);
+  assert_equals(i.contentWindow.navigation.activation.entry, current_entry_after_nav);
+  assert_equals(i.contentWindow.navigation.activation.from,
+                i.contentWindow.navigation.entries()[0]);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "push");
+}, "navigation.activation after push");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-reload.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-reload.html
new file mode 100644
index 0000000000000..f65afc74bc145
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-reload.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="i" src="/common/blank.html"></iframe>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  i.contentWindow.navigation.reload();
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  // activation.entry and activation.from are equal after reload
+  assert_equals(i.contentWindow.navigation.entries().length, 1);
+  assert_equals(i.contentWindow.navigation.activation.entry.index, 0);
+  assert_equals(i.contentWindow.navigation.activation.entry,
+                i.contentWindow.navigation.activation.from);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "reload");
+}, "navigation.activation after reload");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-replace-cross-origin.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-replace-cross-origin.html
new file mode 100644
index 0000000000000..a835b7f4c52a2
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-replace-cross-origin.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  let i = document.createElement("iframe");
+  i.src = get_host_info().HTTP_ORIGIN_WITH_DIFFERENT_PORT + "/common/blank.html";
+  document.body.appendChild(i);
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  i.contentWindow.location.replace("/common/blank.html");
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+  let current_entry_after_nav = i.contentWindow.navigation.currentEntry;
+
+  assert_equals(i.contentWindow.navigation.entries().length, 1);
+  assert_equals(i.contentWindow.navigation.activation.entry, current_entry_after_nav);
+  assert_equals(i.contentWindow.navigation.activation.from, null);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "replace");
+}, "navigation.activation after replace cross-origin");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-replace.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-replace.html
new file mode 100644
index 0000000000000..71624fd7cece6
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-replace.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="i" src="/common/blank.html"></iframe>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  let before_key = i.contentWindow.navigation.currentEntry.key;
+  let before_id = i.contentWindow.navigation.currentEntry.id;
+  let before_url = i.contentWindow.navigation.currentEntry.url;
+  i.contentWindow.navigation.navigate("/common/blank.html?a", { history: "replace" });
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+  let current_entry_after_nav = i.contentWindow.navigation.currentEntry;
+  let from_entry_after_nav = i.contentWindow.navigation.activation.from;
+
+  // activation.entry is the current entry. activation.from is a new
+  // NavigationHistoryEntry object (because there is a new window), with the
+  // same key/id/url as before the navigation, and an index of -1 because it is
+  // not present in the entries array.
+  assert_equals(i.contentWindow.navigation.entries().length, 1);
+  assert_equals(i.contentWindow.navigation.activation.entry, current_entry_after_nav);
+  assert_equals(i.contentWindow.navigation.activation.entry.index, 0);
+  assert_equals(from_entry_after_nav.key, before_key);
+  assert_equals(from_entry_after_nav.id, before_id);
+  assert_equals(from_entry_after_nav.url, before_url);
+  assert_equals(from_entry_after_nav.index, -1);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "replace");
+
+  await i.contentWindow.navigation.navigate("/common/blank.html?a#fragment", { history: "replace" }).finished;
+
+  // activation.entry is no longer navigation.currentEntry and is disposed.
+  // activation.from has not changed.
+  assert_equals(i.contentWindow.navigation.entries().length, 1);
+  assert_equals(i.contentWindow.navigation.activation.entry, current_entry_after_nav);
+  assert_not_equals(i.contentWindow.navigation.activation.entry,
+                    i.contentWindow.navigation.currentEntry);
+  assert_equals(i.contentWindow.navigation.activation.entry.index, -1);
+  assert_equals(i.contentWindow.navigation.activation.from, from_entry_after_nav);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "replace");
+}, "navigation.activation after replace");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-same-document-then-cross-document.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-same-document-then-cross-document.html
new file mode 100644
index 0000000000000..3daa4de66ee3a
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-same-document-then-cross-document.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="i" src="/common/blank.html"></iframe>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+  await i.contentWindow.navigation.navigate("/common/blank.html#fragment").finished;
+  assert_equals(i.contentWindow.navigation.entries().length, 2);
+
+  let urlAfterSameDoc = i.contentWindow.location.href;
+
+  i.contentWindow.navigation.navigate("/common/blank.html?a");
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+  assert_equals(i.contentWindow.navigation.entries().length, 3);
+
+  assert_equals(i.contentWindow.navigation.activation.from,
+                i.contentWindow.navigation.entries()[1]);
+  assert_equals(i.contentWindow.navigation.activation.from.url, urlAfterSameDoc);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "push");
+}, "navigation.activation same-document then cross-document");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse-not-in-entries.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse-not-in-entries.html
new file mode 100644
index 0000000000000..c8386615a24f6
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse-not-in-entries.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="i" src="/common/blank.html"></iframe>
+<script src="/common/get-host-info.sub.js"></script>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  i.contentWindow.location = get_host_info().HTTP_ORIGIN_WITH_DIFFERENT_PORT + "/common/blank.html";
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  i.contentWindow.location = get_host_info().HTTP_ORIGIN + "/common/blank.html";
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  // Go back to the first entry in the iframe. Because the navigation API only
+  // exposes same-origin *contiguous* entries, and there's a cross-origin entry
+  // in between, we have to use history.go().
+  history.go(-2);
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+  assert_equals(i.contentWindow.navigation.entries().length, 1);
+
+  // activation.from will be null because the entry that triggered the traversal
+  // is in a different same-origin contiguous region.
+  assert_equals(i.contentWindow.navigation.activation.entry, i.contentWindow.navigation.currentEntry);
+  assert_equals(i.contentWindow.navigation.activation.entry.index, 0);
+  assert_equals(i.contentWindow.navigation.activation.from, null);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "traverse");
+}, "navigation.activation - traverse from a non-contiguous same-origin url");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse-then-clobber.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse-then-clobber.html
new file mode 100644
index 0000000000000..c02837624098d
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse-then-clobber.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="i" src="/common/blank.html"></iframe>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  i.contentWindow.navigation.navigate("/common/blank.html?a");
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  assert_equals(i.contentWindow.navigation.entries().length, 2);
+
+  i.contentWindow.navigation.back();
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  // activation.entry is the current entry. activation.from is the entry the
+  // traverse came from.
+  assert_equals(i.contentWindow.navigation.entries().length, 2);
+  assert_equals(i.contentWindow.navigation.activation.entry, i.contentWindow.navigation.currentEntry);
+  assert_equals(i.contentWindow.navigation.activation.entry.index, 0);
+  assert_equals(i.contentWindow.navigation.activation.from,
+                i.contentWindow.navigation.entries()[1]);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "traverse");
+
+  let from_key_before_push = i.contentWindow.navigation.activation.from.key;
+  let from_id_before_push = i.contentWindow.navigation.activation.from.id;
+  let from_url_before_push = i.contentWindow.navigation.activation.from.url;
+  await i.contentWindow.navigation.navigate("/common/blank.html#fragment").finished;
+
+  // pushing same document will not change activation.entry, but it will cut
+  // activation.from out of the entries array. Its parameters should not change
+  //except for its index, which becomes -1.
+  assert_equals(i.contentWindow.navigation.entries().length, 2);
+  assert_equals(i.contentWindow.navigation.activation.entry, i.contentWindow.navigation.entries()[0]);
+  assert_equals(i.contentWindow.navigation.activation.entry.index, 0);
+  assert_not_equals(i.contentWindow.navigation.activation.from,
+                    i.contentWindow.navigation.entries()[1]);
+  assert_equals(i.contentWindow.navigation.activation.from.key, from_key_before_push);
+  assert_equals(i.contentWindow.navigation.activation.from.id, from_id_before_push);
+  assert_equals(i.contentWindow.navigation.activation.from.url, from_url_before_push);
+  assert_equals(i.contentWindow.navigation.activation.from.index, -1);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "traverse");
+}, "navigation.activation - traverse, then push same-document");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse.html b/testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse.html
new file mode 100644
index 0000000000000..218fe8626910a
--- /dev/null
+++ b/testing/web-platform/tests/navigation-api/navigation-activation/activation-traverse.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="i" src="/common/blank.html"></iframe>
+<script>
+promise_test(async t => {
+  // Wait for after the load event so that the navigation doesn't get converted
+  // into a replace navigation.
+  await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
+
+  i.contentWindow.navigation.navigate("/common/blank.html?a");
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  assert_equals(i.contentWindow.navigation.entries().length, 2);
+
+  i.contentWindow.navigation.back();
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  // activation.entry is the current entry. activation.from is the entry the
+  // traverse came from.
+  assert_equals(i.contentWindow.navigation.entries().length, 2);
+  assert_equals(i.contentWindow.navigation.activation.entry, i.contentWindow.navigation.currentEntry);
+  assert_equals(i.contentWindow.navigation.activation.entry.index, 0);
+  assert_equals(i.contentWindow.navigation.activation.from,
+                i.contentWindow.navigation.entries()[1]);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "traverse");
+
+  i.contentWindow.navigation.forward();
+  await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
+
+  assert_equals(i.contentWindow.navigation.entries().length, 2);
+  assert_equals(i.contentWindow.navigation.activation.entry, i.contentWindow.navigation.currentEntry);
+  assert_equals(i.contentWindow.navigation.activation.entry.index, 1);
+  assert_equals(i.contentWindow.navigation.activation.from,
+                i.contentWindow.navigation.entries()[0]);
+  assert_equals(i.contentWindow.navigation.activation.navigationType, "traverse");
+}, "navigation.activation after traverse");
+</script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-dynamic-url-censored.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-dynamic-url-censored.html
index 7a5544c4196be..f16f828220592 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-dynamic-url-censored.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-dynamic-url-censored.html
@@ -12,6 +12,7 @@
   i.contentWindow.navigation.navigate("/common/blank.html?2");
   await new Promise(r => i.onload = () => t.step_timeout(r, 0));
   assert_not_equals(i.contentWindow.navigation.entries()[0].url, null);
+  assert_not_equals(i.contentWindow.navigation.activation.from.url, null);
 
   // Apply no-referrer, the url should now be censored when no longer on that document.
   i.contentWindow.navigation.back();
@@ -21,6 +22,7 @@
   i.contentWindow.navigation.forward();
   await new Promise(r => i.onload = () => t.step_timeout(r, 0));
   assert_equals(i.contentWindow.navigation.entries()[0].url, null);
+  assert_equals(i.contentWindow.navigation.activation.from.url, null);
 
   // Overwrite the referrer policy, the url should be visible again.
   i.contentWindow.navigation.back();
@@ -29,5 +31,6 @@
   i.contentWindow.navigation.forward();
   await new Promise(r => i.onload = () => t.step_timeout(r, 0));
   assert_not_equals(i.contentWindow.navigation.entries()[0].url, null);
+  assert_not_equals(i.contentWindow.navigation.activation.from.url, null);
 }, "The url of a document is censored by a no-referrer policy dynamically");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html
index fc563f509e79c..6e759d595d240 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-from-meta-url-censored.html
@@ -18,6 +18,7 @@
   assert_equals(i.contentWindow.navigation.currentEntry.index, 2);
   assert_equals(i.contentWindow.navigation.entries()[0].url, null);
   assert_equals(i.contentWindow.navigation.entries()[1].url, null);
+  assert_equals(i.contentWindow.navigation.activation.from.url, null);
 
   // Navigating back to no-referrer.html should uncensor the urls.
   i.contentWindow.navigation.back();
@@ -28,5 +29,7 @@
                 "/navigation-api/navigation-history-entry/resources/no-referrer-meta.html");
   assert_equals(new URL(i.contentWindow.navigation.entries()[1].url).pathname,
                 "/navigation-api/navigation-history-entry/resources/no-referrer-meta.html");
+  assert_equals(new URL(i.contentWindow.navigation.activation.entry.url).pathname,
+                "/navigation-api/navigation-history-entry/resources/no-referrer-meta.html");
 }, "The url of a document with no-referrer referrer meta tag is censored in NavigationHistoryEntry");
 </script>
diff --git a/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html b/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html
index e7eb1afc7d1d2..e88d4453db3ed 100644
--- a/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html
+++ b/testing/web-platform/tests/navigation-api/navigation-history-entry/no-referrer-url-censored.html
@@ -18,6 +18,7 @@
   assert_equals(i.contentWindow.navigation.currentEntry.index, 2);
   assert_equals(i.contentWindow.navigation.entries()[0].url, null);
   assert_equals(i.contentWindow.navigation.entries()[1].url, null);
+  assert_equals(i.contentWindow.navigation.activation.from.url, null);
 
   // Navigating back to no-referrer.html should uncensor the urls.
   i.contentWindow.navigation.back();
@@ -28,5 +29,7 @@
                 "/navigation-api/navigation-history-entry/resources/no-referrer.html");
   assert_equals(new URL(i.contentWindow.navigation.entries()[1].url).pathname,
                 "/navigation-api/navigation-history-entry/resources/no-referrer.html");
+  assert_equals(new URL(i.contentWindow.navigation.activation.entry.url).pathname,
+                "/navigation-api/navigation-history-entry/resources/no-referrer.html");
 }, "The url of a document with no-referrer referrer policy is censored in NavigationHistoryEntry");
 </script>