[html5] r8272 - [giow] (3) Change iframe, frame, and object.contentDocument to return null when [...]

whatwg at whatwg.org whatwg at whatwg.org
Tue Nov 12 13:50:44 PST 2013


Author: ianh
Date: 2013-11-12 13:50:40 -0800 (Tue, 12 Nov 2013)
New Revision: 8272

Modified:
   complete.html
   index
   source
Log:
[giow] (3) Change iframe, frame, and object.contentDocument to return null when cross-origin documents are involved.
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=23219
Affected topics: HTML

Modified: complete.html
===================================================================
--- complete.html	2013-11-12 21:44:19 UTC (rev 8271)
+++ complete.html	2013-11-12 21:50:40 UTC (rev 8272)
@@ -23170,7 +23170,9 @@
 
   <p>The <dfn id=dom-iframe-contentdocument title=dom-iframe-contentDocument><code>contentDocument</code></dfn> IDL attribute
   must return the <code><a href=#document>Document</a></code> object of the <a href=#active-document>active document</a> of the
-  <code><a href=#the-iframe-element>iframe</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>, if any, or null otherwise.</p>
+  <code><a href=#the-iframe-element>iframe</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>, if any and if its
+  <a href=#effective-script-origin>effective script origin</a> is the <a href=#same-origin>same origin</a> as the <a href=#effective-script-origin>effective script
+  origin</a> specified by the <a href=#incumbent-settings-object>incumbent settings object</a>, or null otherwise.</p>
 
   <p>The <dfn id=dom-iframe-contentwindow title=dom-iframe-contentWindow><code>contentWindow</code></dfn> IDL attribute must
   return the <code><a href=#windowproxy>WindowProxy</a></code> object of the <code><a href=#the-iframe-element>iframe</a></code> element's <a href=#nested-browsing-context>nested
@@ -24141,8 +24143,9 @@
 
   <p>The <dfn id=dom-object-contentdocument title=dom-object-contentDocument><code>contentDocument</code></dfn> IDL attribute
   must return the <code><a href=#document>Document</a></code> object of the <a href=#active-document>active document</a> of the
-  <code><a href=#the-object-element>object</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>, if it has one; otherwise, it
-  must return null.</p>
+  <code><a href=#the-object-element>object</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>, if any and if its
+  <a href=#effective-script-origin>effective script origin</a> is the <a href=#same-origin>same origin</a> as the <a href=#effective-script-origin>effective script
+  origin</a> specified by the <a href=#incumbent-settings-object>incumbent settings object</a>, or null otherwise.</p>
 
   <p>The <dfn id=dom-object-contentwindow title=dom-object-contentWindow><code>contentWindow</code></dfn> IDL attribute must
   return the <code><a href=#windowproxy>WindowProxy</a></code> object of the <code><a href=#the-object-element>object</a></code> element's <a href=#nested-browsing-context>nested
@@ -96075,7 +96078,10 @@
 
   <p>The <dfn id=dom-frame-contentdocument title=dom-frame-contentDocument><code>contentDocument</code></dfn> IDL attribute of
   the <code><a href=#frame>frame</a></code> element must return the <code><a href=#document>Document</a></code> object of the <a href=#active-document>active
-  document</a> of the <code><a href=#frame>frame</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>.</p>
+  document</a> of the <code><a href=#frame>frame</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>, if any
+  and if its <a href=#effective-script-origin>effective script origin</a> is the <a href=#same-origin>same origin</a> as the
+  <a href=#effective-script-origin>effective script origin</a> specified by the <a href=#incumbent-settings-object>incumbent settings object</a>, or
+  null otherwise.</p>
 
   <p>The <dfn id=dom-frame-contentwindow title=dom-frame-contentWindow><code>contentWindow</code></dfn> IDL attribute must
   return the <code><a href=#windowproxy>WindowProxy</a></code> object of the <code><a href=#frame>frame</a></code> element's <a href=#nested-browsing-context>nested

Modified: index
===================================================================
--- index	2013-11-12 21:44:19 UTC (rev 8271)
+++ index	2013-11-12 21:50:40 UTC (rev 8272)
@@ -23170,7 +23170,9 @@
 
   <p>The <dfn id=dom-iframe-contentdocument title=dom-iframe-contentDocument><code>contentDocument</code></dfn> IDL attribute
   must return the <code><a href=#document>Document</a></code> object of the <a href=#active-document>active document</a> of the
-  <code><a href=#the-iframe-element>iframe</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>, if any, or null otherwise.</p>
+  <code><a href=#the-iframe-element>iframe</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>, if any and if its
+  <a href=#effective-script-origin>effective script origin</a> is the <a href=#same-origin>same origin</a> as the <a href=#effective-script-origin>effective script
+  origin</a> specified by the <a href=#incumbent-settings-object>incumbent settings object</a>, or null otherwise.</p>
 
   <p>The <dfn id=dom-iframe-contentwindow title=dom-iframe-contentWindow><code>contentWindow</code></dfn> IDL attribute must
   return the <code><a href=#windowproxy>WindowProxy</a></code> object of the <code><a href=#the-iframe-element>iframe</a></code> element's <a href=#nested-browsing-context>nested
