Fix parsing response's CSP type mismatch

Author: antosart

index.bs

@@ -471,18 +471,21 @@ spec: WebRTC; urlPrefix: https://www.w3.org/TR/webrtc/
     Parse a serialized CSP
   </h4>
 
-  To <dfn abstract-op>parse a serialized CSP</dfn>, given a [=string=] |serialized|, a
-  [=policy/source=] |source|, and a [=policy/disposition=] |disposition|, execute the
-  following steps.
+  To <dfn abstract-op>parse a serialized CSP</dfn>, given a [=byte sequence=] or
+  [=string=] |serialized|, a [=policy/source=] |source|, and a [=policy/disposition=]
+  |disposition|, execute the following steps.
 
   This algorithm returns a [=Content Security Policy object=]. If |serialized| could not be
   parsed, the object's [=policy/directive set=] will be empty.
 
   <ol class="algorithm">
-    1.  Let |policy| be a new [=/policy=] with an empty [=policy/directive set=], a [=policy/source=]
+    1.  If |serialized| is a [=byte sequence=], then set |serialized| to be the result of
+        [=isomorphic decoding=] |serialized|.
+        
+    2.  Let |policy| be a new [=/policy=] with an empty [=policy/directive set=], a [=policy/source=]
         of |source|, and a [=policy/disposition=] of |disposition|.
 
-    2.  <a for=list>For each</a> |token| returned by [=strictly split a string|strictly splitting=] |serialized| on
+    3.  <a for=list>For each</a> |token| returned by [=strictly split a string|strictly splitting=] |serialized| on
         the U+003B SEMICOLON character (`;`):
 
         1.  [=Strip leading and trailing ASCII whitespace=] from |token|.
@@ -513,64 +516,46 @@ spec: WebRTC; urlPrefix: https://www.w3.org/TR/webrtc/
 
         8.  [=set/append|Append=] |directive| to |policy|'s [=policy/directive set=].
 
-    3.  Return |policy|.
+    4.  Return |policy|.
   </ol>
 
-  <h4 id="parse-serialized-policy-list" algorithm>
-    Parse a serialized CSP list
+  <h4 id="parse-response-csp" algorithm dfn export>
+    Parse |response|'s Content Security Policies
   </h4>
 
-  To <dfn abstract-op>parse a serialized CSP list</dfn>, given a [=byte sequence=] or [=string=]
-  |list|, a [=policy/source=] |source|, and a [=policy/disposition=] |disposition|, execute
-  the following steps.
+  To <dfn abstract-op>parse a response's Content Security Policies</dfn> given a <a>response</a>
+  |response|, execute the following steps.
 
-  This algorithm returns a [=list=] of [=Content Security Policy objects=]. If |list| cannot be
-  parsed, the returned list will be empty.
+  This algorithm returns a [=list=] of [=Content Security Policy objects=]. If the policies cannot
+  be parsed, the returned list will be empty.
 
   <ol class="algorithm">
-    1.  If |list| is a [=byte sequence=], then set |list| to be the result of <a
-        lt="isomorphic decode">isomorphic decoding</a> |list|.
-
-    2.  Let |policies| be an empty [=list=].
+    1.  Let |policies| be an empty [=list=].
 
-    3.  [=list/For each=] |token| returned by <a lt="split a string on commas">splitting |list| on commas</a>:
+    2.  <a for=list>For each</a> |token| returned by [=extracting header list values=] given
+        `Content-Security-Policy` and |response|'s [=response/header list=]:
 
-        1.  Let |policy| be the result of <a abstract-op lt="parse a serialized CSP">parsing</a>
-            |token|, with a [=policy/source=] of |source|, and [=policy/disposition=] of
-            |disposition|.
+        1.  Let |policy| be the result of
+            <a abstract-op lt="parse a serialized CSP list">parsing</a> |token|, with a
+            [=policy/source=] of "`header`", and a [=policy/disposition=] of "`enforce`".
 
-        2.  If |policy|'s [=policy/directive set=] is empty, [=iteration/continue=].
+        2.  If |policy|'s [=policy/directive set=] is not empty, append |policy| to |policies|.
 
-        3.  [=list/append|Append=] |policy| to |policies|.
+    3.  <a for=list>For each</a> |token| returned by [=extracting header list values=] given
+        `Content-Security-Policy-Report-Only` and |response|'s [=response/header list=]:
 
-    4.  Return |policies|.
-  </ol>
-
-  <h4 id="parse-response-csp" algorithm dfn export>
-    Parse |response|'s Content Security Policies
-  </h4>
-
-  To <dfn abstract-op>parse a response's Content Security Policies</dfn> given a <a>response</a>
-  |response|:
-
-  <ol class="algorithm">
-    1.  Let |policies| be the result of <a abstract-op lt="parse a serialized CSP list">parsing</a>
-        the result of [=extracting header list values=] given `Content-Security-Policy` and
-        |response|'s [=response/header list=], with a [=policy/source=] of "`header`", and a
-        [=policy/disposition=] of "`enforce`".
+        1.  Let |policy| be the result of
+            <a abstract-op lt="parse a serialized CSP list">parsing</a> |token|, with a
+            [=policy/source=] of "`header`", and a [=policy/disposition=] of "`report`".
 
-    2.  Append to |policies| the result of
-        <a abstract-op lt="parse a serialized CSP list">parsing</a> the result of
-        [=extracting header list values=] given `Content-Security-Policy-Report-Only` and
-        |response|'s [=response/header list=], with a [=policy/source=] of "`header`", and a
-        [=policy/disposition=] of "`report`".
+        2.  If |policy|'s [=policy/directive set=] is not empty, append |policy| to |policies|.
 
-    3.  <a for=list>For each</a> |policy| of |policies|:
+    4.  <a for=list>For each</a> |policy| of |policies|:
 
         1.  Set |policy|'s [=policy/self-origin=] to |response|'s [=response/url=]'s
             [=url/origin=].
 
-    4.  Return |policies|.
+    5.  Return |policies|.
   </ol>
 
   Note: When <a abstract-op lt="parse a response's Content Security Policies">parsing a response's