[html5] r2021 - [] (0) Merge WindowBrowsingContext and Window together again.
whatwg at whatwg.org
whatwg at whatwg.org
Tue Aug 5 17:28:16 PDT 2008
Author: ianh
Date: 2008-08-05 17:28:16 -0700 (Tue, 05 Aug 2008)
New Revision: 2021
Modified:
index
source
Log:
[] (0) Merge WindowBrowsingContext and Window together again.
Modified: index
===================================================================
--- index 2008-08-06 00:25:18 UTC (rev 2020)
+++ index 2008-08-06 00:28:16 UTC (rev 2021)
@@ -31562,26 +31562,12 @@
<p>The <code>AbstractView</code> object of <a href="#default4"
title="default view">default views</a> must also implement the <code><a
- href="#window">Window</a></code>, <code><a
- href="#windowbrowsingcontext">WindowBrowsingContext</a></code>, and
- <code>EventTarget</code> interfaces.
+ href="#window">Window</a></code> and <code>EventTarget</code> interfaces.
<pre class=idl>[NoInterfaceObject] interface <dfn id=window>Window</dfn> {
- // self-reference
+ // the current browsing context
readonly attribute <a href="#window">Window</a> <a href="#window0" title=dom-window>window</a>;
readonly attribute <a href="#window">Window</a> <a href="#self" title=dom-self>self</a>;
-
- // the user agent
- readonly attribute <a href="#storage0">Storage</a> <a href="#localstorage" title=dom-localStorage>localStorage</a>;
- <a href="#database0">Database</a> <a href="#opendatabase" title=dom-opendatabase>openDatabase</a>(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize);
-
- // user prompts
- void <a href="#shownotification" title=dom-showNotification>showNotification</a>(in DOMString title, in DOMString subtitle, in DOMString description);
- void <a href="#shownotification" title=dom-showNotification>showNotification</a>(in DOMString title, in DOMString subtitle, in DOMString description, in VoidCallback onclick);
-};
-
-[NoInterfaceObject] interface <dfn id=windowbrowsingcontext>WindowBrowsingContext</dfn> {
- // the current browsing context
attribute DOMString <a href="#name9" title=dom-name>name</a>;
[PutForwards=href] readonly attribute <a href="#location2">Location</a> <a href="#location0" title=dom-document-location>location</a>;
readonly attribute <a href="#history2">History</a> <a href="#history1" title=dom-history>history</a>;
@@ -31590,7 +31576,9 @@
// the user agent
readonly attribute <a href="#clientinformation">ClientInformation</a> <a href="#navigator" title=dom-navigator>navigator</a>; <!-- XXX IE6 also has window.clientInformation pointing to this same object -->
+ readonly attribute <a href="#storage0">Storage</a> <a href="#localstorage" title=dom-localStorage>localStorage</a>;
readonly attribute <a href="#storage0">Storage</a> <a href="#sessionstorage" title=dom-sessionStorage>sessionStorage</a>;
+ <a href="#database0">Database</a> <a href="#opendatabase" title=dom-opendatabase>openDatabase</a>(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize);
// user prompts
void <a href="#alert" title=dom-alert>alert</a>(in DOMString message);
@@ -31601,6 +31589,8 @@
any <a href="#showmodaldialog" title=dom-showModalDialog>showModalDialog</a>(in DOMString url);
any <a href="#showmodaldialog" title=dom-showModalDialog>showModalDialog</a>(in DOMString url, in any arguments);<!--
any <span title="dom-showModalDialog">showModalDialog</span>(in DOMString url, in any arguments, in DOMString features);-->
+ void <a href="#shownotification" title=dom-showNotification>showNotification</a>(in DOMString title, in DOMString subtitle, in DOMString description);
+ void <a href="#shownotification" title=dom-showNotification>showNotification</a>(in DOMString title, in DOMString subtitle, in DOMString description, in VoidCallback onclick);
// other browsing contexts
readonly attribute <a href="#window">Window</a> <a href="#frames" title=dom-frames>frames</a>;
@@ -32279,8 +32269,10 @@
<h4 id=script0><span class=secno>5.4.1 </span>Script execution contexts</h4>
<p>The <dfn id=script2>script execution context</dfn> of a script is
- defined when that script is created. It is either a <code><a
- href="#window">Window</a></code> object or an empty object.
+ defined when that script is created. In this specification, it is either a
+ <code><a href="#window">Window</a></code> object or an empty object; other
+ specifications might make the script execution context be some other
+ object.
<p>When the <a href="#script2">script execution context</a> of a script is
an empty object, it can't do anything that interacts with the environment.
@@ -32288,10 +32280,9 @@
<p>A <a href="#script2">script execution context</a> always has an
associated <a href="#browsing1">browsing context</a>, known as the <dfn
id=script3>script browsing context</dfn>. If the <a href="#script2">script
- execution context</a> is a <code><a
- href="#windowbrowsingcontext">WindowBrowsingContext</a></code> object,
- then that object's <a href="#browsing1">browsing context</a> is it.
- Otherwise, the <a href="#script2">script execution context</a> is
+ execution context</a> is a <code><a href="#window">Window</a></code>
+ object, then that object's <a href="#browsing1">browsing context</a> is
+ it. Otherwise, the <a href="#script2">script execution context</a> is
associated explicitly with a <a href="#browsing1">browsing context</a>
when it is created.
Modified: source
===================================================================
--- source 2008-08-06 00:25:18 UTC (rev 2020)
+++ source 2008-08-06 00:28:16 UTC (rev 2021)
@@ -28751,25 +28751,12 @@
<p>The <code>AbstractView</code> object of <span title="default
view">default views</span> must also implement the
- <code>Window</code>, <code>WindowBrowsingContext</code>, and
- <code>EventTarget</code> interfaces.</p>
+ <code>Window</code> and <code>EventTarget</code> interfaces.</p>
<pre class="idl">[NoInterfaceObject] interface <dfn>Window</dfn> {
- // self-reference
+ // the current browsing context
readonly attribute <span>Window</span> <span title="dom-window">window</span>;
readonly attribute <span>Window</span> <span title="dom-self">self</span>;
-
- // the user agent
- readonly attribute <span>Storage</span> <span title="dom-localStorage">localStorage</span>;
- <span>Database</span> <span title="dom-opendatabase">openDatabase</span>(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize);
-
- // user prompts
- void <span title="dom-showNotification">showNotification</span>(in DOMString title, in DOMString subtitle, in DOMString description);
- void <span title="dom-showNotification">showNotification</span>(in DOMString title, in DOMString subtitle, in DOMString description, in VoidCallback onclick);
-};
-
-[NoInterfaceObject] interface <dfn>WindowBrowsingContext</dfn> {
- // the current browsing context
attribute DOMString <span title="dom-name">name</span>;
[PutForwards=href] readonly attribute <span>Location</span> <span title="dom-document-location">location</span>;
readonly attribute <span>History</span> <span title="dom-history">history</span>;
@@ -28778,7 +28765,9 @@
// the user agent
readonly attribute <span>ClientInformation</span> <span title="dom-navigator">navigator</span>; <!-- XXX IE6 also has window.clientInformation pointing to this same object -->
+ readonly attribute <span>Storage</span> <span title="dom-localStorage">localStorage</span>;
readonly attribute <span>Storage</span> <span title="dom-sessionStorage">sessionStorage</span>;
+ <span>Database</span> <span title="dom-opendatabase">openDatabase</span>(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize);
// user prompts
void <span title="dom-alert">alert</span>(in DOMString message);
@@ -28789,6 +28778,8 @@
any <span title="dom-showModalDialog">showModalDialog</span>(in DOMString url);
any <span title="dom-showModalDialog">showModalDialog</span>(in DOMString url, in any arguments);<!--
any <span title="dom-showModalDialog">showModalDialog</span>(in DOMString url, in any arguments, in DOMString features);-->
+ void <span title="dom-showNotification">showNotification</span>(in DOMString title, in DOMString subtitle, in DOMString description);
+ void <span title="dom-showNotification">showNotification</span>(in DOMString title, in DOMString subtitle, in DOMString description, in VoidCallback onclick);
// other browsing contexts
readonly attribute <span>Window</span> <span title="dom-frames">frames</span>;
@@ -29523,8 +29514,9 @@
<h4>Script execution contexts</h4>
<p>The <dfn>script execution context</dfn> of a script is defined
- when that script is created. It is either a <code>Window</code>
- object or an empty object.</p>
+ when that script is created. In this specification, it is either a
+ <code>Window</code> object or an empty object; other specifications
+ might make the script execution context be some other object.</p>
<p>When the <span>script execution context</span> of a script is an
empty object, it can't do anything that interacts with the
@@ -29533,10 +29525,10 @@
<p>A <span>script execution context</span> always has an associated
<span>browsing context</span>, known as the <dfn>script browsing
context</dfn>. If the <span>script execution context</span> is a
- <code>WindowBrowsingContext</code> object, then that object's
- <span>browsing context</span> is it. Otherwise, the <span>script
- execution context</span> is associated explicitly with a
- <span>browsing context</span> when it is created.</p>
+ <code>Window</code> object, then that object's <span>browsing
+ context</span> is it. Otherwise, the <span>script execution
+ context</span> is associated explicitly with a <span>browsing
+ context</span> when it is created.</p>
<p>Every script whose <span>script execution context</span> is a
<code>Window</code> object is also associated with a
More information about the Commit-Watchers
mailing list