[giow] (2) Clarify that all session history entries have URLs really.

git-svn-id: http://svn.whatwg.org/webapps@6999 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Feb 15, 2012 · 1ebacb8 · 1ebacb8
1 parent 2a57bf2
commit 1ebacb8
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 49 deletions.
diff --git a/complete.html b/complete.html
@@ -63024,10 +63024,11 @@ <h4 id=the-session-history-of-browsing-contexts><span class=secno>6.4.1 </span>T
 
   <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 either a
-  <a href=#url>URL</a> or a <a href=#state-object>state object</a>, or both<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>
+  <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>
 
@@ -63081,8 +63082,11 @@ <h4 id=the-session-history-of-browsing-contexts><span class=secno>6.4.1 </span>T
 
   <hr><p>At any point, one of the entries in the session history is the
   <dfn id=current-entry>current entry</dfn>. This is the entry representing the
-  <a href=#active-document>active document</a> of the <a href=#browsing-context>browsing
-  context</a>. The <a href=#current-entry>current entry</a> is usually an entry
+  <a href=#active-document>active document</a> of the <a href=#browsing-context>browsing context</a>.
+  Which entry is the <a href=#current-entry>current entry</a> is changed by the
+  algorithms defined in this specification, e.g. during <a href=#traverse-the-history title="traverse the history">session history traversal</a>.</p>
+
+  <p class=note>The <a href=#current-entry>current entry</a> is usually an entry
   for the <a href=#dom-location-href title=dom-location-href>location</a> of the
   <code><a href=#document>Document</a></code>. However, it can also be one of the entries
   for <a href=#state-object title="state object">state objects</a> added to the
@@ -63357,13 +63361,21 @@ <h4 id=the-history-interface><span class=secno>6.4.2 </span>The <code><a href=#h
      these steps. (This prevents sandboxed content from spoofing other
      pages on the same origin.)</li>
 
+     <li><p>Let <var title="">new URL</var> be the resulting
+     <a href=#absolute-url>absolute URL</a>.</li>
+
     </ol><p>For the purposes of the comparisons in the above substeps, the
     <a href=#url-path title=url-path>&lt;path&gt;</a> and <a href=#url-query title=url-query>&lt;query&gt;</a> components can only be the
     same if the URLs are both <a href=#hierarchical-url title="hierarchical
     URL">hierarchical URLs</a>.</p>
 
    </li>
 
+   <li>
+
+    <p>If a third argument is <em>not</em> specified, then let <var title="">new URL</var> be the <a href=#url>URL</a> of the
+    <a href=#current-entry>current entry</a>.</p>
+
    <li>
 
     <p>If the method invoked was the <code title=dom-history-pushState><a href=#dom-history-pushstate>pushState()</a></code> method:</p>
@@ -63392,9 +63404,7 @@ <h4 id=the-history-interface><span class=secno>6.4.2 </span>The <code><a href=#h
 
      <li><p>Add a <a href=#state-object>state object</a> entry to the session
      history, after the <a href=#current-entry>current entry</a>, with <var title="">cloned data</var> as the <a href=#state-object>state object</a>, the
-     given <var title="">title</var> as the title, and, if the third
-     argument is present, the <a href=#absolute-url>absolute URL</a> that was found
-     earlier in this algorithm as the <a href=#url>URL</a> of the
+     given <var title="">title</var> as the title, and <var title="">new URL</var> as the <a href=#url>URL</a> of the
      entry.</li>
 
      <li><p>Update the <a href=#current-entry>current entry</a> to be this newly
@@ -63405,9 +63415,8 @@ <h4 id=the-history-interface><span class=secno>6.4.2 </span>The <code><a href=#h
     <ol><li><p>Update the <a href=#current-entry>current entry</a> in the session
      history so that <var title="">cloned data</var> is the entry's
      new state object, the given <var title="">title</var> is the new
-     title, and, if the third argument is present, the <a href=#absolute-url>absolute
-     URL</a> that was found earlier in this algorithm is the
-     entry's new <a href=#url>URL</a>.</li>
+     title, and <var title="">new URL</var> is the entry's new
+     <a href=#url>URL</a>.</li>
 
     </ol></li>
 
@@ -63419,9 +63428,7 @@ <h4 id=the-history-interface><span class=secno>6.4.2 </span>The <code><a href=#h
 
    <li>
 
