Simplify per code review, also for history

Author: domenic

source

@@ -80199,10 +80199,9 @@ interface <dfn interface>VisibilityStateEntry</dfn> : <span>PerformanceEntry</sp
    activated), or negative infinity (indicating that the activation has been <span data-x="consume
    user activation">consumed</span>). Initially positive infinity.</p></li>
 
-   <li><p>A <dfn>last history-action activation timestamp</dfn>, which is either a
-   <code>DOMHighResTimeStamp</code> or positive infinity, initially positive infinity.</p></li>
+   <li><p>A <dfn>has history-action activation</dfn> boolean, initially false.</p></li>
 
-   <li><p>A <dfn>sticky activation override</dfn>, a boolean, initially false.</p></li>
+   <li><p>A <dfn>has sticky activation</dfn> boolean, initially false.</p></li>
   </ul>
 
   <p>A user agent also defines a <dfn>transient activation duration</dfn>, which is a constant
@@ -80218,10 +80217,8 @@ interface <dfn interface>VisibilityStateEntry</dfn> : <span>PerformanceEntry</sp
   <dl>
    <dt><dfn export>Sticky activation</dfn></dt>
    <dd>
-    <p>When the <span>current high resolution time</span> given <var>W</var> is greater than or
-    equal to the <span>last activation timestamp</span> in <var>W</var>, or <var>W</var>'s
-    <span>sticky activation override</span> is true, <var>W</var> is said to have <span>sticky
-    activation</span>.</p>
+    <p>When <var>W</var>'s <span>has sticky activation</span> is true, <var>W</var> is said to have
+    <span>sticky activation</span>.</p>
 
     <p>This is <var>W</var>'s historical activation state, indicating whether the user has ever
     interacted in <var>W</var>. It starts false, then changes to true (and never changes back to
@@ -80249,9 +80246,8 @@ interface <dfn interface>VisibilityStateEntry</dfn> : <span>PerformanceEntry</sp
 
    <dt><dfn>History-action activation</dfn></dt>
    <dd>
-    <p>When the <span>last history-action activation timestamp</span> of <var>W</var> is not equal
-    to the <span>last activation timestamp</span> of <var>W</var>, then <var>W</var> is said to have
-    <span>history-action activation</span>.</p>
+    <p>When <var>W</var>'s <span>has history-action activation</span> is true, then <var>W</var> is
+    said to have <span>history-action activation</span>.</p>
 
     <p>This is a special variant of user activation, used to allow access to certain session history
     APIs which, if used too frequently, would make it harder for the user to traverse back using <a
@@ -80264,16 +80260,15 @@ interface <dfn interface>VisibilityStateEntry</dfn> : <span>PerformanceEntry</sp
    </dd>
   </dl>
 
-  <p class="note">The <span>last activation timestamp</span> and <span>last history-action
-  activation timestamp</span> are retained even after the <code>Document</code> changes its
-  <span>fully active</span> status (e.g., after navigating away from a <code>Document</code>, or
-  navigating to a cached <code>Document</code>). This means <span>sticky activation</span> state
-  spans multiple navigations as long as the same <code>Document</code> gets reused. For the
-  transient activation state, the original <span data-x="activation-expiry">expiry</span> time
-  remains unchanged (i.e., the state still expires within the <span>transient activation
-  duration</span> limit from the original <span>activation triggering input event</span>). It is
-  important to consider this when deciding whether to base certain things off <span>sticky
-  activation</span> or <span>transient activation</span>.</p>
+  <p class="note" id="note-user-activation-and-navigation">The underlying values are retained even
+  after the <code>Document</code> changes its <span>fully active</span> status (e.g., after
+  navigating away from a <code>Document</code>, or navigating to a cached <code>Document</code>).
+  This means <span>sticky activation</span> and <span>history-action activation</span> spans
+  multiple navigations as long as the same <code>Document</code> gets reused. For the transient
+  activation state, the original <span data-x="activation-expiry">expiry</span> time remains
+  unchanged (i.e., the state still expires within the <span>transient activation duration</span>
+  limit from the original <span>activation triggering input event</span>). It is important to
+  consider this when deciding what type of activation to base certain things off of.</p>
 
   <h4 id="user-activation-processing-model">Processing model</h4>
 
@@ -80306,6 +80301,10 @@ interface <dfn interface>VisibilityStateEntry</dfn> : <span>PerformanceEntry</sp
      <li><p>Set <var>window</var>'s <span>last activation timestamp</span> to the <span>current
      high resolution time</span>.</p></li>
 
+     <li><p>Set <var>window</var>'s <span>has history-action activation</span> to true.</p></li>
+
+     <li><p>Set <var>window</var>'s <span>has sticky activation</span> to true.</p></li>
+
      <li><p><span>Notify the close watcher manager about user activation</span> given
      <var>window</var>.</p></li>
     </ol>
@@ -80373,8 +80372,7 @@ interface <dfn interface>VisibilityStateEntry</dfn> : <span>PerformanceEntry</sp
    <var>navigables</var>.</p></li>
 
    <li><p><span data-x="list iterate">For each</span> <var>window</var> in <var>windows</var>, set
-   <var>window</var>'s <span>last history-action activation timestamp</span> to <var>window</var>'s
-   <span>last activation timestamp</span>.</p></li>
+   <var>window</var>'s <span>has history-action activation</span> to false.</p></li>
   </ol>
 
   <p class="note">Note the asymmetry in the sets of <span data-x="browsing context">browsing
@@ -106378,8 +106376,8 @@ location.href = '#foo';</code></pre>
      <span>sticky activation</span>, and <var>navigable</var>'s <span data-x="nav-document">active
      document</span>'s <span data-x="concept-document-origin">origin</span> is <span>same
      origin</span> with <var>navigationParams</var>'s <span
-     data-x="navigation-params-origin">origin</span>, then set <var>window</var>'s <span>sticky
-     activation override</span> to true.</p></li>
+     data-x="navigation-params-origin">origin</span>, then set <var>window</var>'s <span>has sticky
+     activation</span> to true.</p></li>
     </ol>
 
     <p class="note">This is the usual case, where the new <code>Document</code> we're about to