MIX: Clarify blocking algorithm for passthrough requests.

Author: mikewest

specs/mixedcontent/index.html

@@ -1078,34 +1078,23 @@ <h3 class="heading settled" data-level="5.3" id="should-block-fetch"><span class
             <code>CORS-with-forced-preflight</code>.
 
 
-          
-        <li>
-            <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-initiator">initiator</a> is "<code>fetch</code>", and
-            <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-destination">destination</a> is "<code>subresource</code>", and
-            <var>request</var> is <em>not</em> a <a data-link-type="dfn" href="#passthrough-request">passthrough request</a>.
-          
-        
 
        </ol>
 
 
 
 
       <li>
-        Return <strong>blocked</strong> <em>unless</em> one or more of the
-        following conditions are met:
+        Return <strong>allowed</strong> if one or more of the following
+        conditions are met:
 
 
        <ol>
 
         <li>
-            <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-initiator">initiator</a> is "<code>fetch</code>".
-
-
-         <p class="note" role="note">Note: We deal with the rejection case for <code>fetch</code> in the
-            previous step. See the bottom of this algorithm for a more detailed
-            explanation of why we need this special casing.</p>
-         
+            <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-initiator">initiator</a> is "<code>fetch</code>" and
+            <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-destination">destination</a> is "<code>subresource</code>", and
+            <var>request</var> is a <a data-link-type="dfn" href="#passthrough-request">passthrough request</a>.
 
 
 
@@ -1131,7 +1120,7 @@ <h3 class="heading settled" data-level="5.3" id="should-block-fetch"><span class
 
 
       <li>
-        Return <strong>allowed</strong>.
+        Return <strong>blocked</strong>.
 
 
 

specs/mixedcontent/index.src.html

@@ -739,24 +739,17 @@ <h3 id="should-block-fetch">
             <var>request</var>'s <code>mode</code> is <code>CORS</code> or
             <code>CORS-with-forced-preflight</code>.
           </li>
-          <li>
-            <var>request</var>'s <a>initiator</a> is "<code>fetch</code>", and
-            <a>destination</a> is "<code>subresource</code>", and
-            <var>request</var> is <em>not</em> a <a>passthrough request</a>.
-          </li>
         </ol>
       </li>
       <li>
-        Return <strong>blocked</strong> <em>unless</em> one or more of the
-        following conditions are met:
+        Return <strong>allowed</strong> if one or more of the following
+        conditions are met:
 
         <ol>
           <li>
-            <var>request</var>'s <a>initiator</a> is "<code>fetch</code>".
-
-            Note: We deal with the rejection case for <code>fetch</code> in the
-            previous step. See the bottom of this algorithm for a more detailed
-            explanation of why we need this special casing.
+            <var>request</var>'s <a>initiator</a> is "<code>fetch</code>" and
+            <a>destination</a> is "<code>subresource</code>", and
+            <var>request</var> is a <a>passthrough request</a>.
           </li>
           <li>
             <var>request</var>'s <a>type</a> is "<code>image</code>", and
@@ -771,7 +764,7 @@ <h3 id="should-block-fetch">
         </ol>
       </li>
       <li>
-        Return <strong>allowed</strong>.
+        Return <strong>blocked</strong>.
       </li>
     </ol>