HTML5 Tracker

Diff (omit for latest revision)
Filter

Short URL: http://html5.org/r/7159

SVNBugCommentTime (UTC)
7159[Gecko] [Internet Explorer] [Opera] [Webkit] Turns out that browsers don't distinguish between the 'document's address' and the 'documents's current address', so we can merge them.2012-06-29 01:23
Index: source
===================================================================
--- source	(revision 7158)
+++ source	(revision 7159)
@@ -7362,6 +7362,7 @@
 
      <li><p>Let <var title="">fallback base url</var> be <span>the
      document's address</span>.</p></li>
+     <!-- http://www.hixie.ch/tests/adhoc/dom/level0/history/pushState/001/ -->
 
      <li>
 
@@ -8068,8 +8069,8 @@
     <p>Generate the <i>address of the resource from which Request-URIs
     are obtained</i> as required by HTTP for the <code
     title="http-referer">Referer</code> (sic) header from <span>the
-    document's current address</span> of <var title="">document</var>.
-    <a href="#refsHTTP">[HTTP]</a></p>
+    document's address</span> of <var title="">document</var>. <a
+    href="#refsHTTP">[HTTP]</a></p>
 
     <p>Remove any <span title="url-fragment">&lt;fragment&gt;</span>
     component from the generated <i>address of the resource from which
@@ -10018,19 +10019,22 @@
   href="#refsDOMCORE">[DOMCORE]</a></p>
 
   <p><dfn>The document's address</dfn> is an <span>absolute URL</span>
-  that is set when the <code>Document</code> is created. <dfn>The
-  document's current address</dfn> is an <span>absolute URL</span>
+  that is initially set when the <code>Document</code> is created but
   that can change during the lifetime of the <code>Document</code>,
   for example when the user <span title="navigate">navigates</span> to
   a <span title="navigate-fragid">fragment identifier</span> on the
   page or when the <code
   title="dom-history-pushState">pushState()</code> method is called
-  with a new <span>URL</span>. <span class="impl"><span>The document's
-  current address</span> must be set to <span>the document's
-  address</span> when the <code>Document</code> is created.</span></p>
+  with a new <span>URL</span>.</p>
+  <!--
+    http://www.hixie.ch/tests/adhoc/dom/level0/history/pushState/002/
+    http://www.hixie.ch/tests/adhoc/html/navigation/fragids/016.html
+  -->
 
-  <p class="note">Interactive user agents typically expose <span>the
-  document's current address</span> in their user interface.</p>
+  <p class="warning">Interactive user agents typically expose
+  <span>the document's address</span> in their user interface. This is
+  the primary mechanism by which a user can tell if a site is
+  attempting to impersonate another.</p>
 
   <p>When a <code>Document</code> is created by a <span
   title="concept-script">script</span> using the <code
@@ -10206,12 +10210,15 @@
 
    <dt><var title="">document</var> . <code title="dom-document-referrer">referrer</code></dt>
    <dd>
-    <p>Returns <span title="the document's current address">the
-    address</span> of the <code>Document</code> from which the user
-    navigated to this one, unless it was blocked or there was no such
-    document, in which case it returns the empty string.</p>
+
+    <p>Returns <span title="the document's address">the address</span>
+    of the <code>Document</code> from which the user navigated to this
+    one, unless it was blocked or there was no such document, in which
+    case it returns the empty string.</p>
+
     <p>The <code title="rel-noreferrer">noreferrer</code> link
     type can be used to block the referrer.</p>
+
    </dd>
 
   </dl>
@@ -10220,10 +10227,10 @@
 
   <p>The <dfn
   title="dom-document-referrer"><code>referrer</code></dfn> attribute
