Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change a variety of entry settings object uses #1541

Merged
merged 4 commits into from
Jul 18, 2016
Merged

Change a variety of entry settings object uses #1541

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
921499f
Use "current settings object" in the frameElement origin check
domenic Jul 12, 2016
60f84ad
Use the associated document for pushState/replaceState's origin check
domenic Jul 12, 2016
413c1cc
Use relevant settings object in protocol handlers
domenic Jul 12, 2016
a6a1b71
Use current settings object in content document definition
domenic Jul 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions source
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77011,7 +77011,7 @@ dictionary <dfn>DragEventInit</dfn> : <span>MouseEventInit</span> {
<li><p>Let <var>document</var> be <var>context</var>'s <span>active document</span>.</p></li>

<li><p>If <var>document</var>'s <span>origin</span> and the <span>origin</span> specified by the
<span>incumbent settings object</span> are not <span>same origin-domain</span>, then return
<span>current settings object</span> are not <span>same origin-domain</span>, then return
null.</p></li>

<li><p>Return <var>document</var>.</p></li>
Expand Down Expand Up @@ -77085,7 +77085,7 @@ dictionary <dfn>DragEventInit</dfn> : <span>MouseEventInit</span> {
container</span>.</p></li>

<li><p>If <var>container</var>'s <span>node document</span>'s <span>origin</span> is not
<span>same origin-domain</span> with the <span>entry settings object</span>'s
<span>same origin-domain</span> with the <span>current settings object</span>'s
<span>origin</span>, then return null and abort these steps.</p></li>

<li><p>Return <var>container</var>.</p></li>
Expand Down Expand Up @@ -80151,10 +80151,11 @@ interface <dfn>History</dfn> {
<p>When either of these methods is invoked, the user agent must run the following steps:</p>

<ol>
<li><p>Let <var>document</var> be the unique <code>Document</code> object this
<code>History</code> object is associated with.</p></li>

<li><p>If this <code>History</code> object is associated with a <code>Document</code> that is
not <span>fully active</span>, throw a <span>"<code>SecurityError</code>"</span>
<code>DOMException</code>.</p></li>
<li><p>If <var>document</var> is not <span>fully active</span>, throw a
<span>"<code>SecurityError</code>"</span> <code>DOMException</code>.</p></li>

<li><p>Optionally, abort these steps. (For example, the user agent might disallow calls to these
methods that are invoked on a timer, or from event listeners that are not triggered in response
Expand All @@ -80180,20 +80181,20 @@ interface <dfn>History</dfn> {

<li><p>Let <var>new URL</var> be the <span>resulting URL record</span>.</p></li>

<li>Compare <var>new URL</var> to the document's <span
<li>Compare <var>new URL</var> to <var>document</var>'s <span
data-x="concept-document-url">URL</span>. If any component of these two <span data-x="URL
record">URL records</span> differ other than the <span data-x="concept-url-path">path</span>,
<span data-x="concept-url-query">query</span>, and <span
data-x="concept-url-fragment">fragment</span> components, then throw a
<span>"<code>SecurityError</code>"</span> <code>DOMException</code> and abort these steps.</li>

<li>If the <span data-x="concept-url-origin">origin</span> of <var>new URL</var> is not the
same as the <span>origin</span> of the <span>responsible document</span> specified by the
<span>entry settings object</span>, and either the <span data-x="concept-url-path">path</span>
or <span data-x="concept-url-query">query</span> components of the two <span data-x="URL
record">URL records</span> compared in the previous step differ, throw a
<span>"<code>SecurityError</code>"</span> <code>DOMException</code> and abort these steps.
(This prevents sandboxed content from spoofing other pages on the same origin.)</li>
<li>If the <span data-x="concept-url-origin">origin</span> of <var>new URL</var> is not
<span>same origin</span> with the <span>origin</span> of <var>document</var>, and either the
<span data-x="concept-url-path">path</span> or <span data-x="concept-url-query">query</span>
components of the two <span data-x="URL record">URL records</span> compared in the previous
step differ, throw a <span>"<code>SecurityError</code>"</span> <code>DOMException</code> and
abort these steps. (This prevents sandboxed content from spoofing other pages on the same
origin.)</li>

</ol>

Expand Down Expand Up @@ -80256,17 +80257,15 @@ interface <dfn>History</dfn> {

<li>

<p>Set the document's <span data-x="concept-document-url">URL</span> to <var>new URL</var>.</p>
<p>Set <var>document</var>'s <span data-x="concept-document-url">URL</span> to <var>new
URL</var>.</p>

<p class="note">Since this is neither a <span data-x="navigate">navigation</span> of the
<span>browsing context</span> nor a <span data-x="traverse the history">history traversal</span>,
it does not cause a <code data-x="event-hashchange">hashchange</code> event to be fired.</p>

</li>

<li><p>Let <var>targetRealm</var> be this <code>History</code> object's <span>relevant settings
object</span>'s <span data-x="environment settings object's realm">Realm</span>.</p></li>

<li>

<p>Set <code data-x="dom-history-state">history.state</code> to
Expand Down Expand Up @@ -90720,16 +90719,17 @@ interface <dfn>NavigatorContentUtils</dfn> {

<p>User agents must throw a <span>"<code>SyntaxError</code>"</span> <code>DOMException</code> if
<span data-x="parse a url">parsing</span> the <var>url</var> argument relative to the
<span>entry settings object</span> is not successful.</p>
<span>relevant settings object</span> of this <code>NavigatorContentUtils</code> object is not
successful.</p>

<p class="note">The <span>resulting URL string</span> would by definition not be a <span>valid
URL</span> as it would include the string "<code data-x="">%s</code>" which is not a valid
component in a URL.</p>

<p>User agents must throw a <span>"<code>SecurityError</code>"</span> <code>DOMException</code>
if the <span>resulting URL record</span> has an <span data-x="concept-url-origin">origin</span>
that differs from the <span>origin</span> specified by the <span>entry settings
object</span>.</p>
that differs from the <span>origin</span> specified by the <span>relevant settings object</span>
of this <code>NavigatorContentUtils</code> object.</p>

<p class="note">This is forcibly the case if the <code data-x="">%s</code> placeholder is in the
scheme, host, or port parts of the URL.</p>
Expand All @@ -90740,10 +90740,10 @@ interface <dfn>NavigatorContentUtils</dfn> {
<p>When the user agent uses this handler, it must replace the first occurrence of the exact
literal string "<code data-x="">%s</code>" in the <var>url</var> argument with an
escaped version of the <span>absolute URL</span> of the content in question (as defined below),
then <span data-x="parse a url">parse</span> the resulting URL, relative to the <span>entry
settings object</span> at the time the <code
then <span data-x="parse a url">parse</span> the resulting URL, relative to the <span>relevant
settings object</span> of the <code>NavigatorContentUtils</code> object on which the <code
data-x="dom-navigator-registerContentHandler">registerContentHandler()</code> or <code
data-x="dom-navigator-registerProtocolHandler">registerProtocolHandler()</code> methods were
data-x="dom-navigator-registerProtocolHandler">registerProtocolHandler()</code> method was
invoked, and then <span>navigate</span><!--DONAV user--> an appropriate <span>browsing
context</span> to the resulting URL.</p>

Expand Down Expand Up @@ -90979,14 +90979,14 @@ interface <dfn>NavigatorContentUtils</dfn> {
<li><p>If the string does not contain the substring "<code data-x="">%s</code>", abort these
steps. There's no matching handler.</p></li>

<li><p><span data-x="parse a URL">Parse</span> the string relative to the <span>entry settings
object</span>. If this fails, then throw a <span>"<code>SyntaxError</code>"</span>
<code>DOMException</code>.</p></li>
<li><p><span data-x="parse a URL">Parse</span> the string relative to the <span>relevant settings
object</span> of this <code>NavigatorContentUtils</code> object. If this fails, then throw a
<span>"<code>SyntaxError</code>"</span> <code>DOMException</code>.</p></li>

<li><p>If the <span>resulting URL record</span>'s <span data-x="concept-url-origin">origin</span>
is not the <span>same origin</span> as the <span>origin</span> specified by the <span>entry
settings object</span>, throw a <span>"<code>SecurityError</code>"</span>
<code>DOMException</code>.</p></li>
is not the <span>same origin</span> as the <span>origin</span> of the <span>relevant settings
object</span> of this <code>NavigatorContentUtils</code> object, throw a
<span>"<code>SecurityError</code>"</span> <code>DOMException</code>.</p></li>

<li><p>Return the <span>resulting URL string</span> as the result of preprocessing the
argument.</p></li>
Expand Down