From 572fb3df5db2ff805256d774a318891b64a7c032 Mon Sep 17 00:00:00 2001
From: Matt Falkenhagen <falken@chromium.org>
Date: Fri, 31 Aug 2018 17:58:39 +0900
Subject: [PATCH] review comments

---
 source | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/source b/source
index 8c4a7134f89..9b28a51e812 100644
--- a/source
+++ b/source
@@ -2833,13 +2833,12 @@ a.setAttribute('href', 'https://example.com/'); // change the content attribute
       data-x-href="https://fetch.spec.whatwg.org/#concept-request">request</dfn> and its associated:
       <ul class="brief">
        <li><dfn data-x="concept-request-url" data-x-href="https://fetch.spec.whatwg.org/#concept-request-url">url</dfn></li>
-       <li><dfn data-x="concept-request-url-list" data-x-href="https://fetch.spec.whatwg.org/#concept-request-url-list">url list</dfn></li>
        <li><dfn data-x="concept-request-method" data-x-href="https://fetch.spec.whatwg.org/#concept-request-method">method</dfn></li>
        <li><dfn data-x="concept-request-header-list" data-x-href="https://fetch.spec.whatwg.org/#concept-request-header-list">header list</dfn></li>
        <li><dfn data-x="concept-request-body" data-x-href="https://fetch.spec.whatwg.org/#concept-request-body">body</dfn></li>
        <li><dfn data-x="concept-request-client" data-x-href="https://fetch.spec.whatwg.org/#concept-request-client">client</dfn></li>
        <li><dfn data-x="concept-request-clone" data-x-href="https://fetch.spec.whatwg.org/#concept-request-clone">clone</dfn></li>
-       <li><dfn data-x="concept-request-current-url" data-x-href="https://fetch.spec.whatwg.org/#concept-request-current-url">current url</dfn></li>
+       <li><dfn data-x="concept-request-current-url" data-x-href="https://fetch.spec.whatwg.org/#concept-request-current-url">current URL</dfn></li>
        <li><dfn data-x="concept-request-reserved-client" data-x-href="https://fetch.spec.whatwg.org/#concept-request-reserved-client">reserved client</dfn></li>
        <li><dfn data-x="concept-request-replaces-client-id" data-x-href="https://fetch.spec.whatwg.org/#concept-request-replaces-client-id">replaces client id</dfn></li>
        <li><dfn data-x="concept-request-initiator" data-x-href="https://fetch.spec.whatwg.org/#concept-request-initiator">initiator</dfn></li>
@@ -82121,20 +82120,17 @@ interface <dfn>Location</dfn> { // but see also <a href="#the-location-interface
 
    <li><p>Let <var>done</var> be false and <var>reservedEnvironment</var> be null.</p></li>
 
-   <li><p>Repeat the following steps until <var>done</var> is true:</p>
-
+   <li>
+    <p>Repeat the following steps while <var>done</var> is false:</p>
     <ol>
-     <li><p>Let <var>newRequest</var> be a <span data-x="concept-request-clone">clone</span> of
-     <var>request</var>.</li>
-
-     <li><p>If <var>response</var> is not null, append <var>response</var>'s <span
-     data-x="concept-response-location-url">location URL</span> to <var>newRequest</var>'s
-     <span data-x="concept-request-url-list">url list.</span></p></li>
+     <li><p>Let <var>currentUrl</var> be <var>response</var>'s <span
+     data-x="concept-response-location-url">location URL</span> if <var>response</var> is not null
+     or <var>request</var>'s <span data-x="concept-request-current-url">current url</span>
+     otherwise.</p></li>
 
      <li>
-      <p>If <var>reservedEnvironment</var> is not null, and <var>newRequest's</var>
-      <span data-x="concept-request-current-url">current url</span> does not have the
-      <span>same origin</span> as <var>reservedEnvironment</var>'s <span
+      <p>If <var>reservedEnvironment</var> is not null, and <var>currentUrl</var>
+      does not have the <span>same origin</span> as <var>reservedEnvironment</var>'s <span
       data-x="concept-environment-creation-url">creation URL</span>, then:</p>
 
       <ol>
@@ -82145,16 +82141,15 @@ interface <dfn>Location</dfn> { // but see also <a href="#the-location-interface
       </ol>
      </li>
 
-     <li><p>If <var>reservedEnvironment</var> is null, let <var>reservedEnvironment</var> be a new
-     <span>environment</span>, and set its <span data-x="concept-environment-id">id</span> to a new
-     unique opaque string, and its <span
-     data-x="concept-environment-target-browsing-context">target browsing context</span> to
+     <li><p>If <var>reservedEnvironment</var> is null, then set <var>reservedEnvironment</var> to a
+     new <span>environment</span> whose <span data-x="concept-environment-id">id</span> is
+     unique opaque string and <span
+     data-x="concept-environment-target-browsing-context">target browsing context</span> is
      <var>browsingContext</var>.</p></li>
 
      <li>
       <p>Set <var>reservedEnvironment</var>'s <span
-      data-x="concept-environment-creation-url">creation URL</span> to <var>newRequest</var>'s
-      <span data-x="concept-request-current-url">current url</span>.</p>
+      data-x="concept-environment-creation-url">creation URL</span> to <var>currentUrl</var>.</p>
 
       <p class="note">The created environment's <span
       data-x="concept-environment-active-service-worker">active service worker</span> is set in the
@@ -82165,13 +82160,14 @@ interface <dfn>Location</dfn> { // but see also <a href="#the-location-interface
      <li><p>Set <var>request</var>'s <span data-x="concept-request-reserved-client">reserved
      client</span> to <var>reservedEnvironment</var>.</p></li>
 
-     <li><p>If the <span>Should navigation request of type from source in target be blocked by Content
-     Security Policy?</span> algorithm returns "<code data-x="">Blocked</code>" when executed upon
-     <var>newRequest</var>, <var>navigationType</var>, <var>sourceBrowsingContext</var>, and
-     <var>browsingContext</var>, then set <var>response</var> to a network error, and set
-     <var>done</var> to true. <ref spec="CSP"></p></li>
+     <li><p>If the <span>Should navigation request of type from source in target be blocked by
+     Content Security Policy?</span> algorithm returns "<code data-x="">Blocked</code>" when
+     executed upon <var>request</var>, <var>navigationType</var>, <var>sourceBrowsingContext</var>,
+     and <var>browsingContext</var>, then set <var>response</var> to a <span>network error</span>
+     and set <var>done</var> to true. <ref spec="CSP"></p></li>
 
-     <li><p>Otherwise:</p>
+     <li>
+      <p>Otherwise:</p>
       <ol>
        <li><p>If <var>response</var> is null, <!--FETCH--><span
        data-x="concept-fetch">fetch</span> <var>request</var>.</p></li>