Skip to content

Commit

Permalink
[e] (0) Merge WorkerUtils into WorkerGlobalScope
Browse files Browse the repository at this point in the history 
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=18917
Affected topics: Canvas, DOM APIs, HTML, Workers

git-svn-id: http://svn.whatwg.org/webapps@7675 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Jan 30, 2013
1 parent d39ba79 commit ec09a0a
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 65 deletions.
42 changes: 20 additions & 22 deletions complete.html
View file
Expand Up @@ -73821,7 +73821,7 @@ <h3 id=atob><span class=secno>7.2 </span>Base64 utility methods</h3>
</dl><div class=impl>

<p class=note>The <code><a href=#windowbase64>WindowBase64</a></code> interface adds to the
<code><a href=#window>Window</a></code> interface and the <code><a href=#workerutils>WorkerUtils</a></code>
<code><a href=#window>Window</a></code> interface and the <code><a href=#workerglobalscope>WorkerGlobalScope</a></code>
interface (part of Web Workers).</p>

<p>The <dfn id=dom-windowbase64-btoa title=dom-windowbase64-btoa><code>btoa()</code></dfn>
Expand Down Expand Up @@ -74090,7 +74090,7 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
<div class=impl>

<p class=note>The <code><a href=#windowtimers>WindowTimers</a></code> interface adds to the
<code><a href=#window>Window</a></code> interface and the <code><a href=#workerutils>WorkerUtils</a></code>
<code><a href=#window>Window</a></code> interface and the <code><a href=#workerglobalscope>WorkerGlobalScope</a></code>
interface (part of Web Workers).
</p>

Expand Down Expand Up @@ -74136,7 +74136,7 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
necessarily consecutively).</p>

<p>Otherwise, if the <a href=#method-context>method context</a> is a
<code><a href=#workerutils>WorkerUtils</a></code> object, wait until <var title="">timeout</var> milliseconds have passed with the worker
<code><a href=#workerglobalscope>WorkerGlobalScope</a></code> object, wait until <var title="">timeout</var> milliseconds have passed with the worker
not suspended (not necessarily consecutively).</p>

<p>Otherwise, act as described in the specification that defines
Expand Down Expand Up @@ -74239,7 +74239,7 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
milliseconds (not necessarily consecutively).</p>

<p>Otherwise, if the <a href=#method-context>method context</a> is a
<code><a href=#workerutils>WorkerUtils</a></code> object, wait until <var title="">interval</var> milliseconds have passed with the worker
<code><a href=#workerglobalscope>WorkerGlobalScope</a></code> object, wait until <var title="">interval</var> milliseconds have passed with the worker
not suspended (not necessarily consecutively).</p>

<p>Otherwise, act as described in the specification that defines
Expand Down Expand Up @@ -74280,7 +74280,7 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
<hr><p>The <dfn id=method-context>method context</dfn>, when referenced by the algorithms
in this section, is the object on which the method for which the
algorithm is running is implemented (a <code><a href=#window>Window</a></code> or
<code><a href=#workerutils>WorkerUtils</a></code> object).</p>
<code><a href=#workerglobalscope>WorkerGlobalScope</a></code> object).</p>

<p>When the above methods are invoked and try to <dfn id=get-the-timed-task>get the timed
task</dfn> <var title="">handle</var> in list <var title="">list</var>,
Expand Down Expand Up @@ -74337,7 +74337,7 @@ <h3 id=timers><span class=secno>7.3 </span>Timers</h3>
copy</a>).</p>

<p>Otherwise, if the <a href=#method-context>method context</a> is a
<code><a href=#workerutils>WorkerUtils</a></code> object, let <var title="">global
<code><a href=#workerglobalscope>WorkerGlobalScope</a></code> object, let <var title="">global
object</var>, <var title="">browsing context</var>, <var title="">document</var>, <var title="">referrer source</var>, <var title="">character encoding</var>, and <var title="">base
URL</var> be the <a href="#script's-global-object">script's global object</a>,
<a href="#script's-browsing-context">script's browsing context</a>, <a href="#script's-document">script's
Expand Down Expand Up @@ -75820,7 +75820,7 @@ <h3 id=images><span class=secno>7.6 </span>Images</h3>
void <a href=#dom-createimagebitmap title=dom-createImageBitmap>createImageBitmap</a>(<a href=#imagebitmapsource>ImageBitmapSource</a> image, <a href=#imagebitmapcallback>ImageBitmapCallback</a> _callback, optional long sx, long sy, long sw, long sh);
};
<a href=#window>Window</a> implements <a href=#imagebitmapfactories>ImageBitmapFactories</a>;
<a href=#workerutils>WorkerUtils</a> implements <a href=#imagebitmapfactories>ImageBitmapFactories</a>;</pre>
<a href=#workerglobalscope>WorkerGlobalScope</a> implements <a href=#imagebitmapfactories>ImageBitmapFactories</a>;</pre>

