W3C home > Mailing lists > Public > public-html-commits@w3.org > February 2010

html5/spec Overview.html,1.3707,1.3708

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 05 Feb 2010 20:08:37 +0000
To: public-html-commits@w3.org
Message-Id: <E1NdUTl-0000p0-B5@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv3136

Modified Files:
	Overview.html 
Log Message:
Fix the wording of these algorithms to make sense. (whatwg r4654)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3707
retrieving revision 1.3708
diff -u -d -r1.3707 -r1.3708
--- Overview.html	5 Feb 2010 19:58:07 -0000	1.3707
+++ Overview.html	5 Feb 2010 20:08:33 -0000	1.3708
@@ -40396,9 +40396,10 @@
 
    <li><p><a href="#get-the-timeout">Get the timeout</a>, and let <var title="">timeout</var> be the result.</li>
 
-   <li><p>If the currently running <a href="#concept-task" title="concept-task">task</a> is a task that was created by
-   either the <code title="dom-windowtimers-setTimeout"><a href="#dom-windowtimers-settimeout">setTimeout()</a></code> method, and
-   <var title="">timeout</var> is less than 4, then increase <var title="">timeout</var> to 4.</li>
+   <li><p>If the currently running <a href="#concept-task" title="concept-task">task</a> is a task that was created by the
+   <code title="dom-windowtimers-setTimeout"><a href="#dom-windowtimers-settimeout">setTimeout()</a></code>
+   method, and <var title="">timeout</var> is less than 4, then
+   increase <var title="">timeout</var> to 4.</li>
 
    <li><p>Add an entry to the <a href="#list-of-active-timeouts">list of active timeouts</a>,
    identified by a user-agent-defined integer that is greater than
@@ -40410,12 +40411,13 @@
 
    <li>
 
-    <p>If <var title="">context</var> is a <code><a href="#window">Window</a></code> object,
-    wait until the <code>Document</code> associated with <var title="">context</var> has been <a href="#fully-active">fully active</a> for a
-    further <var title="">timeout</var> milliseconds (not necessarily
-    consecutively).</p>
+    <p>If the <a href="#method-context">method context</a> is a <code><a href="#window">Window</a></code>
+    object, wait until the <code>Document</code> associated with the
+    <a href="#method-context">method context</a> has been <a href="#fully-active">fully active</a> for
+    a further <var title="">timeout</var> milliseconds (not
+    necessarily consecutively).</p>
 
-    <p>Otherwise, if <var title="">context</var> is a
+    <p>Otherwise, if the <a href="#method-context">method context</a> is a
     <code>WorkerUtils</code> object, wait until <var title="">timeout</var> milliseconds have passed with the worker
     not suspended (not necessarily consecutively).</p>
 
@@ -40466,13 +40468,13 @@
 
    <li>
 
-    <p><i>Wait</i>: If <var title="">context</var> is a
+    <p><i>Wait</i>: If the <a href="#method-context">method context</a> is a
     <code><a href="#window">Window</a></code> object, wait until the <code>Document</code>
-    associated with <var title="">context</var> has been <a href="#fully-active">fully
+    associated with the <a href="#method-context">method context</a> has been <a href="#fully-active">fully
     active</a> for a further <var title="">interval</var>
     milliseconds (not necessarily consecutively).</p>
 
-    <p>Otherwise, if <var title="">context</var> is a
+    <p>Otherwise, if the <a href="#method-context">method context</a> is a
     <code>WorkerUtils</code> object, wait until <var title="">interval</var> milliseconds have passed with the worker
     not suspended (not necessarily consecutively).</p>
 
@@ -40497,7 +40499,12 @@
   where <var title="">handle</var> is the argument passed to the
   method.</p>
 
-  <hr><p>When the above methods are to <dfn id="get-the-timed-task">get the timed task</dfn>, they
+  <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>WorkerUtils</code> object).</p>
+
+  <p>When the above methods are to <dfn id="get-the-timed-task">get the timed task</dfn>, they
   must run the following steps:</p>
 
   <ol><li>
@@ -40518,24 +40525,22 @@
    <li><p>Let <var title="">script language</var> be
    JavaScript.</li>
 
-   <li><p>Let <var title="">context</var> be the object on which the
-   method is implemented (a <code><a href="#window">Window</a></code> or
-   <code>WorkerUtils</code> object).</li>
-
    <li>
 
-    <p>If <var title="">context</var> is a <code><a href="#window">Window</a></code> object,
-    let <var title="">global object</var> be <var title="">context</var>, let <var title="">browsing context</var>
-    be the <a href="#browsing-context">browsing context</a> with which <var title="">global object</var> is associated, let <var title="">character encoding</var> be the <a href="#document-s-character-encoding" title="document's
-    character encoding">character encoding</a> of the
-    <code>Document</code> associated with <var title="">global
-    object</var> (<a href="#sce-not-copy">this is a reference, not a
-    copy</a>), and let <var title="">base URL</var> be the <a href="#document-base-url" title="document base URL">base URL</a> of the
-    <code>Document</code> associated with <var title="">global
-    object</var> (<a href="#sbu-not-copy">this is a reference, not a
-    copy</a>).</p>
+    <p>If the <a href="#method-context">method context</a> is a <code><a href="#window">Window</a></code>
+    object, let <var title="">global object</var> be the <a href="#method-context">method
+    context</a>, let <var title="">browsing context</var> be the
+    <a href="#browsing-context">browsing context</a> with which <var title="">global
+    object</var> is associated, let <var title="">character
+    encoding</var> be the <a href="#document-s-character-encoding" title="document's character
+    encoding">character encoding</a> of the <code>Document</code>
+    associated with <var title="">global object</var> (<a href="#sce-not-copy">this is a reference, not a copy</a>), and let
+    <var title="">base URL</var> be the <a href="#document-base-url" title="document base
+    URL">base URL</a> of the <code>Document</code> associated with
+    <var title="">global object</var> (<a href="#sbu-not-copy">this is
+    a reference, not a copy</a>).</p>
 
-    <p>Otherwise, if <var title="">context</var> is a
+    <p>Otherwise, if the <a href="#method-context">method context</a> is a
     <code>WorkerUtils</code> object, let <var title="">global
     object</var>, <var title="">browsing context</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>,
@@ -40543,7 +40548,7 @@
     character encoding</a>, and <a href="#script-s-base-url">script's base URL</a>
     (respectively) of the <a href="#concept-script" title="concept-script">script</a>
     that the <span>run a worker</span> algorithm created when it
-    created <var title="">context</var>.</p>
+    created the <a href="#method-context">method context</a>.</p>
 
     <p>Otherwise, act as described in the specification that defines
     that the <code><a href="#windowtimers">WindowTimers</a></code> interface is implemented by
Received on Friday, 5 February 2010 20:08:38 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 5 February 2010 20:08:38 GMT