-  must return either the <span title="the document's current
-  address">current address</span> of the <span>active document</span>
-  of the <span>source browsing context</span> <em>at the time the
-  navigation was started</em> (that is, the page which <span
+  must return either the <span title="the document's
+  address">address</span> of the <span>active document</span> of the
+  <span>source browsing context</span> <em>at the time the navigation
+  was started</em> (that is, the page which <span
   title="navigate">navigated</span> the <span>browsing context</span>
   to the current document), with any <span
   title="url-fragment">&lt;fragment&gt;</span> component removed; or
@@ -68687,8 +68694,8 @@
 
    <dd>The request must include a <code
    title="http-referer">Referer</code> (sic) HTTP header with, as its
-   value, the <span title="the document's current address">current
-   address</span> of the document containing the hyperlink, a <code
+   value, the <span title="the document's address">address</span> of
+   the document containing the hyperlink, a <code
    title="http-ping-from">Ping-From</code> HTTP header with the same
    value, and a <code title="http-ping-to">Ping-To</code> HTTP header
    with, as its value, the address of the target of the
@@ -74018,8 +74025,8 @@
 
    <li><p><span>Add a vCard line</span> with the type "<code
    title="">SOURCE</code>" and the result of <span>escaping the vCard
-   text string</span> that is <span>the document's current
-   address</span> as the value to <var title="">output</var>.</p></li>
+   text string</span> that is <span>the document's address</span> as
+   the value to <var title="">output</var>.</p></li>
 
    <li><p>If <span>the <code>title</code> element</span> is not null,
    <span>add a vCard line</span> with the type "<code
@@ -79226,8 +79233,8 @@
 
    <li>
 
-    <p>Set <span>the document's current address</span> to <var
-    title="">new URL</var>.</p>
+    <p>Set <span>the document's 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
@@ -79404,11 +79411,11 @@
   </div>
 
   <p><code>Location</code> objects provide a representation of <span
-  title="the document's current address">their document's current
-  address</span>, and allow the <span>current entry</span> of the
-  <span>browsing context</span>'s session history to be changed, by
-  adding or replacing entries in the <code
-  title="dom-history">history</code> object.</p>
+  title="the document's address">their document's address</span>, and
+  allow the <span>current entry</span> of the <span>browsing
+  context</span>'s session history to be changed, by adding or
+  replacing entries in the <code title="dom-history">history</code>
+  object.</p>
 
   <pre class="idl">interface <dfn>Location</dfn> {
   stringifier attribute DOMString <span title="dom-location-href">href</span>;
@@ -79467,9 +79474,9 @@
   <div class="impl">
 
   <p>The <dfn title="dom-location-href"><code>href</code></dfn>
-  attribute must return <span title="the document's current
-  address">the current address</span> of the associated
-  <code>Document</code> object, as an <span>absolute URL</span>.</p>
+  attribute must return <span title="the document's address">the
+  address</span> of the associated <code>Document</code> object, as an
+  <span>absolute URL</span>.</p>
 
   <p>On setting, if the <code>Location</code> object's associated
   <code>Document</code> object has <span>completely loaded</span>,
@@ -79552,7 +79559,7 @@
    <dt>Otherwise</dt>
 
    <dd><p><span>Navigate</span><!--DONAV location.reload()--> the
-   <span>browsing context</span> to <span>the document's current
+   <span>browsing context</span> to <span>the document's
    address</span> with <span>replacement enabled</span>. The
    <span>source browsing context</span> must be the <span>browsing
    context</span> being navigated.</p></dd> <!-- it appears that
@@ -79591,14 +79598,13 @@
   class="impl">These must follow the rules given for <span>URL
   decomposition IDL attributes</span>, with the <span
   title="concept-uda-input">input</span> being <span title="the
-  document's current address">the current address</span> of the
-  associated <code>Document</code> object, as an <span>absolute
-  URL</span> (same as the <code title="dom-location-href">href</code>
-  attribute), and the <span title="concept-uda-setter">common setter
-  action</span> being the same as setting the <code
+  document's address">the address</span> of the associated
+  <code>Document</code> object, as an <span>absolute URL</span> (same
+  as the <code title="dom-location-href">href</code> attribute), and
+  the <span title="concept-uda-setter">common setter action</span>
+  being the same as setting the <code
   title="dom-location-href">href</code> attribute to the new output
-  value.</span></p>
-<!--TOPIC:HTML-->
+  value.</span></p> <!--TOPIC:HTML-->
 
 
 <!--ADD-TOPIC:Security-->
@@ -80389,10 +80395,10 @@
    these steps.</p></li>
 
    <li><p><span>Scroll to the fragment identifier</span> given in
-   <span>the document's current address</span>. If this fails to find
-   <span title="the indicated part of the document">an indicated part
-   of the document</span>, then return to the <i>fragment identifier
-   loop</i> step.</p></li>
+   <span>the document's address</span>. If this fails to find <span
+   title="the indicated part of the document">an indicated part of the
+   document</span>, then return to the <i>fragment identifier loop</i>
+   step.</p></li>
 
   </ol>
 
@@ -80775,7 +80781,7 @@
 
    <li><p><span>Traverse the history</span> to the new entry. This
    will <span>scroll to the fragment identifier</span> given in what
-   is now <span>the document's current address</span>.</p></li>
+   is now <span>the document's address</span>.</p></li>
 
   </ol>
 
@@ -80999,8 +81005,8 @@
 
    </li>
 
-   <li><p>Set <span>the document's current address</span> to the URL
-   of the <var title="">specified entry</var>.</p></li>
+   <li><p>Set <span>the document's address</span> to the URL of the
+   <var title="">specified entry</var>.</p></li>
 
    <li><p>If the <var title="">specified entry</var> has a URL whose
    fragment identifier differs from that of the <span>current
@@ -84428,8 +84434,8 @@
 
     <p class="example">When a script <span
     title="fetch">fetches</span> a resource, the <span title="the
-    document's current address">current address</span> of the
-    <span>script's document</span> will be used to set the <code
+    document's address">address</span> of the <span>script's
+    document</span> will be used to set the <code
     title="http-referer">Referer</code> (sic) header.</p>
 
    </dd>
@@ -91153,7 +91159,7 @@
      </tr>
      <tr>
       <td>Any other case</td>
-      <td>"<code title="">copy</code>", or, <span title="concept-platform-dropEffect-override">if appropriate</span>, either "<code title="">link</code>" or "<code title="">move</code>"</td></td>
+      <td>"<code title="">copy</code>", or, <span title="concept-platform-dropEffect-override">if appropriate</span>, either "<code title="">link</code>" or "<code title="">move</code>"</td>
      </tr>
     </table>
 
@@ -91680,7 +91686,7 @@
           <p>Otherwise, <span>fire a DND event</span> named <code
           title="event-dragenter">dragenter</code> at <var
           title="">new target</var>. Then, set the <span>current
-          target element</span> to <var title="">new target</var,
+          target element</span> to <var title="">new target</var>,
           regardless of whether that event was canceled or not.</p>
 
          </dd>
@@ -120146,7 +120152,7 @@
     <tr>
      <td> <code title="event-hashchange">hashchange</code>
      <td> <code>HashChangeEvent</code>
-     <td> Fired at the <code>Window</code> when the fragment identifier part of <span>the document's current address</span> changes
+     <td> Fired at the <code>Window</code> when the fragment identifier part of <span>the document's address</span> changes
 
     <tr>
      <td> <code title="event-input">input</code>

|