[html5] r4654 - [e] (0) Fix the wording of these algorithms to make sense. Fixing http://www.w3. [...]

whatwg at whatwg.org whatwg at whatwg.org
Fri Feb 5 12:08:30 PST 2010


Author: ianh
Date: 2010-02-05 12:08:28 -0800 (Fri, 05 Feb 2010)
New Revision: 4654

Modified:
   complete.html
   index
   source
Log:
[e] (0) Fix the wording of these algorithms to make sense.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=8633

Modified: complete.html
===================================================================
--- complete.html	2010-02-05 19:58:01 UTC (rev 4653)
+++ complete.html	2010-02-05 20:08:28 UTC (rev 4654)
@@ -52811,9 +52811,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
@@ -52825,12 +52826,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><a href=#workerutils>WorkerUtils</a></code> object, wait until <var title="">timeout</var> milliseconds have passed with the worker
     not suspended (not necessarily consecutively).</p>
 
@@ -52881,13 +52883,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><a href=#workerutils>WorkerUtils</a></code> object, wait until <var title="">interval</var> milliseconds have passed with the worker
     not suspended (not necessarily consecutively).</p>
 
@@ -52912,7 +52914,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><a href=#workerutils>WorkerUtils</a></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>
@@ -52933,24 +52940,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><a href=#workerutils>WorkerUtils</a></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><a href=#workerutils>WorkerUtils</a></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>,
@@ -52958,7 +52963,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 <a href=#run-a-worker>run a worker</a> 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

Modified: index
===================================================================
--- index	2010-02-05 19:58:01 UTC (rev 4653)
+++ index	2010-02-05 20:08:28 UTC (rev 4654)
@@ -52715,9 +52715,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
@@ -52729,12 +52730,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>
 
@@ -52785,13 +52787,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>
 
@@ -52816,7 +52818,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>
@@ -52837,24 +52844,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>,
@@ -52862,7 +52867,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

Modified: source
===================================================================
--- source	2010-02-05 19:58:01 UTC (rev 4653)
+++ source	2010-02-05 20:08:28 UTC (rev 4654)
@@ -59595,11 +59595,10 @@
    title="">timeout</var> be the result.</p></li>
 
    <li><p>If the currently running <span
-   title="concept-task">task</span> is a task that was created by
-   either the <code
-   title="dom-windowtimers-setTimeout">setTimeout()</code> method, and
-   <var title="">timeout</var> is less than 4, then increase <var
-   title="">timeout</var> to 4.</p></li>
+   title="concept-task">task</span> is a task that was created by the
+   <code title="dom-windowtimers-setTimeout">setTimeout()</code>
+   method, and <var title="">timeout</var> is less than 4, then
+   increase <var title="">timeout</var> to 4.</p></li>
 
    <li><p>Add an entry to the <span>list of active timeouts</span>,
    identified by a user-agent-defined integer that is greater than
@@ -59611,13 +59610,13 @@
 
    <li>
 
-    <p>If <var title="">context</var> is a <code>Window</code> object,
-    wait until the <code>Document</code> associated with <var
-    title="">context</var> has been <span>fully active</span> for a
-    further <var title="">timeout</var> milliseconds (not necessarily
-    consecutively).</p>
+    <p>If the <span>method context</span> is a <code>Window</code>
+    object, wait until the <code>Document</code> associated with the
+    <span>method context</span> has been <span>fully active</span> 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 <span>method context</span> is a
     <code>WorkerUtils</code> object, wait until <var
     title="">timeout</var> milliseconds have passed with the worker
     not suspended (not necessarily consecutively).</p>
@@ -59681,13 +59680,13 @@
 
    <li>
 
-    <p><i>Wait</i>: If <var title="">context</var> is a
+    <p><i>Wait</i>: If the <span>method context</span> is a
     <code>Window</code> object, wait until the <code>Document</code>
-    associated with <var title="">context</var> has been <span>fully
+    associated with the <span>method context</span> has been <span>fully
     active</span> 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 <span>method context</span> is a
     <code>WorkerUtils</code> object, wait until <var
     title="">interval</var> milliseconds have passed with the worker
     not suspended (not necessarily consecutively).</p>
@@ -59720,6 +59719,11 @@
 
   <hr>
 
+  <p>The <dfn>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>Window</code> or
+  <code>WorkerUtils</code> object).</p>
+
   <p>When the above methods are to <dfn>get the timed task</dfn>, they
   must run the following steps:</p>
 
@@ -59744,28 +59748,23 @@
    <li><p>Let <var title="">script language</var> be
    JavaScript.</p></li>
 
-   <li><p>Let <var title="">context</var> be the object on which the
-   method is implemented (a <code>Window</code> or
-   <code>WorkerUtils</code> object).</p></li>
-
    <li>
 
-    <p>If <var title="">context</var> is a <code>Window</code> object,
-    let <var title="">global object</var> be <var
-    title="">context</var>, let <var title="">browsing context</var>
-    be the <span>browsing context</span> with which <var
-    title="">global object</var> is associated, let <var
-    title="">character encoding</var> be the <span title="document's
-    character encoding">character encoding</span> 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 <span
-    title="document base URL">base URL</span> 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 <span>method context</span> is a <code>Window</code>
+    object, let <var title="">global object</var> be the <span>method
+    context</span>, let <var title="">browsing context</var> be the
+    <span>browsing context</span> with which <var title="">global
+    object</var> is associated, let <var title="">character
+    encoding</var> be the <span title="document's character
+    encoding">character encoding</span> 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 <span title="document base
+    URL">base URL</span> 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 <span>method context</span> 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
@@ -59774,7 +59773,7 @@
     character encoding</span>, and <span>script's base URL</span>
     (respectively) of the <span title="concept-script">script</span>
     that the <span>run a worker</span> algorithm created when it
-    created <var title="">context</var>.</p>
+    created the <span>method context</span>.</p>
 
     <p>Otherwise, act as described in the specification that defines
     that the <code>WindowTimers</code> interface is implemented by




More information about the Commit-Watchers mailing list