Skip to content

Commit 3ff7661

Browse files
author
Simon Pieters
committed
[cssom] Move back the steps to get a parsed URL since that's used later in the algorithm
1 parent 6474fae commit 3ff7661

2 files changed

Lines changed: 30 additions & 22 deletions

File tree

cssom/Overview.html

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,18 +1442,13 @@ <h3 id="style-sheet-association"><span class="secno">6.3 </span>Style Sheet Asso
14421442

14431443
<h4 id="fetching-css-style-sheets"><span class="secno">6.3.1 </span>Fetching CSS style sheets</h4>
14441444

1445-
<p>To <dfn id="fetch-a-css-style-sheet">fetch a CSS style sheet</dfn> with input URL <var>input URL</var>, base URL <var>base URL</var>, referrer <var>referrer</var>, document
1445+
<p>To <dfn id="fetch-a-css-style-sheet">fetch a CSS style sheet</dfn> with parsed URL <var>parsed URL</var>, referrer <var>referrer</var>, document
14461446
<var>document</var>, optionally a set of parameters <var>parameters</var> (used as input to creating a
14471447
<a class="external" data-anolis-spec="fetch" href="http://fetch.spec.whatwg.org/#concept-request" title="concept-request">request</a>), follow these steps:
14481448

14491449
<ol>
14501450
<li><p>Let <var>origin</var> be <var>document</var>'s <a class="external" data-anolis-spec="html" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/origin-0.html#origin">origin</a>.
14511451

1452-
<li><p>Let <var>parsed URL</var> be the return value of invoking the <a class="external" data-anolis-spec="url" href="http://url.spec.whatwg.org/#concept-url-parser" title="concept-url-parser">URL parser</a> with the
1453-
string <var>input URL</var> and the base URL <var>base URL</var>.
1454-
1455-
<li><p>If <var>parsed URL</var> is failure, return an error.
1456-
14571452
<li><p>Let <var>request</var> be a new <a class="external" data-anolis-spec="fetch" href="http://fetch.spec.whatwg.org/#concept-request" title="concept-request">request</a>, with the
14581453
<a class="external" data-anolis-spec="fetch" href="http://fetch.spec.whatwg.org/#concept-request-url" title="concept-request-url">url</a> <var>parsed URL</var>,
14591454
<a class="external" data-anolis-spec="fetch" href="http://fetch.spec.whatwg.org/#concept-request-origin" title="concept-request-origin">origin</a> <var>origin</var>,
@@ -1569,8 +1564,13 @@ <h4 id="requirements-on-user-agents-implementing-the-xml-stylesheet-processing-i
15691564

15701565
<li><p>Let <var>referrer</var> be <var>document</var>'s <a class="external" data-anolis-spec="html" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/dom.html#the-document's-address" title="the document's address">address</a>.
15711566

1572-
<li><p>Let <var>response</var> be the result of <a href="#fetch-a-css-style-sheet" title="fetch a CSS style sheet">fetching a CSS style sheet</a> with input URL <var>input URL</var>,
1573-
base URL <var>base URL</var>, referrer <var>referrer</var> and document <var>document</var>.
1567+
<li><p>Let <var>parsed URL</var> be the return value of invoking the <a class="external" data-anolis-spec="url" href="http://url.spec.whatwg.org/#concept-url-parser" title="concept-url-parser">URL parser</a> with the
1568+
string <var>input URL</var> and the base URL <var>base URL</var>.
1569+
1570+
<li><p>If <var>parsed URL</var> is failure, terminate these steps.
1571+
1572+
<li><p>Let <var>response</var> be the result of <a href="#fetch-a-css-style-sheet" title="fetch a CSS style sheet">fetching a CSS style sheet</a> with parsed URL <var>parsed URL</var>,
1573+
referrer <var>referrer</var> and document <var>document</var>.
15741574

15751575
<li><p>If <var>response</var> is an error, terminate these steps.
15761576

@@ -1641,9 +1641,13 @@ <h4 id="requirements-on-user-agents-implementing-the-http-link-header"><span cla
16411641

16421642
<li><p>Let <var>origin</var> be the document's <a class="external" data-anolis-spec="html" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/origin-0.html#origin">origin</a>.
16431643

1644-
<li><p>Let <var>response</var> be the result of <a href="#fetch-a-css-style-sheet" title="fetch a CSS style sheet">fetching a CSS style sheet</a> with input URL <var>input URL</var>,
1645-
base URL <var>base URL</var>, referrer <var>referrer</var> and document being the document. <span class="issue" title="">What if the HTML parser hasn't decided on
1646-
quirks/non-quirks yet?</span>
1644+
<li><p>Let <var>parsed URL</var> be the return value of invoking the <a class="external" data-anolis-spec="url" href="http://url.spec.whatwg.org/#concept-url-parser" title="concept-url-parser">URL parser</a> with the
1645+
string <var>input URL</var> and the base URL <var>base URL</var>.
1646+
1647+
<li><p>If <var>parsed URL</var> is failure, terminate these steps.
1648+
1649+
<li><p>Let <var>response</var> be the result of <a href="#fetch-a-css-style-sheet" title="fetch a CSS style sheet">fetching a CSS style sheet</a> with parsed URL <var>parsed URL</var>,
1650+
referrer <var>referrer</var> and document being the document. <span class="issue" title="">What if the HTML parser hasn't decided on quirks/non-quirks yet?</span>
16471651

