[html5] r7668 - [giow] (2) Fix bug 18626 and actually do what the previous checkin was trying to [...]

whatwg at whatwg.org whatwg at whatwg.org
Tue Jan 29 12:12:45 PST 2013


Author: ianh
Date: 2013-01-29 12:12:43 -0800 (Tue, 29 Jan 2013)
New Revision: 7668

Modified:
   complete.html
   index
   source
Log:
[giow] (2) Fix bug 18626 and actually do what the previous checkin was trying to do.
Affected topics: HTML

Modified: complete.html
===================================================================
--- complete.html	2013-01-29 19:18:46 UTC (rev 7667)
+++ complete.html	2013-01-29 20:12:43 UTC (rev 7668)
@@ -9546,8 +9546,7 @@
   // special <a href=#event-handler-idl-attributes>event handler IDL attributes</a> that only apply to Document objects
   [LenientThis] attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onreadystatechange title=handler-onreadystatechange>onreadystatechange</a>;
 };
-<a href=#document>Document</a> implements <a href=#globaleventhandlers>GlobalEventHandlers</a>;
-<a href=#document>Document</a> implements <a href=#nodeeventhandlers>NodeEventHandlers</a>;</pre>
+<a href=#document>Document</a> implements <a href=#globaleventhandlers>GlobalEventHandlers</a>;</pre>
 
 
 <!--ADD-TOPIC:Security-->
@@ -10498,7 +10497,6 @@
   [PutForwards=<a href=#dom-cssstyledeclaration-csstext title=dom-CSSStyleDeclaration-cssText>cssText</a>] readonly attribute <a href=#cssstyledeclaration>CSSStyleDeclaration</a> <a href=#dom-style title=dom-style>style</a>;
 };
 <a href=#htmlelement>HTMLElement</a> implements <a href=#globaleventhandlers>GlobalEventHandlers</a>;
-<a href=#htmlelement>HTMLElement</a> implements <a href=#nodeeventhandlers>NodeEventHandlers</a>;
 
 interface <dfn id=htmlunknownelement>HTMLUnknownElement</dfn> : <a href=#htmlelement>HTMLElement</a> { };</pre>
 
@@ -16844,13 +16842,9 @@
    <dd><code title=handler-window-onafterprint><a href=#handler-window-onafterprint>onafterprint</a></code></dd>
    <dd><code title=handler-window-onbeforeprint><a href=#handler-window-onbeforeprint>onbeforeprint</a></code></dd>
    <dd><code title=handler-window-onbeforeunload><a href=#handler-window-onbeforeunload>onbeforeunload</a></code></dd>
-   <dd><code title=handler-window-onblur><a href=#handler-window-onblur>onblur</a></code></dd>
-   <dd><code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code></dd>
-   <dd><code title=handler-window-onfocus><a href=#handler-window-onfocus>onfocus</a></code></dd>
    <dd><code title=handler-window-onfullscreenchange><a href=#handler-window-onfullscreenchange>onfullscreenchange</a></code></dd>
    <dd><code title=handler-window-onfullscreenerror><a href=#handler-window-onfullscreenerror>onfullscreenerror</a></code></dd>
    <dd><code title=handler-window-onhashchange><a href=#handler-window-onhashchange>onhashchange</a></code></dd>
-   <dd><code title=handler-window-onload><a href=#handler-window-onload>onload</a></code></dd>
    <dd><code title=handler-window-onmessage><a href=#handler-window-onmessage>onmessage</a></code></dd>
    <dd><code title=handler-window-onoffline><a href=#handler-window-onoffline>onoffline</a></code></dd>
    <dd><code title=handler-window-ononline><a href=#handler-window-ononline>ononline</a></code></dd>
@@ -16858,7 +16852,6 @@
    <dd><code title=handler-window-onpageshow><a href=#handler-window-onpageshow>onpageshow</a></code></dd>
    <dd><code title=handler-window-onpopstate><a href=#handler-window-onpopstate>onpopstate</a></code></dd>
    <dd><code title=handler-window-onresize><a href=#handler-window-onresize>onresize</a></code></dd>
-   <dd><code title=handler-window-onscroll><a href=#handler-window-onscroll>onscroll</a></code></dd>
    <dd><code title=handler-window-onstorage><a href=#handler-window-onstorage>onstorage</a></code></dd>
    <dd><code title=handler-window-onunload><a href=#handler-window-onunload>onunload</a></code></dd>
    <dt><a href=#element-dfn-dom title=element-dfn-dom>DOM interface</a>:</dt><!--TOPIC:DOM APIs-->
@@ -16890,19 +16883,17 @@
   handlers</a> of the <code><a href=#window>Window</a></code> object. It also mirrors
   their <a href=#event-handler-idl-attributes>event handler IDL attributes</a>.</p>
 
-  <p>The <code title=handler-window-onblur><a href=#handler-window-onblur>onblur</a></code>, <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>, <code title=handler-window-onfocus><a href=#handler-window-onfocus>onfocus</a></code>, <code title=handler-window-onload><a href=#handler-window-onload>onload</a></code>,
-  and <code title=handler-window-onscroll><a href=#handler-window-onscroll>onscroll</a></code> <a href=#event-handlers>event handlers</a> of the
-  <code><a href=#window>Window</a></code> object, exposed on the <code><a href=#the-body-element>body</a></code> element, shadow the generic
-  <a href=#event-handlers>event handlers</a> with the same names normally supported by <a href=#html-elements>HTML elements</a>.
-  With the exception of <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>, this is actually
-  implemented by just using the properties of the <code><a href=#htmlelement>HTMLElement</a></code> interface. The <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> attribute has a different type.</p>
+  <p>The <code title=handler-onblur><a href=#handler-onblur>onblur</a></code>, <code title=handler-onerror><a href=#handler-onerror>onerror</a></code>, <code title=handler-onfocus><a href=#handler-onfocus>onfocus</a></code>, <code title=handler-onload><a href=#handler-onload>onload</a></code>,
+  and <code title=handler-onscroll><a href=#handler-onscroll>onscroll</a></code> <a href=#event-handlers>event handlers</a> of the
+  <code><a href=#window>Window</a></code> object, exposed on the <code><a href=#the-body-element>body</a></code> element, replace the generic
+  <a href=#event-handlers>event handlers</a> with the same names normally supported by <a href=#html-elements>HTML elements</a>.</p>
 
   <p class=example>Thus, for example, a bubbling <code title=event-error>error</code> event dispatched on a child of
   <a href=#the-body-element-0>the body element</a> of a <code><a href=#document>Document</a></code> would first
   trigger the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code> <a href=#event-handler-content-attributes>event
   handler content attributes</a> of that element, then that of the
   root <code><a href=#the-html-element>html</a></code> element, and only <em>then</em> would it
-  trigger the <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>
+  trigger the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code>
   <a href=#event-handler-content-attributes title="event handler content attributes">event handler content
   attribute</a> on the <code><a href=#the-body-element>body</a></code> element. This is because
   the event would bubble from the target, to the <code><a href=#the-body-element>body</a></code>, to
@@ -66377,8 +66368,7 @@
   void <a href=#dom-window-postmessage title=dom-window-postMessage>postMessage</a>(any message, DOMString targetOrigin, optional sequence<<a href=#transferable>Transferable</a>> transfer);
 };
 <a href=#window>Window</a> implements <a href=#globaleventhandlers>GlobalEventHandlers</a>;
-<a href=#window>Window</a> implements <a href=#windoweventhandlers>WindowEventHandlers</a>;
-<a href=#window>Window</a> implements <a href=#shadowingwindoweventhandlers>ShadowingWindowEventHandlers</a>;</pre>
+<a href=#window>Window</a> implements <a href=#windoweventhandlers>WindowEventHandlers</a>;</pre>
 
 <!-- for more features to add here, look here:
  http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/obj_window.asp
@@ -69103,12 +69093,6 @@
 
        </li>
 
-       <li><p>Remove any <a href=#concept-task title=concept-task>tasks</a> queued by the <a href=#history-traversal-task-source>history
-       traversal task source</a> that are associated with any <code><a href=#document>Document</a></code> objects in
-       the <a href=#top-level-browsing-context>top-level browsing context</a>'s <a href=#document-family>document family</a>.</li> <!-- so
-       the network is racing history.back(), in the case of setting location.href="" and then
-       calling history.back() -->
-
        <li><p>Append a new entry at the end of the <code><a href=#history-0>History</a></code> object representing the new
        resource and its <code><a href=#document>Document</a></code> object and related state.</li>
 
@@ -69503,8 +69487,14 @@
    <li><p>If the <var title="">specified entry</var> has a different <code><a href=#document>Document</a></code> object
    than the <a href=#current-entry>current entry</a> then the following substeps:</p>
 
