Let shadowrootmode take precedent over contentmethod

Author: foolip

source

@@ -140322,11 +140322,11 @@ document.body.appendChild(text);
       <ul>
        <li><var>templateStartTag</var>'s <code
        data-x="attr-template-contentmethod">contentmethod</code> is not in the <span
-       data-x="attr-contentmethod-none-state">None</span> state;</li>
+       data-x="attr-contentmethod-none-state">None</span> state; or</li>
 
        <li><var>templateStartTag</var>'s <code
        data-x="attr-template-shadowrootmode">shadowrootmode</code> is not in the <span
-       data-x="attr-shadowrootmode-none-state">None</span> state;</li>
+       data-x="attr-shadowrootmode-none-state">None</span> state; or</li>
 
        <li><var>document</var>'s <span
        data-x="concept-document-allow-declarative-shadow-roots">allow declarative shadow
@@ -140340,18 +140340,6 @@ document.body.appendChild(text);
      </li>
 
      <li>
-      <p>If <var>templateStartTag</var>'s <code
-      data-x="attr-template-contentmethod">contentmethod</code> is not in the <span
-      data-x="attr-contentmethod-none-state">None</span> state:</p>
-
-      <ol>
-       <li><p>TODO: what to we need to do so that elements are inserted into the template element
-       and redirected by our pre-insertion steps?</p></li>
-      </ol>
-     </li>
-
-     <li>
-      <!-- TODO: is it OK if both of these branches run? If not, which one wins? -->
       <p>If <var>templateStartTag</var>'s <code
       data-x="attr-template-shadowrootmode">shadowrootmode</code> is not in the <span
       data-x="attr-shadowrootmode-none-state">None</span> state:</p>
@@ -140431,6 +140419,17 @@ document.body.appendChild(text);
        </li>
       </ol>
      </li>
+
+     <li>
+      <p>Otherwise, if <var>templateStartTag</var>'s <code
+      data-x="attr-template-contentmethod">contentmethod</code> is not in the <span
+      data-x="attr-contentmethod-none-state">None</span> state:</p>
+
+      <ol>
+       <li><p>TODO: what to we need to do so that elements are inserted into the template element
+       and redirected by our pre-insertion steps?</p></li>
+      </ol>
+     </li>
     </ol>
    </dd>