<p>An <code><a href=#imagebitmap>ImageBitmap</a></code> object represents a bitmap image that can be painted to a canvas
without undue latency.</p>
Expand Down Expand Up @@ -80947,8 +80947,7 @@ <h5 id=the-workerglobalscope-common-interface><span class=secno>9.2.1.1 </span>T
--> attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-workerglobalscope-onerror title=handler-WorkerGlobalScope-onerror>onerror</a>;
attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-workerglobalscope-onoffline title=handler-WorkerGlobalScope-onoffline>onoffline</a>;
attribute <a href=#eventhandler>EventHandler</a> <a href=#handler-workerglobalscope-ononline title=handler-WorkerGlobalScope-ononline>ononline</a>;
};
<a href=#workerglobalscope>WorkerGlobalScope</a> implements <a href=#workerutils>WorkerUtils</a>;</pre>
};</pre>

<p>The <dfn id=dom-workerglobalscope-self title=dom-WorkerGlobalScope-self><code>self</code></dfn> attribute
must return the <code><a href=#workerglobalscope>WorkerGlobalScope</a></code> object itself.</p>
Expand Down Expand Up @@ -81730,7 +81729,7 @@ <h5 id=the-abstractworker-abstract-interface><span class=secno>9.2.6.1 </span>Th

</ol><p>This constructor must be visible when the <a href="#script's-global-object">script's global
object</a> is either a <code><a href=#window>Window</a></code> object or an object
implementing the <code><a href=#workerutils>WorkerUtils</a></code> interface.</p>
implementing the <code><a href=#workerglobalscope>WorkerGlobalScope</a></code> interface.</p>


<h5 id=shared-workers-and-the-sharedworker-interface><span class=secno>9.2.6.3 </span>Shared workers and the <code><a href=#sharedworker>SharedWorker</a></code> interface</h5>
Expand Down Expand Up @@ -81973,7 +81972,7 @@ <h5 id=shared-workers-and-the-sharedworker-interface><span class=secno>9.2.6.3 <

</ol><p>This constructor must be visible when the <a href="#script's-global-object">script's global
object</a> is either a <code><a href=#window>Window</a></code> object or an object
implementing the <code><a href=#workerutils>WorkerUtils</a></code> interface.</p>
implementing the <code><a href=#workerglobalscope>WorkerGlobalScope</a></code> interface.</p>

<p>The <a href=#task-source>task source</a> for the tasks mentioned above is the
<a href=#dom-manipulation-task-source>DOM manipulation task source</a>.</p>
Expand All @@ -81983,12 +81982,12 @@ <h5 id=shared-workers-and-the-sharedworker-interface><span class=secno>9.2.6.3 <
<h3 id=apis-available-to-workers><span class=secno>9.3 </span>APIs available to workers</h3>

<pre class=idl>[NoInterfaceObject]
interface <dfn id=workerutils>WorkerUtils</dfn> {
partial interface <a href=#workerglobalscope>WorkerGlobalScope</a> {
void <a href=#dom-workerglobalscope-importscripts title=dom-WorkerGlobalScope-importScripts>importScripts</a>(DOMString... urls);
readonly attribute <a href=#workernavigator>WorkerNavigator</a> <a href=#dom-worker-navigator title=dom-worker-navigator>navigator</a>;
};
<a href=#workerutils>WorkerUtils</a> implements <a href=#windowtimers>WindowTimers</a>;
<a href=#workerutils>WorkerUtils</a> implements <a href=#windowbase64>WindowBase64</a>;</pre>
<a href=#workerglobalscope>WorkerGlobalScope</a> implements <a href=#windowtimers>WindowTimers</a>;
<a href=#workerglobalscope>WorkerGlobalScope</a> implements <a href=#windowbase64>WindowBase64</a>;</pre>


<p>The DOM APIs &mdash; specifically, all the interfaces defind in the DOM specification other
Expand Down Expand Up @@ -82087,7 +82086,7 @@ <h4 id=importing-scripts-and-libraries><span class=secno>9.3.1 </span>Importing
</ol><h4 id=the-workernavigator-object><span class=secno>9.3.2 </span>The <code><a href=#workernavigator>WorkerNavigator</a></code> object</h4>

<p>The <dfn id=dom-worker-navigator title=dom-worker-navigator><code>navigator</code></dfn> attribute
of the <code><a href=#workerutils>WorkerUtils</a></code> interface must return an instance of
of the <code><a href=#workerglobalscope>WorkerGlobalScope</a></code> interface must return an instance of
the <code><a href=#workernavigator>WorkerNavigator</a></code> interface, which represents the
identity and state of the user agent (the client):</p>

Expand Down Expand Up @@ -82438,7 +82437,7 @@ <h4 id=the-eventsource-interface><span class=secno>10.2.2 </span>The <code><a hr

