[e] (0) Rearrange how session history is defined.

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=23638 Affected topics: HTML git-svn-id: http://svn.whatwg.org/webapps@8291 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Nov 18, 2013 · 7cfb886 · 7cfb886
1 parent c4b1037
commit 7cfb886
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 85 deletions.
diff --git a/complete.html b/complete.html
@@ -65624,16 +65624,32 @@ <h3 id=sandboxing><span class=secno>6.4 </span>Sandboxing</h3>
   <h4 id=the-session-history-of-browsing-contexts><span class=secno>6.5.1 </span>The session history of browsing contexts</h4>
 
   <p>The sequence of <code><a href=#document>Document</a></code>s in a <a href=#browsing-context>browsing context</a> is its <dfn id=session-history>session
-  history</dfn>.</p>
+  history</dfn>. Each <a href=#browsing-context>browsing context</a>, including <a href=#nested-browsing-context title="nested browsing
+  context">nested browsing contexts</a>, has a distinct session history. A <a href=#browsing-context>browsing
+  context</a>'s session history consists of a flat list of <a href=#session-history-entry title="session history
+  entry">session history entries</a>. Each <dfn id=session-history-entry>session history entry</dfn> consists, at a
+  minimum, of a <a href=#url>URL</a>, and each entry may in addition have a <a href=#state-object>state object</a>, a
+  title, a <code><a href=#document>Document</a></code> object, form data, a scroll position, and other information
+  associated with it.</p>
+
+  <p class=note>Each entry, when first created, has a <code><a href=#document>Document</a></code>. However, when a
+  <code><a href=#document>Document</a></code> is not <a href=#fully-active title="fully active">active</a>, it's possible for it to be
+  <a href=#discard-a-document title="discard a Document">discarded</a> to free resources. The <a href=#url>URL</a> and
+  other data in a <a href=#session-history-entry>session history entry</a> is then used to bring a new
+  <code><a href=#document>Document</a></code> into being to take the place of the original, should the user agent find
+  itself having to reactivate that <code><a href=#document>Document</a></code>.</p>
 
-  <p><code><a href=#history-0>History</a></code> objects provide a representation of the pages in the session history of
-  <a href=#browsing-context title="browsing context">browsing contexts</a>. Each <a href=#browsing-context>browsing context</a>,
-  including <a href=#nested-browsing-context title="nested browsing context">nested browsing contexts</a>, has a distinct
-  session history.</p>
+  <p class=note>Titles associated with <a href=#session-history-entry title="session history entry">session history
+  entries</a> need not have any relation with the current <code><a href=#the-title-element>title</a></code> of the
+  <code><a href=#document>Document</a></code>. The title of a <a href=#session-history-entry>session history entry</a> is intended to explain
+  the state of the document at that point, so that the user can navigate the document's history.</p>
 
-  <p>Each <code><a href=#document>Document</a></code> object in a <a href=#browsing-context>browsing context</a>'s <a href=#session-history>session
-  history</a> is associated with a unique instance of the <code><a href=#history-0>History</a></code> object, although
-  they all must model the same underlying <a href=#session-history>session history</a>.</p>
+  <p>URLs without associated <a href=#state-object title="state object">state objects</a> are added to the
+  session history as the user (or script) navigates from page to page.</p>
+
+  <hr><p>Each <code><a href=#document>Document</a></code> object in a <a href=#browsing-context>browsing context</a>'s <a href=#session-history>session
+  history</a> is associated with a unique <code><a href=#history-0>History</a></code> object which must all model the
+  same underlying <a href=#session-history>session history</a>.</p>
 
   <div class=impl>
 
@@ -65643,27 +65659,7 @@ <h4 id=the-session-history-of-browsing-contexts><span class=secno>6.5.1 </span>T
 
   </div>
 
-  <p><code><a href=#history-0>History</a></code> objects represent their <a href=#browsing-context>browsing context</a>'s session history as
-  a flat list of <a href=#session-history-entry title="session history entry">session history entries</a>. Each
-  <dfn id=session-history-entry>session history entry</dfn> consists of a <a href=#url>URL</a> and optionally a <a href=#state-object>state
-  object</a><span class=impl>, and may in addition have a title, a <code><a href=#document>Document</a></code>
-  object, form data, a scroll position, and other information associated with it</span>.</p>
-
-  <div class=impl>
-
-  <p class=note>This does not imply that the user interface need be linear. See the <a href=#history-notes>notes below</a>.</p>
-
-  </div>
-
-  <p class=note>Titles associated with <a href=#session-history-entry title="session history entry">session history
-  entries</a> need not have any relation with the current <code><a href=#the-title-element>title</a></code> of the
-  <code><a href=#document>Document</a></code>. The title of a <a href=#session-history-entry>session history entry</a> is intended to explain
-  the state of the document at that point, so that the user can navigate the document's history.</p>
-
-  <p>URLs without associated <a href=#state-object title="state object">state objects</a> are added to the
-  session history as the user (or script) navigates from page to page.</p>
-
-  <p>A <dfn id=state-object>state object</dfn> is an object representing a user interface state.</p>
+  <hr><p>A <dfn id=state-object>state object</dfn> is an object representing a user interface state.</p>
 
   <p>Pages can <a href=#dom-history-pushstate title=dom-history-pushState>add</a> <a href=#state-object title="state object">state
   objects</a> to the session history. These are then <a href=#event-popstate title=event-popstate>returned to the