-    <ol><li>
+    <ol><li><p>Remove any <a href=#concept-task title=concept-task>tasks</a> queued by the <a href=#history-traversal-task-source>history traversal
+     task source</a> that are associated with any <code><a href=#document>Document</a></code> objects in the
+     <a href=#top-level-browsing-context>top-level browsing context</a>'s <a href=#document-family>document family</a>.</li> <!-- so the
+     network is racing history.back(), in the case of setting location.href="" and then calling
+     history.back() -->
 
+     <li>
+
       <p>If the <a href=#origin>origin</a> of the <code><a href=#document>Document</a></code> of the <var title="">specified
       entry</var> is not the <a href=#same-origin title="same origin">same</a> as the <a href=#origin>origin</a> of the
       <code><a href=#document>Document</a></code> of the <a href=#current-entry>current entry</a>, then run the following
@@ -72558,7 +72548,7 @@
 
     <p>Otherwise, <a href=#report-the-error>report the error</a> for the <a href=#concept-script title=concept-script>script</a>,
     with the problematic position (line number and column number), in the script's
-    <a href=#origin>origin</a>, using the <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> <a href=#event-handlers title="event handlers">event handler</a> of the <a href="#script's-global-object">script's global object</a>. If the
+    <a href=#origin>origin</a>, using the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code> <a href=#event-handlers title="event handlers">event handler</a> of the <a href="#script's-global-object">script's global object</a>. If the
     error is still <i title=concept-error-nothandled><a href=#concept-error-nothandled>not handled</a></i> after this, then the error
     may be reported to the user.</p>
 
@@ -72694,7 +72684,7 @@
 
   <p>Whenever an uncaught runtime script error occurs in one of the scripts associated with a
   <code><a href=#document>Document</a></code>, the user agent must <a href=#report-the-error>report the error</a> for the relevant <a href=#concept-script title=concept-script>script</a>, with the problematic position (line number and column
-  number) in the resource containing the script, using the <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> <a href=#event-handlers title="event handlers">event handler</a> of
+  number) in the resource containing the script, using the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code> <a href=#event-handlers title="event handlers">event handler</a> of
   the <a href="#script's-global-object">script's global object</a>. If the error is still <i title=concept-error-nothandled><a href=#concept-error-nothandled>not handled</a></i> after this, then the error may be reported to the
   user.</p>
 
@@ -73310,7 +73300,7 @@
 
      <dd>
 
-      <dl class=switch><dt>If the attribute is the <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> attribute of
+      <dl class=switch><dt>If the attribute is the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code> attribute of
        the <code><a href=#window>Window</a></code> object</dt>
 
        <dd>Let the function have four arguments, named <code title="">event</code>, <code title="">source</code>, <code title="">lineno</code>, and <code title="">column</code>.</dd>
@@ -73443,7 +73433,7 @@
    value</a>, then set the <a href=#event-handlers title="event handlers">event handler</a> to null and then
    <a href=#report-the-error>report the error</a> for the appropriate <a href=#concept-script title=concept-script>script</a> and
    with the appropriate position (line number and column number), as established when the error was
-   detected, using the <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> <a href=#event-handlers title="event
+   detected, using the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code> <a href=#event-handlers title="event
    handlers">event handler</a> of the <code><a href=#window>Window</a></code> object of that <code><a href=#document>Document</a></code>,
    and abort these steps.</li>
 
@@ -73588,7 +73578,10 @@
   by all <a href=#html-elements>HTML elements</a> other than <code><a href=#the-body-element>body</a></code> and
   <code><a href=#frameset>frameset</a></code>, as both content attributes and IDL
   attributes, and on <code><a href=#document>Document</a></code> objects, as IDL
-  attributes:</p>
+  attributes; and by <code><a href=#window>Window</a></code> objects, as IDL attributes on the
+  <code><a href=#window>Window</a></code> object, and with corresponding content
+  attributes and IDL attributes exposed on the <code><a href=#the-body-element>body</a></code> and
+  <code><a href=#frameset>frameset</a></code> elements:</p>
 
   <table><thead><tr><th><a href=#event-handlers title="event handlers">Event handler</a> <th><a href=#event-handler-event-type>Event handler event type</a>
    <tbody><tr><td><dfn id=handler-onblur title=handler-onblur><code>onblur</code></dfn> <td> <code title=event-blur>blur</code> <!-- widely used -->
@@ -73608,13 +73601,9 @@
    <tbody><tr><td><dfn id=handler-window-onafterprint title=handler-window-onafterprint><code>onafterprint</code></dfn> <td> <code title=event-afterprint>afterprint</code>
     <tr><td><dfn id=handler-window-onbeforeprint title=handler-window-onbeforeprint><code>onbeforeprint</code></dfn> <td> <code title=event-beforeprint>beforeprint</code>
     <tr><td><dfn id=handler-window-onbeforeunload title=handler-window-onbeforeunload><code>onbeforeunload</code></dfn> <td> <code title=event-beforeunload>beforeunload</code>
-    <tr><td><dfn id=handler-window-onblur title=handler-window-onblur><code>onblur</code></dfn> <td> <code title=event-blur>blur</code>
-    <tr><td><dfn id=handler-window-onerror title=handler-window-onerror><code>onerror</code></dfn> <td> <code title=event-error>error</code>
-    <tr><td><dfn id=handler-window-onfocus title=handler-window-onfocus><code>onfocus</code></dfn> <td> <code title=event-focus>focus</code>
     <tr><td><dfn id=handler-window-onfullscreenchange title=handler-window-onfullscreenchange><code>onfullscreenchange</code></dfn> <td> <code title=event-fullscreenchange>fullscreenchange</code>
     <tr><td><dfn id=handler-window-onfullscreenerror title=handler-window-onfullscreenerror><code>onfullscreenerror</code></dfn> <td> <code title=event-fullscreenerror>fullscreenerror</code>
     <tr><td><dfn id=handler-window-onhashchange title=handler-window-onhashchange><code>onhashchange</code></dfn> <td> <code title=event-hashchange><a href=#event-hashchange>hashchange</a></code> <!-- new -->
-    <tr><td><dfn id=handler-window-onload title=handler-window-onload><code>onload</code></dfn> <td> <code title=event-load>load</code> <!-- widely used -->
     <tr><td><dfn id=handler-window-onmessage title=handler-window-onmessage><code>onmessage</code></dfn> <td> <code title=event-message><a href=#event-message>message</a></code> <!-- new for postMessage -->
     <tr><td><dfn id=handler-window-onoffline title=handler-window-onoffline><code>onoffline</code></dfn> <td> <code title=event-offline><a href=#event-offline>offline</a></code> <!-- new -->
     <tr><td><dfn id=handler-window-ononline title=handler-window-ononline><code>ononline</code></dfn> <td> <code title=event-online><a href=#event-online>online</a></code> <!-- new -->
@@ -73622,10 +73611,9 @@
     <tr><td><dfn id=handler-window-onpageshow title=handler-window-onpageshow><code>onpageshow</code></dfn> <td> <code title=event-pageshow><a href=#event-pageshow>pageshow</a></code> <!-- new -->
     <tr><td><dfn id=handler-window-onpopstate title=handler-window-onpopstate><code>onpopstate</code></dfn> <td> <code title=event-popstate><a href=#event-popstate>popstate</a></code> <!-- new -->
     <tr><td><dfn id=handler-window-onresize title=handler-window-onresize><code>onresize</code></dfn> <td> <code title=event-resize>resize</code> <!-- widely used --> <!-- [CSSOM] -->
-    <tr><td><dfn id=handler-window-onscroll title=handler-window-onscroll><code>onscroll</code></dfn> <td> <code title=event-scroll>scroll</code>
     <tr><td><dfn id=handler-window-onstorage title=handler-window-onstorage><code>onstorage</code></dfn> <td> <code title=event-storage><a href=#event-storage>storage</a></code> <!-- new -->
     <tr><td><dfn id=handler-window-onunload title=handler-window-onunload><code>onunload</code></dfn> <td> <code title=event-unload>unload</code> <!-- widely used -->
-  </table><p class=note>The <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>
+  </table><p class=note>The <code title=handler-onerror><a href=#handler-onerror>onerror</a></code>
   handler is also used for <a href=#runtime-script-errors>reporting script errors</a>.</p>
 
   <hr><!-- this guy is only on Document and not on HTMLElement because