</ol><p>This constructor must be visible when the <a href="#script's-global-object">script's global
object</a> is either a <code><a href=#window>Window</a></code> object or an object
implementing the <code><a href=#workerutils>WorkerUtils</a></code> interface.</p>
implementing the <code><a href=#workerglobalscope>WorkerGlobalScope</a></code> interface.</p>

<hr><p>The <dfn id=dom-eventsource-url title=dom-EventSource-url><code>url</code></dfn>
attribute must return the <a href=#absolute-url>absolute URL</a> that resulted
Expand Down Expand Up @@ -83054,20 +83053,20 @@ <h4 id=garbage-collection-0><span class=secno>10.2.8 </span>Garbage collection</

<p>While an <code><a href=#eventsource>EventSource</a></code> object's <code title=dom-EventSource-readyState><a href=#dom-eventsource-readystate>readyState</a></code> is <code title=dom-EventSource-CONNECTING><a href=#dom-eventsource-connecting>CONNECTING</a></code>, and the object
has one or more event listeners registered for <code title=event-open>open</code>, <code title=event-message><a href=#event-message>message</a></code> or <code title=event-error>error</code> events, there must be a strong
reference from the <code><a href=#window>Window</a></code> or <code><a href=#workerutils>WorkerUtils</a></code>
reference from the <code><a href=#window>Window</a></code> or <code><a href=#workerglobalscope>WorkerGlobalScope</a></code>
object that the <code><a href=#eventsource>EventSource</a></code> object's constructor was
invoked from to the <code><a href=#eventsource>EventSource</a></code> object itself.</p>

<p>While an <code><a href=#eventsource>EventSource</a></code> object's <code title=dom-EventSource-readyState><a href=#dom-eventsource-readystate>readyState</a></code> is <code title=dom-EventSource-OPEN><a href=#dom-eventsource-open>OPEN</a></code>, and the object has one or
more event listeners registered for <code title=event-message><a href=#event-message>message</a></code> or <code title=event-error>error</code> events, there must be a strong
reference from the <code><a href=#window>Window</a></code> or <code><a href=#workerutils>WorkerUtils</a></code>
reference from the <code><a href=#window>Window</a></code> or <code><a href=#workerglobalscope>WorkerGlobalScope</a></code>
object that the <code><a href=#eventsource>EventSource</a></code> object's constructor was
invoked from to the <code><a href=#eventsource>EventSource</a></code> object itself.</p>

<p>While there is a task queued by an <code><a href=#eventsource>EventSource</a></code>
object on the <a href=#remote-event-task-source>remote event task source</a>, there must be a
strong reference from the <code><a href=#window>Window</a></code> or
<code><a href=#workerutils>WorkerUtils</a></code> object that the <code><a href=#eventsource>EventSource</a></code>
<code><a href=#workerglobalscope>WorkerGlobalScope</a></code> object that the <code><a href=#eventsource>EventSource</a></code>
object's constructor was invoked from to that
<code><a href=#eventsource>EventSource</a></code> object.</p>

Expand Down Expand Up @@ -83354,7 +83353,7 @@ <h4 id=the-websocket-interface><span class=secno>10.3.2 </span>The <code><a href

</ol><p>This constructor must be visible when the <a href="#script's-global-object">script's global
object</a> is either a <code><a href=#window>Window</a></code> object or an object
implementing the <code><a href=#workerutils>WorkerUtils</a></code> interface.</p>
implementing the <code><a href=#workerglobalscope>WorkerGlobalScope</a></code> interface.</p>

<hr><p>The <dfn id=dom-websocket-url title=dom-WebSocket-url><code>url</code></dfn>
attribute must return the result of <a href=#resolve-a-url title="resolve a
Expand Down Expand Up @@ -84615,7 +84614,7 @@ <h4 id=message-channels><span class=secno>10.5.2 </span>Message channels</h4>

</ol><p>This constructor must be visible when the <a href="#script's-global-object">script's global
object</a> is either a <code><a href=#window>Window</a></code> object or an object
implementing the <code><a href=#workerutils>WorkerUtils</a></code> interface.</p>
implementing the <code><a href=#workerglobalscope>WorkerGlobalScope</a></code> interface.</p>

<p>The <dfn id=dom-channel-port1 title=dom-channel-port1><code>port1</code></dfn> and
<dfn id=dom-channel-port2 title=dom-channel-port2><code>port2</code></dfn> attributes
Expand Down Expand Up @@ -103389,7 +103388,6 @@ <h3 class="no-num">Reflecting IDL attributes</h3>
<li><code><a href=#workerglobalscope>WorkerGlobalScope</a></code>
<li><code><a href=#workerlocation>WorkerLocation</a></code>
<li><code><a href=#workernavigator>WorkerNavigator</a></code>
<li><code><a href=#workerutils>WorkerUtils</a></code>
<li><code>XMLDocument</code>, <a href=#xmldocument>partial</a>
</ul>

Expand Down

0 comments on commit ec09a0a

Please sign in to comment.