MIX: Fix a bug in 'passthrough'. h/t @annevk.

Author: mikewest

specs/mixedcontent/index.html

@@ -71,7 +71,7 @@
    <h1 class="p-name no-ref" id="title">Mixed Content</h1>
 
    <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft,
-    <time class="dt-updated" datetime="2015-08-09">9 August 2015</time></span></h2>
+    <time class="dt-updated" datetime="2015-08-11">11 August 2015</time></span></h2>
 
    <div data-fill-with="spec-metadata">
     <dl>
@@ -622,7 +622,7 @@ <h2 class="heading settled" data-level="4" id="strict-checking"><span class="sec
   the <code class="idl"><a data-link-type="idl" href="http://www.w3.org/TR/html5/dom.html#document">Document</a></code> is in <dfn data-dfn-type="dfn" data-noexport="" id="strict-mode">strict mode<a class="self-link" href="#strict-mode"></a></dfn>.</p>
 
 
-    <div class="example" id="example-f4c16b63"><a class="self-link" href="#example-f4c16b63"></a>
+    <div class="example" id="example-18c2d3f6"><a class="self-link" href="#example-18c2d3f6"></a>
     A <code class="idl"><a data-link-type="idl" href="http://www.w3.org/TR/html5/dom.html#document">Document</a></code> may opt itself into strict mode by either delivering a
     <code>Content-Security-Policy</code> HTTP header, like:
 
@@ -984,12 +984,12 @@ <h3 class="heading settled" data-level="5.2" id="is-passthrough"><span class="se
 
       <li>
         <var>request</var>’s <code>client</code>’s <a data-link-type="dfn" href="http://www.w3.org/TR/html5/webappapis.html#global-object">global object</a> is a
-        <code class="idl"><a data-link-type="idl" href="http://www.w3.org/TR/html5/browsers.html#window">Window</a></code> object
+        <code class="idl"><a data-link-type="idl" href="http://www.w3.org/TR/service-workers/#service-worker-global-scope">ServiceWorkerGlobalScope</a></code> object.
 
 
        <p class="note" role="note">Note: We rely on the <code>client</code> property to reflect the origin
-        of the request. Importantly, <var>request</var> isn’t a passthrough
-        request if it originated in a <code>WorkerGlobalScope</code> environment.</p>
+        of the request. Importantly, <var>request</var> is only a passthrough
+        request if it originated inside a Service Worker.</p>
 
 
 
@@ -1700,29 +1700,29 @@ <h3 class="no-ref no-num heading settled" id="conformance-classes"><span class="
   <h2 class="no-num heading settled" id="index"><span class="content">Index</span><a class="self-link" href="#index"></a></h2>
   <h3 class="no-num heading settled" id="index-defined-here"><span class="content">Terms defined by this specification</span><a class="self-link" href="#index-defined-here"></a></h3>
   <ul class="indexlist">