@@ -24141,8 +24143,9 @@
 
   <p>The <dfn id=dom-object-contentdocument title=dom-object-contentDocument><code>contentDocument</code></dfn> IDL attribute
   must return the <code><a href=#document>Document</a></code> object of the <a href=#active-document>active document</a> of the
-  <code><a href=#the-object-element>object</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>, if it has one; otherwise, it
-  must return null.</p>
+  <code><a href=#the-object-element>object</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>, if any and if its
+  <a href=#effective-script-origin>effective script origin</a> is the <a href=#same-origin>same origin</a> as the <a href=#effective-script-origin>effective script
+  origin</a> specified by the <a href=#incumbent-settings-object>incumbent settings object</a>, or null otherwise.</p>
 
   <p>The <dfn id=dom-object-contentwindow title=dom-object-contentWindow><code>contentWindow</code></dfn> IDL attribute must
   return the <code><a href=#windowproxy>WindowProxy</a></code> object of the <code><a href=#the-object-element>object</a></code> element's <a href=#nested-browsing-context>nested
@@ -96075,7 +96078,10 @@
 
   <p>The <dfn id=dom-frame-contentdocument title=dom-frame-contentDocument><code>contentDocument</code></dfn> IDL attribute of
   the <code><a href=#frame>frame</a></code> element must return the <code><a href=#document>Document</a></code> object of the <a href=#active-document>active
-  document</a> of the <code><a href=#frame>frame</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>.</p>
+  document</a> of the <code><a href=#frame>frame</a></code> element's <a href=#nested-browsing-context>nested browsing context</a>, if any
+  and if its <a href=#effective-script-origin>effective script origin</a> is the <a href=#same-origin>same origin</a> as the
+  <a href=#effective-script-origin>effective script origin</a> specified by the <a href=#incumbent-settings-object>incumbent settings object</a>, or
+  null otherwise.</p>
 
   <p>The <dfn id=dom-frame-contentwindow title=dom-frame-contentWindow><code>contentWindow</code></dfn> IDL attribute must
   return the <code><a href=#windowproxy>WindowProxy</a></code> object of the <code><a href=#frame>frame</a></code> element's <a href=#nested-browsing-context>nested

Modified: source
===================================================================
--- source	2013-11-12 21:44:19 UTC (rev 8271)
+++ source	2013-11-12 21:50:40 UTC (rev 8272)
@@ -24389,7 +24389,9 @@
 
   <p>The <dfn data-x="dom-iframe-contentDocument"><code>contentDocument</code></dfn> IDL attribute
   must return the <code>Document</code> object of the <span>active document</span> of the
-  <code>iframe</code> element's <span>nested browsing context</span>, if any, or null otherwise.</p>
+  <code>iframe</code> element's <span>nested browsing context</span>, if any and if its
+  <span>effective script origin</span> is the <span>same origin</span> as the <span>effective script
+  origin</span> specified by the <span>incumbent settings object</span>, or null otherwise.</p>
 
   <p>The <dfn data-x="dom-iframe-contentWindow"><code>contentWindow</code></dfn> IDL attribute must
   return the <code>WindowProxy</code> object of the <code>iframe</code> element's <span>nested
@@ -25468,8 +25470,9 @@
 
   <p>The <dfn data-x="dom-object-contentDocument"><code>contentDocument</code></dfn> IDL attribute
   must return the <code>Document</code> object of the <span>active document</span> of the
-  <code>object</code> element's <span>nested browsing context</span>, if it has one; otherwise, it
-  must return null.</p>
+  <code>object</code> element's <span>nested browsing context</span>, if any and if its
+  <span>effective script origin</span> is the <span>same origin</span> as the <span>effective script
+  origin</span> specified by the <span>incumbent settings object</span>, or null otherwise.</p>
 
   <p>The <dfn data-x="dom-object-contentWindow"><code>contentWindow</code></dfn> IDL attribute must
   return the <code>WindowProxy</code> object of the <code>object</code> element's <span>nested
@@ -106867,7 +106870,10 @@
 
   <p>The <dfn data-x="dom-frame-contentDocument"><code>contentDocument</code></dfn> IDL attribute of
   the <code>frame</code> element must return the <code>Document</code> object of the <span>active
-  document</span> of the <code>frame</code> element's <span>nested browsing context</span>.</p>
+  document</span> of the <code>frame</code> element's <span>nested browsing context</span>, if any
+  and if its <span>effective script origin</span> is the <span>same origin</span> as the
+  <span>effective script origin</span> specified by the <span>incumbent settings object</span>, or
+  null otherwise.</p>
 
   <p>The <dfn data-x="dom-frame-contentWindow"><code>contentWindow</code></dfn> IDL attribute must
   return the <code>WindowProxy</code> object of the <code>frame</code> element's <span>nested




More information about the Commit-Watchers mailing list