html5/spec Overview.html,1.1208,1.1209

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv4370

Modified Files:
	Overview.html 
Log Message:
Merge WindowBrowsingContext and Window together again. (whatwg r2021)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.1208
retrieving revision 1.1209
diff -u -d -r1.1208 -r1.1209
--- Overview.html	6 Aug 2008 00:25:52 -0000	1.1208
+++ Overview.html	6 Aug 2008 00:28:20 -0000	1.1209
@@ -31584,26 +31584,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>;
@@ -31612,7 +31598,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);
@@ -31623,6 +31611,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>;
@@ -32301,8 +32291,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.
@@ -32310,10 +32302,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.

Received on Wednesday, 6 August 2008 00:29:01 UTC