@@ -73648,6 +73636,9 @@
   <pre class=idl>[NoInterfaceObject]
 interface <dfn id=globaleventhandlers>GlobalEventHandlers</dfn> {
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onabort title=handler-onabort>onabort</a>;
+           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onblur title=handler-onblur>onblur</a>;
+           attribute <a href=#onerroreventhandler>OnErrorEventHandler</a> <a href=#handler-onerror title=handler-onerror>onerror</a>;
+           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onfocus title=handler-onfocus>onfocus</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-oncancel title=handler-oncancel>oncancel</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-oncanplay title=handler-oncanplay>oncanplay</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-oncanplaythrough title=handler-oncanplaythrough>oncanplaythrough</a>;
@@ -73672,6 +73663,7 @@
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onkeydown title=handler-onkeydown>onkeydown</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onkeypress title=handler-onkeypress>onkeypress</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onkeyup title=handler-onkeyup>onkeyup</a>;
+           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onload title=handler-onload>onload</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onloadeddata title=handler-onloadeddata>onloadeddata</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onloadedmetadata title=handler-onloadedmetadata>onloadedmetadata</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onloadstart title=handler-onloadstart>onloadstart</a>;
@@ -73687,6 +73679,7 @@
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onprogress title=handler-onprogress>onprogress</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onratechange title=handler-onratechange>onratechange</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onreset title=handler-onreset>onreset</a>;
+           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onscroll title=handler-onscroll>onscroll</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onseeked title=handler-onseeked>onseeked</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onseeking title=handler-onseeking>onseeking</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onselect title=handler-onselect>onselect</a>;
@@ -73701,20 +73694,10 @@
 };
 
 [NoInterfaceObject]
-interface <dfn id=nodeeventhandlers>NodeEventHandlers</dfn> {
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onblur title=handler-onblur>onblur</a>;
-           attribute <a href=#onerroreventhandler>OnErrorEventHandler</a> <a href=#handler-onerror title=handler-onerror>onerror</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onfocus title=handler-onfocus>onfocus</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onload title=handler-onload>onload</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onscroll title=handler-onscroll>onscroll</a>;
-};
-
-[NoInterfaceObject]
 interface <dfn id=windoweventhandlers>WindowEventHandlers</dfn> {
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onafterprint title=handler-window-onafterprint>onafterprint</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onbeforeprint title=handler-window-onbeforeprint>onbeforeprint</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onbeforeunload title=handler-window-onbeforeunload>onbeforeunload</a>;
-           attribute <a href=#onerroreventhandler>OnErrorEventHandler</a> <a href=#handler-window-onerror title=handler-window-onerror>onerror</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onfullscreenchange title=handler-window-onfullscreenchange>onfullscreenchange</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onfullscreenerror title=handler-window-onfullscreenerror>onfullscreenerror</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onhashchange title=handler-window-onhashchange>onhashchange</a>;
@@ -73727,15 +73710,6 @@
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onresize title=handler-window-onresize>onresize</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onstorage title=handler-window-onstorage>onstorage</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onunload title=handler-window-onunload>onunload</a>;
-};
-
-[NoInterfaceObject]
-interface <dfn id=shadowingwindoweventhandlers>ShadowingWindowEventHandlers</dfn> {
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onblur title=handler-window-onblur>onblur</a>;
-//         attribute <a href=#onerroreventhandler>OnErrorEventHandler</a> <a href=#handler-window-onerror title=handler-window-onerror>onerror</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onfocus title=handler-window-onfocus>onfocus</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onload title=handler-window-onload>onload</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onscroll title=handler-window-onscroll>onscroll</a>;
 };</pre>
 
 
@@ -98664,13 +98638,9 @@
   <ul class=brief><li><code title=handler-window-onafterprint><a href=#handler-window-onafterprint>onafterprint</a></code></li>
    <li><code title=handler-window-onbeforeprint><a href=#handler-window-onbeforeprint>onbeforeprint</a></code></li>
    <li><code title=handler-window-onbeforeunload><a href=#handler-window-onbeforeunload>onbeforeunload</a></code></li>
-   <li><code title=handler-window-onblur><a href=#handler-window-onblur>onblur</a></code></li>
-   <li><code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code></li>
-   <li><code title=handler-window-onfocus><a href=#handler-window-onfocus>onfocus</a></code></li>
    <li><code title=handler-window-onfullscreenchange><a href=#handler-window-onfullscreenchange>onfullscreenchange</a></code></li>
    <li><code title=handler-window-onfullscreenerror><a href=#handler-window-onfullscreenerror>onfullscreenerror</a></code></li>
    <li><code title=handler-window-onhashchange><a href=#handler-window-onhashchange>onhashchange</a></code></li>
-   <li><code title=handler-window-onload><a href=#handler-window-onload>onload</a></code></li>
    <li><code title=handler-window-onmessage><a href=#handler-window-onmessage>onmessage</a></code></li>
    <li><code title=handler-window-onoffline><a href=#handler-window-onoffline>onoffline</a></code></li>
    <li><code title=handler-window-ononline><a href=#handler-window-ononline>ononline</a></code></li>
@@ -98678,18 +98648,15 @@
    <li><code title=handler-window-onpageshow><a href=#handler-window-onpageshow>onpageshow</a></code></li>
    <li><code title=handler-window-onpopstate><a href=#handler-window-onpopstate>onpopstate</a></code></li>
    <li><code title=handler-window-onresize><a href=#handler-window-onresize>onresize</a></code></li>
-   <li><code title=handler-window-onscroll><a href=#handler-window-onscroll>onscroll</a></code></li>
    <li><code title=handler-window-onstorage><a href=#handler-window-onstorage>onstorage</a></code></li>
    <li><code title=handler-window-onunload><a href=#handler-window-onunload>onunload</a></code></li>
   </ul><p>The DOM interface also exposes <a href=#event-handler-idl-attributes>event handler IDL attributes</a> that mirror those on
   the <code><a href=#window>Window</a></code> element.</p>
 
-  <p>The <code title=handler-window-onblur><a href=#handler-window-onblur>onblur</a></code>, <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>, <code title=handler-window-onfocus><a href=#handler-window-onfocus>onfocus</a></code>, <code title=handler-window-onload><a href=#handler-window-onload>onload</a></code>,
-  and <code title=handler-window-onscroll><a href=#handler-window-onscroll>onscroll</a></code> <a href=#event-handlers>event handlers</a> of the
-  <code><a href=#window>Window</a></code> object, exposed on the <code><a href=#frameset>frameset</a></code> element, shadow the generic
-  <a href=#event-handlers>event handlers</a> with the same names normally supported by <a href=#html-elements>HTML elements</a>.
-  With the exception of <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>, this is actually
-  implemented by just using the properties of the <code><a href=#htmlelement>HTMLElement</a></code> interface. The <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> attribute has a different type.</p>
+  <p>The <code title=handler-onblur><a href=#handler-onblur>onblur</a></code>, <code title=handler-onerror><a href=#handler-onerror>onerror</a></code>, <code title=handler-onfocus><a href=#handler-onfocus>onfocus</a></code>, <code title=handler-onload><a href=#handler-onload>onload</a></code>,
+  and <code title=handler-onscroll><a href=#handler-onscroll>onscroll</a></code> <a href=#event-handlers>event handlers</a> of the
+  <code><a href=#window>Window</a></code> object, exposed on the <code><a href=#frameset>frameset</a></code> element, replace the generic
+  <a href=#event-handlers>event handlers</a> with the same names normally supported by <a href=#html-elements>HTML elements</a>.</p>
 
   <hr><p>The <dfn id=frame><code>frame</code></dfn> element defines a <a href=#nested-browsing-context>nested browsing context</a>
   similar to the <code><a href=#the-iframe-element>iframe</a></code> element, but rendered within a <code><a href=#frameset>frameset</a></code>
@@ -100344,13 +100311,9 @@
          <code title=handler-window-onafterprint><a href=#handler-window-onafterprint>onafterprint</a></code>;
          <code title=handler-window-onbeforeprint><a href=#handler-window-onbeforeprint>onbeforeprint</a></code>;
          <code title=handler-window-onbeforeunload><a href=#handler-window-onbeforeunload>onbeforeunload</a></code>;
-         <code title=handler-window-onblur><a href=#handler-window-onblur>onblur</a></code>;
-         <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>;
-         <code title=handler-window-onfocus><a href=#handler-window-onfocus>onfocus</a></code>;
          <code title=handler-window-onfullscreenchange><a href=#handler-window-onfullscreenchange>onfullscreenchange</a></code>;
          <code title=handler-window-onfullscreenerror><a href=#handler-window-onfullscreenerror>onfullscreenerror</a></code>;
          <code title=handler-window-onhashchange><a href=#handler-window-onhashchange>onhashchange</a></code>;
-         <code title=handler-window-onload><a href=#handler-window-onload>onload</a></code>;
          <code title=handler-window-onmessage><a href=#handler-window-onmessage>onmessage</a></code>;
          <code title=handler-window-onoffline><a href=#handler-window-onoffline>onoffline</a></code>;
          <code title=handler-window-ononline><a href=#handler-window-ononline>ononline</a></code>;
@@ -100358,7 +100321,6 @@
          <code title=handler-window-onpageshow><a href=#handler-window-onpageshow>onpageshow</a></code>;
          <code title=handler-window-onpopstate><a href=#handler-window-onpopstate>onpopstate</a></code>;
          <code title=handler-window-onresize><a href=#handler-window-onresize>onresize</a></code>;