-    <p>If the third argument is present, set <a href="#the-document's-current-address">the document's
-    current address</a> to the <a href=#absolute-url>absolute URL</a> that was
-    found earlier in this algorithm.</p>
+    <p>Set <a href="#the-document's-current-address">the document's current address</a> to <var title="">new URL</var>.</p>
 
     <p class=note>Since this is neither a <a href=#navigate title=navigate>navigation</a> of the <a href=#browsing-context>browsing
     context</a> nor a <a href=#traverse-the-history title="traverse the history">history
@@ -63455,7 +63462,6 @@ <h4 id=the-history-interface><span class=secno>6.4.2 </span>The <code><a href=#h
   that <code><a href=#document>Document</a></code> object in the session history after
   having added the new entry. (Thus the state history acts as a FIFO
   buffer for eviction, but as a LIFO buffer for navigation.)</p>
-<!--TOPIC:HTML-->
 
   </div>
 

diff --git a/index b/index
@@ -63024,10 +63024,11 @@ x === this; // true</pre>
 
   <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 either a
-  <a href=#url>URL</a> or a <a href=#state-object>state object</a>, or both<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>
+  <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>
 
@@ -63081,8 +63082,11 @@ x === this; // true</pre>
 
   <hr><p>At any point, one of the entries in the session history is the
   <dfn id=current-entry>current entry</dfn>. This is the entry representing the
-  <a href=#active-document>active document</a> of the <a href=#browsing-context>browsing
-  context</a>. The <a href=#current-entry>current entry</a> is usually an entry
+  <a href=#active-document>active document</a> of the <a href=#browsing-context>browsing context</a>.
+  Which entry is the <a href=#current-entry>current entry</a> is changed by the
+  algorithms defined in this specification, e.g. during <a href=#traverse-the-history title="traverse the history">session history traversal</a>.</p>
+
+  <p class=note>The <a href=#current-entry>current entry</a> is usually an entry
   for the <a href=#dom-location-href title=dom-location-href>location</a> of the
   <code><a href=#document>Document</a></code>. However, it can also be one of the entries
   for <a href=#state-object title="state object">state objects</a> added to the
@@ -63357,13 +63361,21 @@ x === this; // true</pre>
      these steps. (This prevents sandboxed content from spoofing other
      pages on the same origin.)</li>
 
+     <li><p>Let <var title="">new URL</var> be the resulting
+     <a href=#absolute-url>absolute URL</a>.</li>
+
     </ol><p>For the purposes of the comparisons in the above substeps, the
     <a href=#url-path title=url-path>&lt;path&gt;</a> and <a href=#url-query title=url-query>&lt;query&gt;</a> components can only be the
     same if the URLs are both <a href=#hierarchical-url title="hierarchical
     URL">hierarchical URLs</a>.</p>
 
    </li>
 
+   <li>
+
+    <p>If a third argument is <em>not</em> specified, then let <var title="">new URL</var> be the <a href=#url>URL</a> of the
+    <a href=#current-entry>current entry</a>.</p>
+
    <li>
 
     <p>If the method invoked was the <code title=dom-history-pushState><a href=#dom-history-pushstate>pushState()</a></code> method:</p>
@@ -63392,9 +63404,7 @@ x === this; // true</pre>
 
      <li><p>Add a <a href=#state-object>state object</a> entry to the session
      history, after the <a href=#current-entry>current entry</a>, with <var title="">cloned data</var> as the <a href=#state-object>state object</a>, the
-     given <var title="">title</var> as the title, and, if the third
-     argument is present, the <a href=#absolute-url>absolute URL</a> that was found
-     earlier in this algorithm as the <a href=#url>URL</a> of the
+     given <var title="">title</var> as the title, and <var title="">new URL</var> as the <a href=#url>URL</a> of the
      entry.</li>
 
      <li><p>Update the <a href=#current-entry>current entry</a> to be this newly
@@ -63405,9 +63415,8 @@ x === this; // true</pre>
     <ol><li><p>Update the <a href=#current-entry>current entry</a> in the session
      history so that <var title="">cloned data</var> is the entry's
      new state object, the given <var title="">title</var> is the new
-     title, and, if the third argument is present, the <a href=#absolute-url>absolute
-     URL</a> that was found earlier in this algorithm is the
-     entry's new <a href=#url>URL</a>.</li>
+     title, and <var title="">new URL</var> is the entry's new
+     <a href=#url>URL</a>.</li>
 
     </ol></li>
 
@@ -63419,9 +63428,7 @@ x === this; // true</pre>
 
    <li>
 