16481652
<li>
16491653
<p><a href="#create-a-css-style-sheet">Create a CSS style sheet</a> with the following properties:</p>

cssom/Overview.src.html

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,18 +1363,13 @@ <h3>Style Sheet Association</h3>
13631363

13641364
<h4>Fetching CSS style sheets</h4>
13651365

1366-
<p>To <dfn>fetch a CSS style sheet</dfn> with input URL <var>input URL</var>, base URL <var>base URL</var>, referrer <var>referrer</var>, document
1366+
<p>To <dfn>fetch a CSS style sheet</dfn> with parsed URL <var>parsed URL</var>, referrer <var>referrer</var>, document
13671367
<var>document</var>, optionally a set of parameters <var>parameters</var> (used as input to creating a
13681368
<span data-anolis-spec=fetch title=concept-request>request</span>), follow these steps:
13691369

13701370
<ol>
13711371
<li><p>Let <var>origin</var> be <var>document</var>'s <span data-anolis-spec=html>origin</span>.
13721372

1373-
<li><p>Let <var>parsed URL</var> be the return value of invoking the <span data-anolis-spec=url title=concept-url-parser>URL parser</span> with the
1374-
string <var>input URL</var> and the base URL <var>base URL</var>.
1375-
1376-
<li><p>If <var>parsed URL</var> is failure, return an error.
1377-
13781373
<li><p>Let <var>request</var> be a new <span data-anolis-spec=fetch title=concept-request>request</span>, with the
13791374
<span data-anolis-spec=fetch title=concept-request-url>url</span> <var>parsed URL</var>,
13801375
<span data-anolis-spec=fetch title=concept-request-origin>origin</span> <var>origin</var>,
@@ -1490,8 +1485,13 @@ <h4>Requirements on User Agents Implementing the xml-stylesheet processing instr
14901485

14911486
<li><p>Let <var>referrer</var> be <var>document</var>'s <span data-anolis-spec=html title="the document's address">address</span>.
14921487

1493-
<li><p>Let <var>response</var> be the result of <span title="fetch a CSS style sheet">fetching a CSS style sheet</span> with input URL <var>input URL</var>,
1494-
base URL <var>base URL</var>, referrer <var>referrer</var> and document <var>document</var>.
1488+
<li><p>Let <var>parsed URL</var> be the return value of invoking the <span data-anolis-spec=url title=concept-url-parser>URL parser</span> with the
1489+
string <var>input URL</var> and the base URL <var>base URL</var>.
1490+
1491+
<li><p>If <var>parsed URL</var> is failure, terminate these steps.
1492+
1493+
<li><p>Let <var>response</var> be the result of <span title="fetch a CSS style sheet">fetching a CSS style sheet</span> with parsed URL <var>parsed URL</var>,
1494+
referrer <var>referrer</var> and document <var>document</var>.
14951495

14961496
<li><p>If <var>response</var> is an error, terminate these steps.
14971497

@@ -1562,9 +1562,13 @@ <h4>Requirements on User Agents Implementing the HTTP
15621562

15631563
<li><p>Let <var>origin</var> be the document's <span data-anolis-spec=html>origin</span>.
15641564

1565-
<li><p>Let <var>response</var> be the result of <span title="fetch a CSS style sheet">fetching a CSS style sheet</span> with input URL <var>input URL</var>,
1566-
base URL <var>base URL</var>, referrer <var>referrer</var> and document being the document. <span class=issue title>What if the HTML parser hasn't decided on
1567-
quirks/non-quirks yet?</span>
1565+
<li><p>Let <var>parsed URL</var> be the return value of invoking the <span data-anolis-spec=url title=concept-url-parser>URL parser</span> with the
1566+
string <var>input URL</var> and the base URL <var>base URL</var>.
1567+
1568+
<li><p>If <var>parsed URL</var> is failure, terminate these steps.
1569+
1570+
<li><p>Let <var>response</var> be the result of <span title="fetch a CSS style sheet">fetching a CSS style sheet</span> with parsed URL <var>parsed URL</var>,
1571+
referrer <var>referrer</var> and document being the document. <span class=issue title>What if the HTML parser hasn't decided on quirks/non-quirks yet?</span>
15681572

15691573
<li>
15701574
<p><span>Create a CSS style sheet</span> with the following properties:</p>

0 commit comments

Comments
 (0)