-         <code title=handler-window-onscroll><a href=#handler-window-onscroll>onscroll</a></code>;
          <code title=handler-window-onstorage><a href=#handler-window-onstorage>onstorage</a></code>;
          <code title=handler-window-onunload><a href=#handler-window-onunload>onunload</a></code></td>
      <td><code><a href=#htmlbodyelement>HTMLBodyElement</a></code></td>
@@ -102536,11 +102498,6 @@
      <td> <code title=event-beforeunload>beforeunload</code> event handler for <code><a href=#window>Window</a></code> object
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
 
-    <tr><th id=ix-handler-window-onblur> <code title="">onblur</code>
-     <td> <code title=handler-window-onblur><a href=#handler-window-onblur>body</a></code>
-     <td> <code title=event-blur>blur</code> event handler for <code><a href=#window>Window</a></code> object
-     <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-
     <tr><th id=ix-handler-onblur> <code title="">onblur</code>
      <td> <a href=#handler-onblur title=handler-onblur>HTML elements</a>
      <td> <code title=event-blur>blur</code> event handler
@@ -102641,21 +102598,11 @@
      <td> <code title=event-media-ended><a href=#event-media-ended>ended</a></code> event handler
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
 
-    <tr><th id=ix-handler-window-onerror> <code title="">onerror</code>
-     <td> <code title=handler-window-onerror><a href=#handler-window-onerror>body</a></code>
-     <td> <code title=event-error>error</code> event handler for <code><a href=#window>Window</a></code> object, and handler for <a href=#runtime-script-errors>script error notifications</a>
-     <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-
     <tr><th id=ix-handler-onerror> <code title="">onerror</code>
      <td> <a href=#handler-onerror title=handler-onerror>HTML elements</a>
-     <td> <code title=event-error>error</code> event handler
+     <td> <code title=event-error>error</code> event handler, and handler for <a href=#runtime-script-errors>script error notifications</a>
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
 
-    <tr><th id=ix-handler-window-onfocus> <code title="">onfocus</code>
-     <td> <code title=handler-window-onfocus><a href=#handler-window-onfocus>body</a></code>
-     <td> <code title=event-focus>focus</code> event handler for <code><a href=#window>Window</a></code> object
-     <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-
     <tr><th id=ix-handler-onfocus> <code title="">onfocus</code>
      <td> <a href=#handler-onfocus title=handler-onfocus>HTML elements</a>
      <td> <code title=event-focus>focus</code> event handler
@@ -102701,11 +102648,6 @@
      <td> <code title=event-keyup>keyup</code> event handler
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
 
-    <tr><th id=ix-handler-window-onload> <code title="">onload</code>
-     <td> <code title=handler-window-onload><a href=#handler-window-onload>body</a></code>
-     <td> <code title=event-load>load</code> event handler for <code><a href=#window>Window</a></code> object
-     <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-
     <tr><th id=ix-handler-onload> <code title="">onload</code>
      <td> <a href=#handler-onload title=handler-onload>HTML elements</a>
      <td> <code title=event-load>load</code> event handler
@@ -102821,11 +102763,6 @@
      <td> <code title=event-resize>resize</code> event handler for <code><a href=#window>Window</a></code> object
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
 
-    <tr><th id=ix-handler-window-onscroll> <code title="">onscroll</code>
-     <td> <code title=handler-window-onscroll><a href=#handler-window-onscroll>body</a></code>
-     <td> <code title=event-scroll>scroll</code> event handler for <code><a href=#window>Window</a></code> object
-     <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-
     <tr><th id=ix-handler-onscroll> <code title="">onscroll</code>
      <td> <a href=#handler-onscroll title=handler-onscroll>HTML elements</a>
      <td> <code title=event-scroll>scroll</code> event handler
@@ -103387,14 +103324,12 @@
    <li><code><a href=#navigatorlanguage>NavigatorLanguage</a></code>
    <li><code><a href=#navigatoronline>NavigatorOnLine</a></code>
    <li><code><a href=#navigatorstorageutils>NavigatorStorageUtils</a></code>
-   <li><code><a href=#nodeeventhandlers>NodeEventHandlers</a></code>
    <li><code><a href=#pagetransitionevent>PageTransitionEvent</a></code>
    <li><code><a href=#path>Path</a></code>
    <li><code><a href=#popstateevent>PopStateEvent</a></code>
    <li><code><a href=#portcollection>PortCollection</a></code>
    <li><code><a href=#propertynodelist>PropertyNodeList</a></code>
    <li><code><a href=#radionodelist>RadioNodeList</a></code>
-   <li><code><a href=#shadowingwindoweventhandlers>ShadowingWindowEventHandlers</a></code>
    <li><code><a href=#sharedworker>SharedWorker</a></code>
    <li><code><a href=#sharedworkerglobalscope>SharedWorkerGlobalScope</a></code>
    <li><code><a href=#storage-0>Storage</a></code>

Modified: index
===================================================================
--- index	2013-01-29 19:18:46 UTC (rev 7667)
+++ index	2013-01-29 20:12:43 UTC (rev 7668)
@@ -9546,8 +9546,7 @@
   // special <a href=#event-handler-idl-attributes>event handler IDL attributes</a> that only apply to Document objects
   [LenientThis] attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onreadystatechange title=handler-onreadystatechange>onreadystatechange</a>;
 };
-<a href=#document>Document</a> implements <a href=#globaleventhandlers>GlobalEventHandlers</a>;
-<a href=#document>Document</a> implements <a href=#nodeeventhandlers>NodeEventHandlers</a>;</pre>
+<a href=#document>Document</a> implements <a href=#globaleventhandlers>GlobalEventHandlers</a>;</pre>
 
 
 <!--ADD-TOPIC:Security-->
@@ -10498,7 +10497,6 @@
   [PutForwards=<a href=#dom-cssstyledeclaration-csstext title=dom-CSSStyleDeclaration-cssText>cssText</a>] readonly attribute <a href=#cssstyledeclaration>CSSStyleDeclaration</a> <a href=#dom-style title=dom-style>style</a>;
 };
 <a href=#htmlelement>HTMLElement</a> implements <a href=#globaleventhandlers>GlobalEventHandlers</a>;
-<a href=#htmlelement>HTMLElement</a> implements <a href=#nodeeventhandlers>NodeEventHandlers</a>;
 
 interface <dfn id=htmlunknownelement>HTMLUnknownElement</dfn> : <a href=#htmlelement>HTMLElement</a> { };</pre>
 
@@ -16844,13 +16842,9 @@
    <dd><code title=handler-window-onafterprint><a href=#handler-window-onafterprint>onafterprint</a></code></dd>
    <dd><code title=handler-window-onbeforeprint><a href=#handler-window-onbeforeprint>onbeforeprint</a></code></dd>
    <dd><code title=handler-window-onbeforeunload><a href=#handler-window-onbeforeunload>onbeforeunload</a></code></dd>
-   <dd><code title=handler-window-onblur><a href=#handler-window-onblur>onblur</a></code></dd>
-   <dd><code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code></dd>
-   <dd><code title=handler-window-onfocus><a href=#handler-window-onfocus>onfocus</a></code></dd>
    <dd><code title=handler-window-onfullscreenchange><a href=#handler-window-onfullscreenchange>onfullscreenchange</a></code></dd>
    <dd><code title=handler-window-onfullscreenerror><a href=#handler-window-onfullscreenerror>onfullscreenerror</a></code></dd>
    <dd><code title=handler-window-onhashchange><a href=#handler-window-onhashchange>onhashchange</a></code></dd>
-   <dd><code title=handler-window-onload><a href=#handler-window-onload>onload</a></code></dd>
    <dd><code title=handler-window-onmessage><a href=#handler-window-onmessage>onmessage</a></code></dd>
    <dd><code title=handler-window-onoffline><a href=#handler-window-onoffline>onoffline</a></code></dd>
    <dd><code title=handler-window-ononline><a href=#handler-window-ononline>ononline</a></code></dd>
@@ -16858,7 +16852,6 @@
    <dd><code title=handler-window-onpageshow><a href=#handler-window-onpageshow>onpageshow</a></code></dd>
    <dd><code title=handler-window-onpopstate><a href=#handler-window-onpopstate>onpopstate</a></code></dd>
    <dd><code title=handler-window-onresize><a href=#handler-window-onresize>onresize</a></code></dd>
-   <dd><code title=handler-window-onscroll><a href=#handler-window-onscroll>onscroll</a></code></dd>
    <dd><code title=handler-window-onstorage><a href=#handler-window-onstorage>onstorage</a></code></dd>
    <dd><code title=handler-window-onunload><a href=#handler-window-onunload>onunload</a></code></dd>
    <dt><a href=#element-dfn-dom title=element-dfn-dom>DOM interface</a>:</dt><!--TOPIC:DOM APIs-->