diff --git a/index b/index
@@ -65624,16 +65624,32 @@ x === this; // true</pre>
   <h4 id=the-session-history-of-browsing-contexts><span class=secno>6.5.1 </span>The session history of browsing contexts</h4>
 
   <p>The sequence of <code><a href=#document>Document</a></code>s in a <a href=#browsing-context>browsing context</a> is its <dfn id=session-history>session
-  history</dfn>.</p>
+  history</dfn>. Each <a href=#browsing-context>browsing context</a>, including <a href=#nested-browsing-context title="nested browsing
+  context">nested browsing contexts</a>, has a distinct session history. A <a href=#browsing-context>browsing
+  context</a>'s session history consists of a flat list of <a href=#session-history-entry title="session history
+  entry">session history entries</a>. Each <dfn id=session-history-entry>session history entry</dfn> consists, at a
+  minimum, of a <a href=#url>URL</a>, and each entry may in addition have a <a href=#state-object>state object</a>, a
+  title, a <code><a href=#document>Document</a></code> object, form data, a scroll position, and other information
+  associated with it.</p>
+
+  <p class=note>Each entry, when first created, has a <code><a href=#document>Document</a></code>. However, when a
+  <code><a href=#document>Document</a></code> is not <a href=#fully-active title="fully active">active</a>, it's possible for it to be
+  <a href=#discard-a-document title="discard a Document">discarded</a> to free resources. The <a href=#url>URL</a> and
+  other data in a <a href=#session-history-entry>session history entry</a> is then used to bring a new
+  <code><a href=#document>Document</a></code> into being to take the place of the original, should the user agent find
+  itself having to reactivate that <code><a href=#document>Document</a></code>.</p>
 
-  <p><code><a href=#history-0>History</a></code> objects provide a representation of the pages in the session history of
-  <a href=#browsing-context title="browsing context">browsing contexts</a>. Each <a href=#browsing-context>browsing context</a>,
-  including <a href=#nested-browsing-context title="nested browsing context">nested browsing contexts</a>, has a distinct
-  session history.</p>
+  <p class=note>Titles associated with <a href=#session-history-entry title="session history entry">session history
+  entries</a> need not have any relation with the current <code><a href=#the-title-element>title</a></code> of the
+  <code><a href=#document>Document</a></code>. The title of a <a href=#session-history-entry>session history entry</a> is intended to explain
+  the state of the document at that point, so that the user can navigate the document's history.</p>
 
-  <p>Each <code><a href=#document>Document</a></code> object in a <a href=#browsing-context>browsing context</a>'s <a href=#session-history>session
-  history</a> is associated with a unique instance of the <code><a href=#history-0>History</a></code> object, although
-  they all must model the same underlying <a href=#session-history>session history</a>.</p>
+  <p>URLs without associated <a href=#state-object title="state object">state objects</a> are added to the
+  session history as the user (or script) navigates from page to page.</p>
+
+  <hr><p>Each <code><a href=#document>Document</a></code> object in a <a href=#browsing-context>browsing context</a>'s <a href=#session-history>session
+  history</a> is associated with a unique <code><a href=#history-0>History</a></code> object which must all model the
+  same underlying <a href=#session-history>session history</a>.</p>
 
   <div class=impl>
 
@@ -65643,27 +65659,7 @@ x === this; // true</pre>
 
   </div>
 
