Skip to content

Commit

Permalink
Make client refer to an environment settings object rather than a Jav…
Browse files Browse the repository at this point in the history
…aScript global environment

See https://www.w3.org/Bugs/Public/show_bug.cgi?id=26836 for context.

Client itself might be renamed later on.
  • Loading branch information
annevk committed Oct 13, 2014
1 parent fef58a7 commit 88b1117
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions Overview.html
Expand Up @@ -432,8 +432,8 @@ <h4 id="requests"><span class="secno">2.1.4 </span>Requests</h4>
<hr>

<p>A <a href="#concept-request" title="concept-request">request</a> has an associated
<dfn id="concept-request-client" title="concept-request-client">client</dfn> (a
<a class="external" href="https://html.spec.whatwg.org/multipage/infrastructure.html#javascript-global-environment">JavaScript global environment</a>).
<dfn id="concept-request-client" title="concept-request-client">client</dfn> (an
<a class="external" href="https://html.spec.whatwg.org/multipage/webappapis.html#environment-settings-object">environment settings object</a>).

<p>A <a href="#concept-request" title="concept-request">request</a> has an associated
<dfn id="skip-service-worker-flag">skip service worker flag</dfn>. Unless stated otherwise it is unset.
Expand Down Expand Up @@ -1396,9 +1396,11 @@ <h3 id="http-fetch"><span class="secno">4.2 </span>HTTP fetch</h3>

<li>
<p>If <var title="">request</var>'s <a href="#skip-service-worker-flag">skip service worker flag</a> is unset and
<var title="">request</var>'s <a href="#concept-request-client" title="concept-request-client">client</a> is not a
<span>service worker environment</span>, run these substeps:
<var title="">request</var>'s <a href="#concept-request-client" title="concept-request-client">client</a>'s
<a class="external" href="https://html.spec.whatwg.org/multipage/webappapis.html#global-object">global object</a> is not a
<code class="external"><a href="https://slightlyoff.github.io/ServiceWorker/spec/service_worker/#service-worker-global-scope-interface">ServiceWorkerGlobalScope</a></code> object, run these substeps:
<a href="#refsHTML">[HTML]</a>
<a href="#refsSW">[SW]</a>

<ol>
<li><p>Set <var title="">response</var> to the result of invoking
Expand Down Expand Up @@ -1793,7 +1795,7 @@ <h3 id="http-network-or-cache-fetch"><span class="secno">4.3 </span>HTTP network
<var title="">request</var>, modify <var title="">HTTPRequest</var>'s
<a href="#concept-request-header-list" title="concept-request-header-list">header list</a> with resume
<a href="#concept-header" title="concept-header">headers</a>.
<!-- XXX xref modify, resume headers -->
<!-- XXX xref partial, modify, resume headers -->

<li>If <var title="">response</var> is null and <var title="">request</var>'s
<a href="#concept-request-cache-mode" title="concept-request-cache-mode">cache mode</a> is <i title="">offline</i>, return
Expand Down Expand Up @@ -2731,8 +2733,7 @@ <h3 id="request-class"><span class="secno">5.3 </span>Request class</h3>
readonly attribute ByteString <a href="#dom-request-method" title="dom-Request-method">method</a>;
readonly attribute USVString <a href="#dom-request-url" title="dom-Request-url">url</a>;
readonly attribute <a href="#headers">Headers</a> <a href="#dom-request-headers" title="dom-Request-headers">headers</a>;
<!--
readonly attribute XXX <span title=dom-Request-client>client</span>-->