@@ -16890,19 +16883,17 @@
   handlers</a> of the <code><a href=#window>Window</a></code> object. It also mirrors
   their <a href=#event-handler-idl-attributes>event handler IDL attributes</a>.</p>
 
-  <p>The <code title=handler-window-onblur><a href=#handler-window-onblur>onblur</a></code>, <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>, <code title=handler-window-onfocus><a href=#handler-window-onfocus>onfocus</a></code>, <code title=handler-window-onload><a href=#handler-window-onload>onload</a></code>,
-  and <code title=handler-window-onscroll><a href=#handler-window-onscroll>onscroll</a></code> <a href=#event-handlers>event handlers</a> of the
-  <code><a href=#window>Window</a></code> object, exposed on the <code><a href=#the-body-element>body</a></code> element, shadow the generic
-  <a href=#event-handlers>event handlers</a> with the same names normally supported by <a href=#html-elements>HTML elements</a>.
-  With the exception of <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>, this is actually
-  implemented by just using the properties of the <code><a href=#htmlelement>HTMLElement</a></code> interface. The <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> attribute has a different type.</p>
+  <p>The <code title=handler-onblur><a href=#handler-onblur>onblur</a></code>, <code title=handler-onerror><a href=#handler-onerror>onerror</a></code>, <code title=handler-onfocus><a href=#handler-onfocus>onfocus</a></code>, <code title=handler-onload><a href=#handler-onload>onload</a></code>,
+  and <code title=handler-onscroll><a href=#handler-onscroll>onscroll</a></code> <a href=#event-handlers>event handlers</a> of the
+  <code><a href=#window>Window</a></code> object, exposed on the <code><a href=#the-body-element>body</a></code> element, replace the generic
+  <a href=#event-handlers>event handlers</a> with the same names normally supported by <a href=#html-elements>HTML elements</a>.</p>
 
   <p class=example>Thus, for example, a bubbling <code title=event-error>error</code> event dispatched on a child of
   <a href=#the-body-element-0>the body element</a> of a <code><a href=#document>Document</a></code> would first
   trigger the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code> <a href=#event-handler-content-attributes>event
   handler content attributes</a> of that element, then that of the
   root <code><a href=#the-html-element>html</a></code> element, and only <em>then</em> would it
-  trigger the <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>
+  trigger the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code>
   <a href=#event-handler-content-attributes title="event handler content attributes">event handler content
   attribute</a> on the <code><a href=#the-body-element>body</a></code> element. This is because
   the event would bubble from the target, to the <code><a href=#the-body-element>body</a></code>, to
@@ -66377,8 +66368,7 @@
   void <a href=#dom-window-postmessage title=dom-window-postMessage>postMessage</a>(any message, DOMString targetOrigin, optional sequence<<a href=#transferable>Transferable</a>> transfer);
 };
 <a href=#window>Window</a> implements <a href=#globaleventhandlers>GlobalEventHandlers</a>;
-<a href=#window>Window</a> implements <a href=#windoweventhandlers>WindowEventHandlers</a>;
-<a href=#window>Window</a> implements <a href=#shadowingwindoweventhandlers>ShadowingWindowEventHandlers</a>;</pre>
+<a href=#window>Window</a> implements <a href=#windoweventhandlers>WindowEventHandlers</a>;</pre>
 
 <!-- for more features to add here, look here:
  http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/obj_window.asp
@@ -69103,12 +69093,6 @@
 
        </li>
 
-       <li><p>Remove any <a href=#concept-task title=concept-task>tasks</a> queued by the <a href=#history-traversal-task-source>history
-       traversal task source</a> that are associated with any <code><a href=#document>Document</a></code> objects in
-       the <a href=#top-level-browsing-context>top-level browsing context</a>'s <a href=#document-family>document family</a>.</li> <!-- so
-       the network is racing history.back(), in the case of setting location.href="" and then
-       calling history.back() -->
-
        <li><p>Append a new entry at the end of the <code><a href=#history-0>History</a></code> object representing the new
        resource and its <code><a href=#document>Document</a></code> object and related state.</li>
 
@@ -69503,8 +69487,14 @@
    <li><p>If the <var title="">specified entry</var> has a different <code><a href=#document>Document</a></code> object
    than the <a href=#current-entry>current entry</a> then the following substeps:</p>
 
-    <ol><li>
+    <ol><li><p>Remove any <a href=#concept-task title=concept-task>tasks</a> queued by the <a href=#history-traversal-task-source>history traversal
+     task source</a> that are associated with any <code><a href=#document>Document</a></code> objects in the
+     <a href=#top-level-browsing-context>top-level browsing context</a>'s <a href=#document-family>document family</a>.</li> <!-- so the
+     network is racing history.back(), in the case of setting location.href="" and then calling
+     history.back() -->
 
+     <li>
+
       <p>If the <a href=#origin>origin</a> of the <code><a href=#document>Document</a></code> of the <var title="">specified
       entry</var> is not the <a href=#same-origin title="same origin">same</a> as the <a href=#origin>origin</a> of the
       <code><a href=#document>Document</a></code> of the <a href=#current-entry>current entry</a>, then run the following
@@ -72558,7 +72548,7 @@
 
     <p>Otherwise, <a href=#report-the-error>report the error</a> for the <a href=#concept-script title=concept-script>script</a>,
     with the problematic position (line number and column number), in the script's
-    <a href=#origin>origin</a>, using the <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> <a href=#event-handlers title="event handlers">event handler</a> of the <a href="#script's-global-object">script's global object</a>. If the
+    <a href=#origin>origin</a>, using the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code> <a href=#event-handlers title="event handlers">event handler</a> of the <a href="#script's-global-object">script's global object</a>. If the
     error is still <i title=concept-error-nothandled><a href=#concept-error-nothandled>not handled</a></i> after this, then the error
     may be reported to the user.</p>
 
@@ -72694,7 +72684,7 @@
 
   <p>Whenever an uncaught runtime script error occurs in one of the scripts associated with a
   <code><a href=#document>Document</a></code>, the user agent must <a href=#report-the-error>report the error</a> for the relevant <a href=#concept-script title=concept-script>script</a>, with the problematic position (line number and column
-  number) in the resource containing the script, using the <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> <a href=#event-handlers title="event handlers">event handler</a> of
+  number) in the resource containing the script, using the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code> <a href=#event-handlers title="event handlers">event handler</a> of
   the <a href="#script's-global-object">script's global object</a>. If the error is still <i title=concept-error-nothandled><a href=#concept-error-nothandled>not handled</a></i> after this, then the error may be reported to the
   user.</p>
 
@@ -73310,7 +73300,7 @@
 
      <dd>
 
-      <dl class=switch><dt>If the attribute is the <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> attribute of
+      <dl class=switch><dt>If the attribute is the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code> attribute of
        the <code><a href=#window>Window</a></code> object</dt>
 
        <dd>Let the function have four arguments, named <code title="">event</code>, <code title="">source</code>, <code title="">lineno</code>, and <code title="">column</code>.</dd>
@@ -73443,7 +73433,7 @@
    value</a>, then set the <a href=#event-handlers title="event handlers">event handler</a> to null and then
    <a href=#report-the-error>report the error</a> for the appropriate <a href=#concept-script title=concept-script>script</a> and
    with the appropriate position (line number and column number), as established when the error was
-   detected, using the <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> <a href=#event-handlers title="event
+   detected, using the <code title=handler-onerror><a href=#handler-onerror>onerror</a></code> <a href=#event-handlers title="event
    handlers">event handler</a> of the <code><a href=#window>Window</a></code> object of that <code><a href=#document>Document</a></code>,
    and abort these steps.</li>
 
@@ -73588,7 +73578,10 @@
   by all <a href=#html-elements>HTML elements</a> other than <code><a href=#the-body-element>body</a></code> and
   <code><a href=#frameset>frameset</a></code>, as both content attributes and IDL
   attributes, and on <code><a href=#document>Document</a></code> objects, as IDL
-  attributes:</p>
+  attributes; and by <code><a href=#window>Window</a></code> objects, as IDL attributes on the
+  <code><a href=#window>Window</a></code> object, and with corresponding content
+  attributes and IDL attributes exposed on the <code><a href=#the-body-element>body</a></code> and
+  <code><a href=#frameset>frameset</a></code> elements:</p>
 
   <table><thead><tr><th><a href=#event-handlers title="event handlers">Event handler</a> <th><a href=#event-handler-event-type>Event handler event type</a>
    <tbody><tr><td><dfn id=handler-onblur title=handler-onblur><code>onblur</code></dfn> <td> <code title=event-blur>blur</code> <!-- widely used -->