-  <p><code><a href=#history-0>History</a></code> objects represent their <a href=#browsing-context>browsing context</a>'s session history as
-  a flat list of <a href=#session-history-entry title="session history entry">session history entries</a>. Each
-  <dfn id=session-history-entry>session history entry</dfn> consists of a <a href=#url>URL</a> and optionally a <a href=#state-object>state
-  object</a><span class=impl>, and may in addition have a title, a <code><a href=#document>Document</a></code>
-  object, form data, a scroll position, and other information associated with it</span>.</p>
-
-  <div class=impl>
-
-  <p class=note>This does not imply that the user interface need be linear. See the <a href=#history-notes>notes below</a>.</p>
-
-  </div>
-
-  <p class=note>Titles associated with <a href=#session-history-entry title="session history entry">session history
-  entries</a> need not have any relation with the current <code><a href=#the-title-element>title</a></code> of the
-  <code><a href=#document>Document</a></code>. The title of a <a href=#session-history-entry>session history entry</a> is intended to explain
-  the state of the document at that point, so that the user can navigate the document's history.</p>
-
-  <p>URLs without associated <a href=#state-object title="state object">state objects</a> are added to the
-  session history as the user (or script) navigates from page to page.</p>
-
-  <p>A <dfn id=state-object>state object</dfn> is an object representing a user interface state.</p>
+  <hr><p>A <dfn id=state-object>state object</dfn> is an object representing a user interface state.</p>
 
   <p>Pages can <a href=#dom-history-pushstate title=dom-history-pushState>add</a> <a href=#state-object title="state object">state
   objects</a> to the session history. These are then <a href=#event-popstate title=event-popstate>returned to the

diff --git a/source b/source
@@ -73090,16 +73090,34 @@ x === this; // true</pre>
   <h4>The session history of browsing contexts</h4>
 
   <p>The sequence of <code>Document</code>s in a <span>browsing context</span> is its <dfn>session
-  history</dfn>.</p>
+  history</dfn>. Each <span>browsing context</span>, including <span data-x="nested browsing
+  context">nested browsing contexts</span>, has a distinct session history. A <span>browsing
+  context</span>'s session history consists of a flat list of <span data-x="session history
+  entry">session history entries</span>. Each <dfn>session history entry</dfn> consists, at a
+  minimum, of a <span>URL</span>, and each entry may in addition have a <span>state object</span>, a
+  title, a <code>Document</code> object, form data, a scroll position, and other information
+  associated with it.</p>
+
+  <p class="note">Each entry, when first created, has a <code>Document</code>. 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>URL</span> and
+  other data in a <span>session history entry</span> is then used to bring a new
+  <code>Document</code> into being to take the place of the original, should the user agent find
+  itself having to reactivate that <code>Document</code>.</p>
 
-  <p><code>History</code> objects provide a representation of the pages in the session history of
-  <span data-x="browsing context">browsing contexts</span>. Each <span>browsing context</span>,
-  including <span data-x="nested browsing context">nested browsing contexts</span>, has a distinct
-  session history.</p>
+  <p class="note">Titles associated with <span data-x="session history entry">session history
+  entries</span> need not have any relation with the current <code>title</code> of the
+  <code>Document</code>. The title of a <span>session history entry</span> is intended to explain
+  the state of the document at that point, so that the user can navigate the document's history.</p>
+
+  <p>URLs without associated <span data-x="state object">state objects</span> are added to the
+  session history as the user (or script) navigates from page to page.</p>
+
+  <hr>
 
   <p>Each <code>Document</code> object in a <span>browsing context</span>'s <span>session
-  history</span> is associated with a unique instance of the <code>History</code> object, although
-  they all must model the same underlying <span>session history</span>.</p>
+  history</span> is associated with a unique <code>History</code> object which must all model the
+  same underlying <span>session history</span>.</p>
 
   <div class="impl">
 
@@ -73110,26 +73128,7 @@ x === this; // true</pre>
 
   </div>
 
-  <p><code>History</code> objects represent their <span>browsing context</span>'s session history as
-  a flat list of <span data-x="session history entry">session history entries</span>. Each
-  <dfn>session history entry</dfn> consists of a <span>URL</span> and optionally a <span>state
-  object</span><span class="impl">, and may in addition have a title, a <code>Document</code>
-  object, form data, a scroll position, and other information associated with it</span>.</p>
-
-  <div class="impl">
-
-  <p class="note">This does not imply that the user interface need be linear. See the <a
-  href="#history-notes">notes below</a>.</p>
-
-  </div>
-
-  <p class="note">Titles associated with <span data-x="session history entry">session history
-  entries</span> need not have any relation with the current <code>title</code> of the
-  <code>Document</code>. The title of a <span>session history entry</span> is intended to explain
-  the state of the document at that point, so that the user can navigate the document's history.</p>
-
-  <p>URLs without associated <span data-x="state object">state objects</span> are added to the
-  session history as the user (or script) navigates from page to page.</p>
+  <hr>
 
   <p>A <dfn>state object</dfn> is an object representing a user interface state.</p>