readonly attribute <a href="#requestcontext">RequestContext</a> <a href="#dom-request-context" title="dom-Request-context">context</a>;<!--
readonly attribute DOMString <span title=dom-Request-origin>origin</span>;-->
readonly attribute DOMString <a href="#dom-request-referrer" title="dom-Request-referrer">referrer</a>;<!--
Expand Down Expand Up @@ -2814,8 +2815,7 @@ <h3 id="request-class"><span class="secno">5.3 </span>Request class</h3>
<a href="#concept-request-body" title="concept-request-body">body</a> is <var title="">request</var>'s
<a href="#concept-request-body" title="concept-request-body">body</a>,
<a href="#concept-request-client" title="concept-request-client">client</a> is
<a class="external" href="https://html.spec.whatwg.org/multipage/webappapis.html#entry-settings-object">entry settings object</a>'s
<a class="external" href="https://html.spec.whatwg.org/multipage/webappapis.html#global-object">global object</a>,
<a class="external" href="https://html.spec.whatwg.org/multipage/webappapis.html#entry-settings-object">entry settings object</a>,
<a href="#concept-request-origin" title="concept-request-origin">origin</a> is
<a class="external" href="https://html.spec.whatwg.org/multipage/webappapis.html#entry-settings-object">entry settings object</a>'s
<a class="external" href="https://html.spec.whatwg.org/multipage/browsers.html#origin">origin</a>,
Expand Down
18 changes: 9 additions & 9 deletions Overview.src.html
Expand Up @@ -387,8 +387,8 @@ <h4>Requests</h4>
<hr>

<p>A <span title=concept-request>request</span> has an associated
<dfn title=concept-request-client>client</dfn> (a
<span data-anolis-spec=html>JavaScript global environment</span>).
<dfn title=concept-request-client>client</dfn> (an
<span data-anolis-spec=html>environment settings object</span>).

<p>A <span title=concept-request>request</span> has an associated
<dfn>skip service worker flag</dfn>. Unless stated otherwise it is unset.
Expand Down Expand Up @@ -1351,9 +1351,11 @@ <h3>HTTP fetch</h3>

<li>
<p>If <var title>request</var>'s <span>skip service worker flag</span> is unset and
<var title>request</var>'s <span title=concept-request-client>client</span> is not a
<span>service worker environment</span>, run these substeps:
<var title>request</var>'s <span title=concept-request-client>client</span>'s
<span data-anolis-spec=html>global object</span> is not a
<code data-anolis-spec=sw>ServiceWorkerGlobalScope</code> object, run these substeps:
<span data-anolis-ref>HTML</span>
<span data-anolis-ref>SW</span>

<ol>
<li><p>Set <var title>response</var> to the result of invoking
Expand Down Expand Up @@ -1748,7 +1750,7 @@ <h3>HTTP network or cache fetch</h3>
<var title>request</var>, modify <var title>HTTPRequest</var>'s
<span title=concept-request-header-list>header list</span> with resume
<span title=concept-header>headers</span>.
<!-- XXX xref modify, resume headers -->
<!-- XXX xref partial, modify, resume headers -->

<li>If <var title>response</var> is null and <var title>request</var>'s
<span title=concept-request-cache-mode>cache mode</span> is <i title>offline</i>, return
Expand Down Expand Up @@ -2686,8 +2688,7 @@ <h3>Request class</h3>
readonly attribute ByteString <span title=dom-Request-method>method</span>;
readonly attribute USVString <span title=dom-Request-url>url</span>;
readonly attribute <span>Headers</span> <span title=dom-Request-headers>headers</span>;
<!--
readonly attribute XXX <span title=dom-Request-client>client</span>-->

readonly attribute <span>RequestContext</span> <span title=dom-Request-context>context</span>;<!--
readonly attribute DOMString <span title=dom-Request-origin>origin</span>;-->
readonly attribute DOMString <span title=dom-Request-referrer>referrer</span>;<!--
Expand Down Expand Up @@ -2769,8 +2770,7 @@ <h3>Request class</h3>
<span title=concept-request-body>body</span> is <var title>request</var>'s
<span title=concept-request-body>body</span>,
<span title=concept-request-client>client</span> is
<span data-anolis-spec=html>entry settings object</span>'s
<span data-anolis-spec=html>global object</span>,
<span data-anolis-spec=html>entry settings object</span>,
<span title=concept-request-origin>origin</span> is
<span data-anolis-spec=html>entry settings object</span>'s
<span data-anolis-spec=html>origin</span>,
Expand Down

0 comments on commit 88b1117

Please sign in to comment.