Skip to content

Commit

Permalink
Convert usages to current settings object
Browse files Browse the repository at this point in the history
  • Loading branch information
mfoltzgoogle committed Sep 29, 2016
1 parent d7a1f27 commit 8858a12
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions index.html
Expand Up @@ -364,9 +364,7 @@ <h2>
<dfn><a href=
"http://www.w3.org/TR/html5/browsers.html#sandboxed-top-level-navigation-browsing-context-flag">
sandboxed top-level navigation browsing context flag</a></dfn>,
<dfn><a href=
"http://www.w3.org/TR/html5/webappapis.html#settings-object">settings
object</a></dfn>, <dfn><code><a href=
<dfn><code><a href=
"http://www.w3.org/TR/html5/webappapis.html#eventhandler">EventHandler</a></code></dfn>
and <dfn><code><a href=
"http://www.w3.org/TR/html5/webappapis.html#navigator">Navigator</a></code></dfn>
Expand Down Expand Up @@ -440,8 +438,11 @@ <h2>
a Promise</a></dfn> are used as explained in [[!PROMGUIDE]].
</p>
<p>
The term <dfn><a href="https://url.spec.whatwg.org/#url">URL</a></dfn>
is defined in the WHATWG URL standard [[!URL]].
The
terms <dfn><a href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-current-everything">current
settings object</a></dfn>
and <dfn><a href="https://url.spec.whatwg.org/#url">URL</a></dfn> are
defined in the WHATWG URL standard [[!URL]].
</p>
<p>
The term <dfn><a href=
Expand Down Expand Up @@ -1026,7 +1027,7 @@ <h4>
<li>For each URL <var>U</var> in <var>urls</var>:
<ol>
<li>Resolve <var>U</var> relative to the API base URL specified
by the entry <a>settings object</a>, and add the resulting
by the <a>current settings object</a>, and add the resulting
absolute URL (if any) to <var>presentationUrls</var>.
</li>
<li>If the resolve a URL algorithm failed, then <a>throw</a> a
Expand Down Expand Up @@ -1072,7 +1073,7 @@ <h4>
<a>Promise</a> rejected with an <a>InvalidAccessError</a> exception
and abort these steps.
</li>
<li>Using the document's <a>settings object</a>, run the
<li>Using the document's <a>current settings object</a>, run the
<a>prohibits mixed security contexts algorithm</a>.
</li>
<li>If the result of the algorithm is <code>"Prohibits Mixed
Expand Down Expand Up @@ -1240,7 +1241,7 @@ <h4>
</dd>
</dl>
<ol>
<li>Using the document's <a>settings object</a>, run the
<li>Using the document's <a>current settings object</a>, run the
<a>prohibits mixed security contexts algorithm</a>.
</li>
<li>If the result of the algorithm is <code>"Prohibits Mixed
Expand Down Expand Up @@ -1521,7 +1522,7 @@ <h4>
<li>If one of the following conditions is true:
<ul>
<li>The result of running the <a>prohibits mixed security
contexts algorithm</a> on the document's <a>settings object</a>
contexts algorithm</a> on the document's <a>current settings object</a>
is <code>"Prohibits Mixed Security Contexts"</code> and any
member of <var>presentationUrls</var> is an <a>a priori
unauthenticated URL</a>.
Expand Down

0 comments on commit 8858a12

Please sign in to comment.