Rebase and fix some CR nits

whatwg · May 17, 2022 · 65db91c · 65db91c
1 parent 1d09511
commit 65db91c
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/source b/source
@@ -14393,7 +14393,7 @@ interface <dfn interface>HTMLLinkElement</dfn> : <span>HTMLElement</span> {
   <span data-x="struct item">items</span>:</p>
 
   <dl>
-   <dt><dfn data-x="link options href">href</dfn></dt>
+   <dt><dfn data-x="link options href">href</dfn> (default the empty string)</dt>
    <dt><dfn data-x="link options destination">destination</dfn> (default the empty string)</dt>
    <dt><dfn data-x="link options initiator">initiator</dfn> (default "<code
     data-x="">link</code>")</dt>
@@ -14423,7 +14423,7 @@ interface <dfn interface>HTMLLinkElement</dfn> : <span>HTMLElement</span> {
    <dd>Null or a <code>Document</code></dd>
 
    <dt><dfn data-x="link options on document ready">on document ready</dfn> (default null)</dt>
-   <dd>An algorithm accepting a <code>Document</code></dd>
+   <dd>Null or an algorithm accepting a <code>Document</code></dd>
   </dl>
 
   <p class="note">A <span>link processing options</span> has a <span
@@ -14470,11 +14470,11 @@ interface <dfn interface>HTMLLinkElement</dfn> : <span>HTMLElement</span> {
     </dl>
    </li>
 
-   <li><p>If <var>el</var> has an <span data-x="attr-link-href">href</span>
+   <li><p>If <var>el</var> has an <code data-x="attr-link-href">href</code>
    attribute, then set <var>options</var>'s <span data-x="link options href">href</span> to
    the value of <var>el</var>'s <code data-x="attr-link-href">href</code> attribute.</p></li>
 
-   <li><p>If <var>el</var> has an <span data-x="attr-link-integrity">integrity</span>
+   <li><p>If <var>el</var> has an <code data-x="attr-link-integrity">integrity</code>
    attribute, then set <var>options</var>'s <span data-x="link options integrity">integrity</span> to
    the value of <var>el</var>'s <code data-x="attr-link-integrity">integrity</code> content
    attribute.</p></li>
@@ -14484,6 +14484,15 @@ interface <dfn interface>HTMLLinkElement</dfn> : <span>HTMLElement</span> {
    <var>el</var>'s <code data-x="attr-link-type">type</code>
    attribute.</p></li>
 
+   <li>
+    <p>Assert: <var>options</var>'s <span data-x="link options href">href</span> is not the
+    empty string, or <var>options</var>'s <span data-x="link options source set">source set</span> is
+    not null.</p>
+
+    <p>A <code>link</code> element with neither an <code data-x="attr-link-href">href</code> or an
+    <code data-x="attr-link-imagesrcset">imagesrcset</code> does not represent a link.</p>
+   </li>
+
    <li><p>Return <var>options</var>.</p></li>
   </ol>
 
@@ -14564,6 +14573,10 @@ interface <dfn interface>HTMLLinkElement</dfn> : <span>HTMLElement</span> {
        <dt><span data-x="link options environment">environment</span></dt>
        <dd><var>doc</var>'s <span>relevant settings object</span></dd>
 
+       <dt><span data-x="link options policy container">policy container</span></dt>
+       <dd><var>doc</var>'s <span
+        data-x="concept-document-policy-container">policy container</span></dd>
+
        <dt><span data-x="link options document">document</span></dt>
        <dd><var>doc</var></dd>
       </dl>
@@ -14738,9 +14751,6 @@ data-x="rel-preload">preload</span>; <span data-x="attr-link-as">as</span>=font<
 
        <dt><span data-x="link options policy container">policy container</span></dt>
        <dd><var>earlyPolicyContainer</var></dd>
-
-       <dt><span data-x="link options on document ready">on document ready</span></dt>
-       <dd>Null or an algorithm accepting a <code>Document</code> <var>doc</var>
       </dl>
      </li>
 
@@ -14762,6 +14772,10 @@ data-x="rel-preload">preload</span>; <span data-x="attr-link-as">as</span>=font<
      <li><p><span>Apply link options from parsed header attributes</span> to <var>options</var>
      given <var>attribs</var>.</p></li>
 
+     <li><p>If <var>options</var>'s <span data-x="link options href">href</span> is the empty string
+     and <var>options</var>'s <span data-x="link options source set">source set</span> is null,
+     then return.</p></li>
+
      <li><p>Run the <span>process a link header</span> steps for <var>rel</var>,
      given <var>options</var>.</p></li>
 
@@ -26428,7 +26442,7 @@ document.body.appendChild(wbr);</code></pre>
 
   <ol>
    <li><p>If <var>options</var>'s <span data-x="link options destination">destination</span> is not
-   a <span data-x="concept-request-destination">destination</span>, return failure.</p></li>
+   a <span data-x="concept-request-destination">destination</span>, return.</p></li>
 
    <li><p>Let <var>href</var> be <var>options</var>'s <span
    data-x="link options href">href</span>.</p></li>
@@ -26441,16 +26455,16 @@ document.body.appendChild(wbr);</code></pre>
    <var>options</var>'s <span data-x="link options source set">source set</span>.</p></li>
 
    <li><p><span data-x="parse a url">Parse</span> <var>href</var> relative to
-   <var>options</var>'s <span data-x="link options base URL">base URL</span>. If that fails, return
-   failure. Otherwise let <var>url</var> be the <span>resulting URL record</span>.</p></li>
+   <var>options</var>'s <span data-x="link options base URL">base URL</span>. If that fails, return.
+   Otherwise let <var>url</var> be the <span>resulting URL record</span>.</p></li>
 
    <li><p>Let <var>unsafeEndTime</var> be 0.</p></li>
 
    <li><p>Let <var>response</var> be "<code data-x="">pending</code>".</p></li>
 
    <li><p>If <var>options</var>'s <span data-x="link options type">type</span> doesn't <span
    data-x="match preload type">match</span> <var>options</var>'s <span
-   data-x="link options destination">destination</span>, then return null.</p></li>
+   data-x="link options destination">destination</span>, then return.</p></li>
 
    <li><p>Let <var>request</var> be the result of <span data-x="create a potential-CORS
    request">creating a potential-CORS request</span> given <var>url</var>, <var>destination</var>,
@@ -26547,11 +26561,8 @@ document.body.appendChild(wbr);</code></pre>
    data-x="create link options from element">creating link options</span> from
    <var>el</var>.</p></li>
 
-   <li><p>If <var>options</var> is null, then return.</p></li>
-
    <li>
-    <p>Let <var>result</var> be the result of <span data-x="preload">preloading</span>
-    <var>options</var>, with the following steps given a <span
+    <p><span>Preload</span> <var>options</var>, with the following steps given a <span
     data-x="concept-response">response</span> <var>response</var>:
 
     <ol>
@@ -26566,14 +26577,8 @@ document.body.appendChild(wbr);</code></pre>
       feasibility of changing the behavior has not yet been investigated. See <a
       href="https://github.com/whatwg/html/issues/1142">issue #1142</a>.</p>
      </li>
-
-     <li><p><span>Unblock rendering</span> on <var>el</var>.</p></li>
     </ol>
    </li>
-
-   <li><p>If <var>result</var> is success and <var>el</var> is
-   <span>potentially render-blocking</span>, then <span>block rendering</span> on
-   <var>el</var>.</p></li>
   </ol>
 
   <p>The <span>process a link header</span> step for this type of link