Move browsing context to document state

Author: jakearchibald

source

@@ -82741,10 +82741,8 @@ interface <dfn>BarProp</dfn> {
     <dl>
      <dt><span data-x="she-url">URL</span></dt>
      <dd><var>document</var>'s <span data-x="concept-document-url">URL</span></dd>
-     <dt><span data-x="she-bc">browsing context</span></dt>
-     <dd><var>browsingContext</var></dd>
      <dt><span data-x="she-document-state">document state</span></dt>
-     <dd>A new <span>document state</span> with its <span data-x="document-state-document">document</span> set to <var>document</var></dd>
+     <dd>A new <span>document state</span> with its <span data-x="document-state-document">document</span> set to <var>document</var> and its <span data-x="document-state-bc">browsing context</span> set to <var>browsingContext</var>.</dd>
     </dl>
    </li>
 
@@ -83078,8 +83076,6 @@ interface <dfn>BarProp</dfn> {
 
    JAKE-TODO: The current spec doesn't handle srcdoc iframes. I think the best way to handle this is to change the above to a URL or a response, and srcdoc iframes set it to a response. This works well with "navigate" which accepts a response.
 
-   <li><p><dfn data-x="she-bc">browsing context</dfn>, a <span>browsing context</span></p></li>
-
    <li><p><dfn data-x="she-document-state">document state</dfn>, a <span>document state</span></p></li>
 
    <li><p><dfn data-x="she-serialized-state">serialized state</dfn>, which is <span>serialized
@@ -83123,9 +83119,11 @@ interface <dfn>BarProp</dfn> {
 
   <p>To get a <span>session history entry</span>'s <dfn data-x="she-document">document</dfn>, return its <span data-x="she-document-state">document state</span>'s <span data-x="document-state-document">document</span>.</p>
 
+  <p>To get a <span>session history entry</span>'s <dfn data-x="she-bc">browsing context</dfn>, return its <span data-x="she-document-state">document state</span>'s <span data-x="document-state-bc">browsing context</span>.</p>
+
   <p>JAKE-TODO: look out for things trying to set the above, and instead go via the document state.</p>
 
-  <p><dfn>Document state</dfn> holds state about a potential <code>Document</code>. It has:</p>
+  <p><dfn>Document state</dfn> holds state about how to present a <code>Document</code>. It has:</p>
 
   <ul>
    <li>
@@ -83134,6 +83132,8 @@ interface <dfn>BarProp</dfn> {
     <p class="note">Each history entry, when first created, has a <code>Document</code> in its <span data-x="she-document-state">document state</span>. However, when a <code>Document</code> is not <span data-x="fully active">active</span>, it's possible for it to be <span data-x="discard a Document">discarded</span> to free resources. The <span data-x="she-url">URL</span> and other data in the <span>session history entry</span> and <span data-x="she-document-state">document state</span> is then used to bring a new <code>Document</code> into being to take the place of the original, in the case where the user agent finds itself having to navigate to the entry.</p>
    </li>
 
+   <li><p>A <dfn data-x="document-state-bc">browsing context</dfn>, a <span>browsing context</span>.</p></li>
+
    <li><p><dfn data-x="document-state-nested-histories">Nested histories</dfn>, a <span>list</span> of <span data-x="nested history">nested histories</span>.</p></li>
   </ul>
 
@@ -86405,9 +86405,7 @@ new PaymentRequest(&hellip;); // Allowed to use
     <dl>
      <dt><span data-x="she-url">URL</span></dt>
      <dd><var>url</var></dd>
-     <dt><dfn data-x="she-bc">browsing context</dfn></dt>
-     <dd><var>navigable</var>'s <span data-x="nav-bc">current browsing context</span></dd>
-     <dt><dfn data-x="she-document-state">document state</dfn></dt>
+     <dt><span data-x="she-document-state">document state</span></dt>
      <dd><var>navigable</var>'s <span data-x="nav-current-history-entry">current session history entry</span>'s <span data-x="she-document-state">document state</span></dd>
     </dl>
    </li>