-    <p>If the third argument is present, set <a href="#the-document's-current-address">the document's
-    current address</a> to the <a href=#absolute-url>absolute URL</a> that was
-    found earlier in this algorithm.</p>
+    <p>Set <a href="#the-document's-current-address">the document's current address</a> to <var title="">new URL</var>.</p>
 
     <p class=note>Since this is neither a <a href=#navigate title=navigate>navigation</a> of the <a href=#browsing-context>browsing
     context</a> nor a <a href=#traverse-the-history title="traverse the history">history
@@ -63455,7 +63462,6 @@ x === this; // true</pre>
   that <code><a href=#document>Document</a></code> object in the session history after
   having added the new entry. (Thus the state history acts as a FIFO
   buffer for eviction, but as a LIFO buffer for navigation.)</p>
-<!--TOPIC:HTML-->
 
   </div>
 

diff --git a/source b/source
@@ -73729,11 +73729,11 @@ x === this; // true</pre>
   <p><code>History</code> objects represent their <span>browsing
   context</span>'s session history as a flat list of <span
   title="session history entry">session history entries</span>. Each
-  <dfn>session history entry</dfn> consists of either a
-  <span>URL</span> or a <span>state object</span>, or both<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>
+  <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">
 
@@ -73792,8 +73792,12 @@ x === this; // true</pre>
 
   <p>At any point, one of the entries in the session history is the
   <dfn>current entry</dfn>. This is the entry representing the
-  <span>active document</span> of the <span>browsing
-  context</span>. The <span>current entry</span> is usually an entry
+  <span>active document</span> of the <span>browsing context</span>.
+  Which entry is the <span>current entry</span> is changed by the
+  algorithms defined in this specification, e.g. during <span
+  title="traverse the history">session history traversal</span>.</p>
+
+  <p class="note">The <span>current entry</span> is usually an entry
   for the <span title="dom-location-href">location</span> of the
   <code>Document</code>. However, it can also be one of the entries
   for <span title="state object">state objects</span> added to the
@@ -74107,6 +74111,9 @@ x === this; // true</pre>
      these steps. (This prevents sandboxed content from spoofing other
      pages on the same origin.)</li>
 
+     <li><p>Let <var title="">new URL</var> be the resulting
+     <span>absolute URL</span>.</p></li>
+
     </ol>
 
     <p>For the purposes of the comparisons in the above substeps, the
@@ -74117,6 +74124,12 @@ x === this; // true</pre>
 
    </li>
 
+   <li>
+
+    <p>If a third argument is <em>not</em> specified, then let <var
+    title="">new URL</var> be the <span>URL</span> of the
+    <span>current entry</span>.</p>
+
    <li>
 
     <p>If the method invoked was the <code
@@ -74149,9 +74162,8 @@ x === this; // true</pre>
      <li><p>Add a <span>state object</span> entry to the session
      history, after the <span>current entry</span>, with <var
      title="">cloned data</var> as the <span>state object</span>, the
-     given <var title="">title</var> as the title, and, if the third
-     argument is present, the <span>absolute URL</span> that was found
-     earlier in this algorithm as the <span>URL</span> of the
+     given <var title="">title</var> as the title, and <var
+     title="">new URL</var> as the <span>URL</span> of the
      entry.</p></li>
 
      <li><p>Update the <span>current entry</span> to be this newly
@@ -74167,9 +74179,8 @@ x === this; // true</pre>
      <li><p>Update the <span>current entry</span> in the session
      history so that <var title="">cloned data</var> is the entry's
      new state object, the given <var title="">title</var> is the new
-     title, and, if the third argument is present, the <span>absolute
-     URL</span> that was found earlier in this algorithm is the
-     entry's new <span>URL</span>.</p></li>
+     title, and <var title="">new URL</var> is the entry's new
+     <span>URL</span>.</p></li>
 
     </ol>
 
@@ -74183,9 +74194,8 @@ x === this; // true</pre>
 
    <li>
 
-    <p>If the third argument is present, set <span>the document's
-    current address</span> to the <span>absolute URL</span> that was
-    found earlier in this algorithm.</p>
+    <p>Set <span>the document's current address</span> to <var
+    title="">new URL</var>.</p>
 
     <p class="note">Since this is neither a <span
     title="navigate">navigation</span> of the <span>browsing
@@ -74223,7 +74233,6 @@ x === this; // true</pre>
   that <code>Document</code> object in the session history after
   having added the new entry. (Thus the state history acts as a FIFO
   buffer for eviction, but as a LIFO buffer for navigation.)</p>
-<!--TOPIC:HTML-->
 
   </div>