@@ -73608,13 +73601,9 @@
    <tbody><tr><td><dfn id=handler-window-onafterprint title=handler-window-onafterprint><code>onafterprint</code></dfn> <td> <code title=event-afterprint>afterprint</code>
     <tr><td><dfn id=handler-window-onbeforeprint title=handler-window-onbeforeprint><code>onbeforeprint</code></dfn> <td> <code title=event-beforeprint>beforeprint</code>
     <tr><td><dfn id=handler-window-onbeforeunload title=handler-window-onbeforeunload><code>onbeforeunload</code></dfn> <td> <code title=event-beforeunload>beforeunload</code>
-    <tr><td><dfn id=handler-window-onblur title=handler-window-onblur><code>onblur</code></dfn> <td> <code title=event-blur>blur</code>
-    <tr><td><dfn id=handler-window-onerror title=handler-window-onerror><code>onerror</code></dfn> <td> <code title=event-error>error</code>
-    <tr><td><dfn id=handler-window-onfocus title=handler-window-onfocus><code>onfocus</code></dfn> <td> <code title=event-focus>focus</code>
     <tr><td><dfn id=handler-window-onfullscreenchange title=handler-window-onfullscreenchange><code>onfullscreenchange</code></dfn> <td> <code title=event-fullscreenchange>fullscreenchange</code>
     <tr><td><dfn id=handler-window-onfullscreenerror title=handler-window-onfullscreenerror><code>onfullscreenerror</code></dfn> <td> <code title=event-fullscreenerror>fullscreenerror</code>
     <tr><td><dfn id=handler-window-onhashchange title=handler-window-onhashchange><code>onhashchange</code></dfn> <td> <code title=event-hashchange><a href=#event-hashchange>hashchange</a></code> <!-- new -->
-    <tr><td><dfn id=handler-window-onload title=handler-window-onload><code>onload</code></dfn> <td> <code title=event-load>load</code> <!-- widely used -->
     <tr><td><dfn id=handler-window-onmessage title=handler-window-onmessage><code>onmessage</code></dfn> <td> <code title=event-message><a href=#event-message>message</a></code> <!-- new for postMessage -->
     <tr><td><dfn id=handler-window-onoffline title=handler-window-onoffline><code>onoffline</code></dfn> <td> <code title=event-offline><a href=#event-offline>offline</a></code> <!-- new -->
     <tr><td><dfn id=handler-window-ononline title=handler-window-ononline><code>ononline</code></dfn> <td> <code title=event-online><a href=#event-online>online</a></code> <!-- new -->
@@ -73622,10 +73611,9 @@
     <tr><td><dfn id=handler-window-onpageshow title=handler-window-onpageshow><code>onpageshow</code></dfn> <td> <code title=event-pageshow><a href=#event-pageshow>pageshow</a></code> <!-- new -->
     <tr><td><dfn id=handler-window-onpopstate title=handler-window-onpopstate><code>onpopstate</code></dfn> <td> <code title=event-popstate><a href=#event-popstate>popstate</a></code> <!-- new -->
     <tr><td><dfn id=handler-window-onresize title=handler-window-onresize><code>onresize</code></dfn> <td> <code title=event-resize>resize</code> <!-- widely used --> <!-- [CSSOM] -->
-    <tr><td><dfn id=handler-window-onscroll title=handler-window-onscroll><code>onscroll</code></dfn> <td> <code title=event-scroll>scroll</code>
     <tr><td><dfn id=handler-window-onstorage title=handler-window-onstorage><code>onstorage</code></dfn> <td> <code title=event-storage><a href=#event-storage>storage</a></code> <!-- new -->
     <tr><td><dfn id=handler-window-onunload title=handler-window-onunload><code>onunload</code></dfn> <td> <code title=event-unload>unload</code> <!-- widely used -->
-  </table><p class=note>The <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>
+  </table><p class=note>The <code title=handler-onerror><a href=#handler-onerror>onerror</a></code>
   handler is also used for <a href=#runtime-script-errors>reporting script errors</a>.</p>
 
   <hr><!-- this guy is only on Document and not on HTMLElement because
@@ -73648,6 +73636,9 @@
   <pre class=idl>[NoInterfaceObject]
 interface <dfn id=globaleventhandlers>GlobalEventHandlers</dfn> {
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onabort title=handler-onabort>onabort</a>;
+           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onblur title=handler-onblur>onblur</a>;
+           attribute <a href=#onerroreventhandler>OnErrorEventHandler</a> <a href=#handler-onerror title=handler-onerror>onerror</a>;
+           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onfocus title=handler-onfocus>onfocus</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-oncancel title=handler-oncancel>oncancel</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-oncanplay title=handler-oncanplay>oncanplay</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-oncanplaythrough title=handler-oncanplaythrough>oncanplaythrough</a>;
@@ -73672,6 +73663,7 @@
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onkeydown title=handler-onkeydown>onkeydown</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onkeypress title=handler-onkeypress>onkeypress</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onkeyup title=handler-onkeyup>onkeyup</a>;
+           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onload title=handler-onload>onload</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onloadeddata title=handler-onloadeddata>onloadeddata</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onloadedmetadata title=handler-onloadedmetadata>onloadedmetadata</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onloadstart title=handler-onloadstart>onloadstart</a>;
@@ -73687,6 +73679,7 @@
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onprogress title=handler-onprogress>onprogress</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onratechange title=handler-onratechange>onratechange</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onreset title=handler-onreset>onreset</a>;
+           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onscroll title=handler-onscroll>onscroll</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onseeked title=handler-onseeked>onseeked</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onseeking title=handler-onseeking>onseeking</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onselect title=handler-onselect>onselect</a>;
@@ -73701,20 +73694,10 @@
 };
 
 [NoInterfaceObject]
-interface <dfn id=nodeeventhandlers>NodeEventHandlers</dfn> {
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onblur title=handler-onblur>onblur</a>;
-           attribute <a href=#onerroreventhandler>OnErrorEventHandler</a> <a href=#handler-onerror title=handler-onerror>onerror</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onfocus title=handler-onfocus>onfocus</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onload title=handler-onload>onload</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-onscroll title=handler-onscroll>onscroll</a>;
-};
-
-[NoInterfaceObject]
 interface <dfn id=windoweventhandlers>WindowEventHandlers</dfn> {
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onafterprint title=handler-window-onafterprint>onafterprint</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onbeforeprint title=handler-window-onbeforeprint>onbeforeprint</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onbeforeunload title=handler-window-onbeforeunload>onbeforeunload</a>;
-           attribute <a href=#onerroreventhandler>OnErrorEventHandler</a> <a href=#handler-window-onerror title=handler-window-onerror>onerror</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onfullscreenchange title=handler-window-onfullscreenchange>onfullscreenchange</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onfullscreenerror title=handler-window-onfullscreenerror>onfullscreenerror</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onhashchange title=handler-window-onhashchange>onhashchange</a>;
@@ -73727,15 +73710,6 @@
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onresize title=handler-window-onresize>onresize</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onstorage title=handler-window-onstorage>onstorage</a>;
            attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onunload title=handler-window-onunload>onunload</a>;
-};
-
-[NoInterfaceObject]
-interface <dfn id=shadowingwindoweventhandlers>ShadowingWindowEventHandlers</dfn> {
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onblur title=handler-window-onblur>onblur</a>;
-//         attribute <a href=#onerroreventhandler>OnErrorEventHandler</a> <a href=#handler-window-onerror title=handler-window-onerror>onerror</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onfocus title=handler-window-onfocus>onfocus</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onload title=handler-window-onload>onload</a>;
-           attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-window-onscroll title=handler-window-onscroll>onscroll</a>;
 };</pre>
 
 
@@ -98664,13 +98638,9 @@
   <ul class=brief><li><code title=handler-window-onafterprint><a href=#handler-window-onafterprint>onafterprint</a></code></li>
    <li><code title=handler-window-onbeforeprint><a href=#handler-window-onbeforeprint>onbeforeprint</a></code></li>
    <li><code title=handler-window-onbeforeunload><a href=#handler-window-onbeforeunload>onbeforeunload</a></code></li>
-   <li><code title=handler-window-onblur><a href=#handler-window-onblur>onblur</a></code></li>
-   <li><code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code></li>
-   <li><code title=handler-window-onfocus><a href=#handler-window-onfocus>onfocus</a></code></li>
    <li><code title=handler-window-onfullscreenchange><a href=#handler-window-onfullscreenchange>onfullscreenchange</a></code></li>
    <li><code title=handler-window-onfullscreenerror><a href=#handler-window-onfullscreenerror>onfullscreenerror</a></code></li>
    <li><code title=handler-window-onhashchange><a href=#handler-window-onhashchange>onhashchange</a></code></li>