-   <li>a priori insecure, <a href="#a-priori-insecure-origin">2</a>
-   <li>a priori insecure origin, <a href="#a-priori-insecure-origin">2</a>
-   <li>a priori insecure URL, <a href="#a-priori-insecure-url">2</a>
-   <li>blockable, <a href="#blockable">3.2</a>
-   <li>blockable request context, <a href="#blockable-request-context">3.2</a>
-   <li>block-all-mixed-content, <a href="#block_all_mixed_content">4.2</a>
-   <li>conformant server, <a href="#conformant-server">Unnumbered section</a>
-   <li>conformant user agent, <a href="#conformant-user-agent">Unnumbered section</a>
-   <li>embedding document, <a href="#embedding-document">2</a>
-   <li>insecure, <a href="#insecure-origin">2</a>
-   <li>insecure origin, <a href="#insecure-origin">2</a>
-   <li>insecure URL, <a href="#insecure-url">2</a>
-   <li>mixed, <a href="#mixed-content">2</a>
-   <li>mixed content, <a href="#mixed-content">2</a>
-   <li>optionally-blockable, <a href="#optionally_blockable">3.1</a>
-   <li>optionally-blockable request
-    contexts, <a href="#optionally_blockable-request-contexts">3.1</a>
-   <li>passthrough request, <a href="#passthrough-request">5.2</a>
-   <li>potentially secure, <a href="#potentially-secure-origin">2</a>
-   <li>potentially secure origin, <a href="#potentially-secure-origin">2</a>
-   <li>potentially secure URL, <a href="#potentially-secure-url">2</a>
-   <li>strict mixed content checking flag, <a href="#strict-mixed-content-checking-flag">4</a>
-   <li>strict mode, <a href="#strict-mode">4</a></ul>
+   <li><a href="#a-priori-insecure-origin">a priori insecure</a><span>, in §2</span>
+   <li><a href="#a-priori-insecure-origin">a priori insecure origin</a><span>, in §2</span>
+   <li><a href="#a-priori-insecure-url">a priori insecure URL</a><span>, in §2</span>
+   <li><a href="#blockable">blockable</a><span>, in §3.2</span>
+   <li><a href="#blockable-request-context">blockable request context</a><span>, in §3.2</span>
+   <li><a href="#block_all_mixed_content">block-all-mixed-content</a><span>, in §4.2</span>
+   <li><a href="#conformant-server">conformant server</a><span>, in §Unnumbered section</span>
+   <li><a href="#conformant-user-agent">conformant user agent</a><span>, in §Unnumbered section</span>
+   <li><a href="#embedding-document">embedding document</a><span>, in §2</span>
+   <li><a href="#insecure-origin">insecure</a><span>, in §2</span>
+   <li><a href="#insecure-origin">insecure origin</a><span>, in §2</span>
+   <li><a href="#insecure-url">insecure URL</a><span>, in §2</span>
+   <li><a href="#mixed-content">mixed</a><span>, in §2</span>
+   <li><a href="#mixed-content">mixed content</a><span>, in §2</span>
+   <li><a href="#optionally_blockable">optionally-blockable</a><span>, in §3.1</span>
+   <li><a href="#optionally_blockable-request-contexts">optionally-blockable request
+    contexts</a><span>, in §3.1</span>
+   <li><a href="#passthrough-request">passthrough request</a><span>, in §5.2</span>
+   <li><a href="#potentially-secure-origin">potentially secure</a><span>, in §2</span>
+   <li><a href="#potentially-secure-origin">potentially secure origin</a><span>, in §2</span>
+   <li><a href="#potentially-secure-url">potentially secure URL</a><span>, in §2</span>
+   <li><a href="#strict-mixed-content-checking-flag">strict mixed content checking flag</a><span>, in §4</span>
+   <li><a href="#strict-mode">strict mode</a><span>, in §4</span></ul>
   <h3 class="no-num heading settled" id="index-defined-elsewhere"><span class="content">Terms defined by reference</span><a class="self-link" href="#index-defined-elsewhere"></a></h3>
   <ul class="indexlist">
    <li><a data-link-type="biblio" href="#biblio-csp2">[CSP2]</a> defines the following terms:

specs/mixedcontent/index.src.html

@@ -95,6 +95,7 @@ <h1>Mixed Content</h1>
   text: EventSource; url: http://www.w3.org/TR/eventsource/#the-eventsource-interface
   text: Document; url: http://www.w3.org/TR/html5/dom.html#document
   text: Window; url: http://www.w3.org/TR/html5/browsers.html#window
+  text: ServiceWorkerGlobalScope; url: http://www.w3.org/TR/service-workers/#service-worker-global-scope
 type: element
   urlPrefix: http://www.w3.org/TR/html5/; spec: HTML5
     urlPrefix: document-metadata.html
@@ -679,11 +680,11 @@ <h3 id="is-passthrough">
       </li>
       <li>
         <var>request</var>'s <code>client</code>'s <a>global object</a> is a
-        {{Window}} object
+        {{ServiceWorkerGlobalScope}} object.
 
         Note: We rely on the <code>client</code> property to reflect the origin
-        of the request. Importantly, <var>request</var> isn't a passthrough
-        request if it originated in a <code>WorkerGlobalScope</code> environment.
+        of the request. Importantly, <var>request</var> is only a passthrough
+        request if it originated inside a Service Worker.
       </li>
     </ol>
   </section>