-   <li><code title=handler-window-onload><a href=#handler-window-onload>onload</a></code></li>
    <li><code title=handler-window-onmessage><a href=#handler-window-onmessage>onmessage</a></code></li>
    <li><code title=handler-window-onoffline><a href=#handler-window-onoffline>onoffline</a></code></li>
    <li><code title=handler-window-ononline><a href=#handler-window-ononline>ononline</a></code></li>
@@ -98678,18 +98648,15 @@
    <li><code title=handler-window-onpageshow><a href=#handler-window-onpageshow>onpageshow</a></code></li>
    <li><code title=handler-window-onpopstate><a href=#handler-window-onpopstate>onpopstate</a></code></li>
    <li><code title=handler-window-onresize><a href=#handler-window-onresize>onresize</a></code></li>
-   <li><code title=handler-window-onscroll><a href=#handler-window-onscroll>onscroll</a></code></li>
    <li><code title=handler-window-onstorage><a href=#handler-window-onstorage>onstorage</a></code></li>
    <li><code title=handler-window-onunload><a href=#handler-window-onunload>onunload</a></code></li>
   </ul><p>The DOM interface also exposes <a href=#event-handler-idl-attributes>event handler IDL attributes</a> that mirror those on
   the <code><a href=#window>Window</a></code> element.</p>
 
-  <p>The <code title=handler-window-onblur><a href=#handler-window-onblur>onblur</a></code>, <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>, <code title=handler-window-onfocus><a href=#handler-window-onfocus>onfocus</a></code>, <code title=handler-window-onload><a href=#handler-window-onload>onload</a></code>,
-  and <code title=handler-window-onscroll><a href=#handler-window-onscroll>onscroll</a></code> <a href=#event-handlers>event handlers</a> of the
-  <code><a href=#window>Window</a></code> object, exposed on the <code><a href=#frameset>frameset</a></code> element, shadow the generic
-  <a href=#event-handlers>event handlers</a> with the same names normally supported by <a href=#html-elements>HTML elements</a>.
-  With the exception of <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>, this is actually
-  implemented by just using the properties of the <code><a href=#htmlelement>HTMLElement</a></code> interface. The <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code> attribute has a different type.</p>
+  <p>The <code title=handler-onblur><a href=#handler-onblur>onblur</a></code>, <code title=handler-onerror><a href=#handler-onerror>onerror</a></code>, <code title=handler-onfocus><a href=#handler-onfocus>onfocus</a></code>, <code title=handler-onload><a href=#handler-onload>onload</a></code>,
+  and <code title=handler-onscroll><a href=#handler-onscroll>onscroll</a></code> <a href=#event-handlers>event handlers</a> of the
+  <code><a href=#window>Window</a></code> object, exposed on the <code><a href=#frameset>frameset</a></code> element, replace the generic
+  <a href=#event-handlers>event handlers</a> with the same names normally supported by <a href=#html-elements>HTML elements</a>.</p>
 
   <hr><p>The <dfn id=frame><code>frame</code></dfn> element defines a <a href=#nested-browsing-context>nested browsing context</a>
   similar to the <code><a href=#the-iframe-element>iframe</a></code> element, but rendered within a <code><a href=#frameset>frameset</a></code>
@@ -100344,13 +100311,9 @@
          <code title=handler-window-onafterprint><a href=#handler-window-onafterprint>onafterprint</a></code>;
          <code title=handler-window-onbeforeprint><a href=#handler-window-onbeforeprint>onbeforeprint</a></code>;
          <code title=handler-window-onbeforeunload><a href=#handler-window-onbeforeunload>onbeforeunload</a></code>;
-         <code title=handler-window-onblur><a href=#handler-window-onblur>onblur</a></code>;
-         <code title=handler-window-onerror><a href=#handler-window-onerror>onerror</a></code>;
-         <code title=handler-window-onfocus><a href=#handler-window-onfocus>onfocus</a></code>;
          <code title=handler-window-onfullscreenchange><a href=#handler-window-onfullscreenchange>onfullscreenchange</a></code>;
          <code title=handler-window-onfullscreenerror><a href=#handler-window-onfullscreenerror>onfullscreenerror</a></code>;
          <code title=handler-window-onhashchange><a href=#handler-window-onhashchange>onhashchange</a></code>;
-         <code title=handler-window-onload><a href=#handler-window-onload>onload</a></code>;
          <code title=handler-window-onmessage><a href=#handler-window-onmessage>onmessage</a></code>;
          <code title=handler-window-onoffline><a href=#handler-window-onoffline>onoffline</a></code>;
          <code title=handler-window-ononline><a href=#handler-window-ononline>ononline</a></code>;
@@ -100358,7 +100321,6 @@
          <code title=handler-window-onpageshow><a href=#handler-window-onpageshow>onpageshow</a></code>;
          <code title=handler-window-onpopstate><a href=#handler-window-onpopstate>onpopstate</a></code>;
          <code title=handler-window-onresize><a href=#handler-window-onresize>onresize</a></code>;
-         <code title=handler-window-onscroll><a href=#handler-window-onscroll>onscroll</a></code>;
          <code title=handler-window-onstorage><a href=#handler-window-onstorage>onstorage</a></code>;
          <code title=handler-window-onunload><a href=#handler-window-onunload>onunload</a></code></td>
      <td><code><a href=#htmlbodyelement>HTMLBodyElement</a></code></td>
@@ -102536,11 +102498,6 @@
      <td> <code title=event-beforeunload>beforeunload</code> event handler for <code><a href=#window>Window</a></code> object
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
 
-    <tr><th id=ix-handler-window-onblur> <code title="">onblur</code>
-     <td> <code title=handler-window-onblur><a href=#handler-window-onblur>body</a></code>
-     <td> <code title=event-blur>blur</code> event handler for <code><a href=#window>Window</a></code> object
-     <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-
     <tr><th id=ix-handler-onblur> <code title="">onblur</code>
      <td> <a href=#handler-onblur title=handler-onblur>HTML elements</a>
      <td> <code title=event-blur>blur</code> event handler
@@ -102641,21 +102598,11 @@
      <td> <code title=event-media-ended><a href=#event-media-ended>ended</a></code> event handler
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
 
-    <tr><th id=ix-handler-window-onerror> <code title="">onerror</code>
-     <td> <code title=handler-window-onerror><a href=#handler-window-onerror>body</a></code>
-     <td> <code title=event-error>error</code> event handler for <code><a href=#window>Window</a></code> object, and handler for <a href=#runtime-script-errors>script error notifications</a>
-     <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-
     <tr><th id=ix-handler-onerror> <code title="">onerror</code>
      <td> <a href=#handler-onerror title=handler-onerror>HTML elements</a>
-     <td> <code title=event-error>error</code> event handler
+     <td> <code title=event-error>error</code> event handler, and handler for <a href=#runtime-script-errors>script error notifications</a>
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
 
-    <tr><th id=ix-handler-window-onfocus> <code title="">onfocus</code>
-     <td> <code title=handler-window-onfocus><a href=#handler-window-onfocus>body</a></code>
-     <td> <code title=event-focus>focus</code> event handler for <code><a href=#window>Window</a></code> object
-     <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-
     <tr><th id=ix-handler-onfocus> <code title="">onfocus</code>
      <td> <a href=#handler-onfocus title=handler-onfocus>HTML elements</a>
      <td> <code title=event-focus>focus</code> event handler
@@ -102701,11 +102648,6 @@
      <td> <code title=event-keyup>keyup</code> event handler
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
 
-    <tr><th id=ix-handler-window-onload> <code title="">onload</code>
-     <td> <code title=handler-window-onload><a href=#handler-window-onload>body</a></code>
-     <td> <code title=event-load>load</code> event handler for <code><a href=#window>Window</a></code> object
-     <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-
     <tr><th id=ix-handler-onload> <code title="">onload</code>
      <td> <a href=#handler-onload title=handler-onload>HTML elements</a>
      <td> <code title=event-load>load</code> event handler
@@ -102821,11 +102763,6 @@
      <td> <code title=event-resize>resize</code> event handler for <code><a href=#window>Window</a></code> object
      <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
 
-    <tr><th id=ix-handler-window-onscroll> <code title="">onscroll</code>
-     <td> <code title=handler-window-onscroll><a href=#handler-window-onscroll>body</a></code>
-     <td> <code title=event-scroll>scroll</code> event handler for <code><a href=#window>Window</a></code> object
-     <td> <a href=#event-handler-content-attributes title="event handler content attributes">Event handler content attribute</a>
-
     <tr><th id=ix-handler-onscroll> <code title="">onscroll</code>
      <td> <a href=#handler-onscroll title=handler-onscroll>HTML elements</a>
      <td> <code title=event-scroll>scroll</code> event handler
@@ -103387,14 +103324,12 @@
    <li><code><a href=#navigatorlanguage>NavigatorLanguage</a></code>
    <li><code><a href=#navigatoronline>NavigatorOnLine</a></code>
    <li><code><a href=#navigatorstorageutils>NavigatorStorageUtils</a></code>
-   <li><code><a href=#nodeeventhandlers>NodeEventHandlers</a></code>
    <li><code><a href=#pagetransitionevent>PageTransitionEvent</a></code>
    <li><code><a href=#path>Path</a></code>
    <li><code><a href=#popstateevent>PopStateEvent</a></code>
    <li><code><a href=#portcollection>PortCollection</a></code>
    <li><code><a href=#propertynodelist>PropertyNodeList</a></code>
    <li><code><a href=#radionodelist>RadioNodeList</a></code>
-   <li><code><a href=#shadowingwindoweventhandlers>ShadowingWindowEventHandlers</a></code>
    <li><code><a href=#sharedworker>SharedWorker</a></code>
    <li><code><a href=#sharedworkerglobalscope>SharedWorkerGlobalScope</a></code>
    <li><code><a href=#storage-0>Storage</a></code>

Modified: source
===================================================================
--- source	2013-01-29 19:18:46 UTC (rev 7667)
+++ source	2013-01-29 20:12:43 UTC (rev 7668)
@@ -80836,12 +80836,6 @@
 
        </li>
 
-       <li><p>Remove any <span title="concept-task">tasks</span> queued by the <span>history
-       traversal task source</span> that are associated with any <code>Document</code> objects in
-       the <span>top-level browsing context</span>'s <span>document family</span>.</p></li> <!-- so
-       the network is racing history.back(), in the case of setting location.href="" and then
-       calling history.back() -->
-
        <li><p>Append a new entry at the end of the <code>History</code> object representing the new
        resource and its <code>Document</code> object and related state.</p></li>
 
@@ -81294,6 +81288,12 @@
 
     <ol>
 
+     <li><p>Remove any <span title="concept-task">tasks</span> queued by the <span>history traversal
+     task source</span> that are associated with any <code>Document</code> objects in the
+     <span>top-level browsing context</span>'s <span>document family</span>.</p></li> <!-- so the
+     network is racing history.back(), in the case of setting location.href="" and then calling
+     history.back() -->
+
      <li>
 
       <p>If the <span>origin</span> of the <code>Document</code> of the <var title="">specified
@@ -84857,7 +84857,7 @@
 
     <p>Otherwise, <span>report the error</span> for the <span title="concept-script">script</span>,
     with the problematic position (line number and column number), in the script's
-    <span>origin</span>, using the <code title="handler-window-onerror">onerror</code> <span
+    <span>origin</span>, using the <code title="handler-onerror">onerror</code> <span
     title="event handlers">event handler</span> of the <span>script's global object</span>. If the
     error is still <i title="concept-error-nothandled">not handled</i> after this, then the error
     may be reported to the user.</p>
@@ -85031,7 +85031,7 @@
   <code>Document</code>, the user agent must <span>report the error</span> for the relevant <span
   title="concept-script">script</span>, with the problematic position (line number and column
   number) in the resource containing the script, using the <code
-  title="handler-window-onerror">onerror</code> <span title="event handlers">event handler</span> of
+  title="handler-onerror">onerror</code> <span title="event handlers">event handler</span> of
   the <span>script's global object</span>. If the error is still <i
   title="concept-error-nothandled">not handled</i> after this, then the error may be reported to the
   user.</p>
@@ -85745,7 +85745,7 @@
 
       <dl class="switch">
 
-       <dt>If the attribute is the <code title="handler-window-onerror">onerror</code> attribute of
+       <dt>If the attribute is the <code title="handler-onerror">onerror</code> attribute of
        the <code>Window</code> object</dt>
 
        <dd>Let the function have four arguments, named <code title="">event</code>, <code
@@ -85896,7 +85896,7 @@
    value</span>, then set the <span title="event handlers">event handler</span> to null and then
    <span>report the error</span> for the appropriate <span title="concept-script">script</span> and
    with the appropriate position (line number and column number), as established when the error was
-   detected, using the <code title="handler-window-onerror">onerror</code> <span title="event
+   detected, using the <code title="handler-onerror">onerror</code> <span title="event
    handlers">event handler</span> of the <code>Window</code> object of that <code>Document</code>,
    and abort these steps.</p></li>
 
@@ -86062,7 +86062,10 @@
   by all <span>HTML elements</span> other than <code>body</code> and
   <code>frameset</code>, as both content attributes and IDL
   attributes, and on <code>Document</code> objects, as IDL
-  attributes:</p>
+  attributes; and by <code>Window</code> objects, as IDL attributes on the
+  <code>Window</code> object, and with corresponding content
+  attributes and IDL attributes exposed on the <code>body</code> and
+  <code>frameset</code> elements:</p>
 
   <table>
    <thead>
@@ -86092,13 +86095,9 @@
     <tr><td><dfn title="handler-window-onafterprint"><code>onafterprint</code></dfn> <td> <code title="event-afterprint">afterprint</code>
     <tr><td><dfn title="handler-window-onbeforeprint"><code>onbeforeprint</code></dfn> <td> <code title="event-beforeprint">beforeprint</code>
     <tr><td><dfn title="handler-window-onbeforeunload"><code>onbeforeunload</code></dfn> <td> <code title="event-beforeunload">beforeunload</code>
-    <tr><td><dfn title="handler-onblur"><code>onblur</code></dfn> <td> <code title="event-blur">blur</code>
-    <tr><td><dfn title="handler-onerror"><code>onerror</code></dfn> <td> <code title="event-error">error</code>
-    <tr><td><dfn title="handler-onfocus"><code>onfocus</code></dfn> <td> <code title="event-focus">focus</code>
     <tr><td><dfn title="handler-window-onfullscreenchange"><code>onfullscreenchange</code></dfn> <td> <code title="event-fullscreenchange">fullscreenchange</code>
     <tr><td><dfn title="handler-window-onfullscreenerror"><code>onfullscreenerror</code></dfn> <td> <code title="event-fullscreenerror">fullscreenerror</code>
     <tr><td><dfn title="handler-window-onhashchange"><code>onhashchange</code></dfn> <td> <code title="event-hashchange">hashchange</code> <!-- new -->
-    <tr><td><dfn title="handler-onload"><code>onload</code></dfn> <td> <code title="event-load">load</code> <!-- widely used -->
     <tr><td><dfn title="handler-window-onmessage"><code>onmessage</code></dfn> <td> <code title="event-message">message</code> <!-- new for postMessage -->
     <tr><td><dfn title="handler-window-onoffline"><code>onoffline</code></dfn> <td> <code title="event-offline">offline</code> <!-- new -->
     <tr><td><dfn title="handler-window-ononline"><code>ononline</code></dfn> <td> <code title="event-online">online</code> <!-- new -->
@@ -86106,12 +86105,11 @@
     <tr><td><dfn title="handler-window-onpageshow"><code>onpageshow</code></dfn> <td> <code title="event-pageshow">pageshow</code> <!-- new -->
     <tr><td><dfn title="handler-window-onpopstate"><code>onpopstate</code></dfn> <td> <code title="event-popstate">popstate</code> <!-- new -->
     <tr><td><dfn title="handler-window-onresize"><code>onresize</code></dfn> <td> <code title="event-resize">resize</code> <!-- widely used --> <!-- [CSSOM] -->
-    <tr><td><dfn title="handler-onscroll"><code>onscroll</code></dfn> <td> <code title="event-scroll">scroll</code>
     <tr><td><dfn title="handler-window-onstorage"><code>onstorage</code></dfn> <td> <code title="event-storage">storage</code> <!-- new -->
     <tr><td><dfn title="handler-window-onunload"><code>onunload</code></dfn> <td> <code title="event-unload">unload</code> <!-- widely used -->
   </table>
 
-  <p class="note">The <code title="handler-window-onerror">onerror</code>
+  <p class="note">The <code title="handler-onerror">onerror</code>
   handler is also used for <a
   href="#runtime-script-errors">reporting script errors</a>.</p>
 
@@ -86207,7 +86205,6 @@
            attribute <span>EventHandler</span> <span title="handler-window-onafterprint">onafterprint</span>;
            attribute <span>EventHandler</span> <span title="handler-window-onbeforeprint">onbeforeprint</span>;
            attribute <span>EventHandler</span> <span title="handler-window-onbeforeunload">onbeforeunload</span>;
-           attribute <span>OnErrorEventHandler</span> <span title="handler-window-onerror">onerror</span>;
            attribute <span>EventHandler</span> <span title="handler-window-onfullscreenchange">onfullscreenchange</span>;
            attribute <span>EventHandler</span> <span title="handler-window-onfullscreenerror">onfullscreenerror</span>;
            attribute <span>EventHandler</span> <span title="handler-window-onhashchange">onhashchange</span>;




More information about the Commit-Watchers mailing list