- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 08 Feb 2011 21:05:17 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv26106
Modified Files:
Overview.html
Log Message:
Rename the algorithms for running and executing a script to have less confusing names. They're now 'prepare a script' and 'execute the script block' respectively. (whatwg r5855)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4697
retrieving revision 1.4698
diff -u -d -r1.4697 -r1.4698
--- Overview.html 8 Feb 2011 02:13:55 -0000 1.4697
+++ Overview.html 8 Feb 2011 21:05:13 -0000 1.4698
@@ -12871,12 +12871,13 @@
type</var></dfn>, <dfn id="the-script-block-s-character-encoding"><var>the script block's character
encoding</var></dfn>, and <dfn id="the-script-block-s-fallback-character-encoding"><var>the script block's fallback
character encoding</var></dfn>. They are determined when the script
- is run, based on the attributes on the element at that time, and the
- <code><a href="#document">Document</a></code> of the <code><a href="#script">script</a></code> element.</p>
+ is prepared, based on the attributes on the element at that time,
+ and the <code><a href="#document">Document</a></code> of the <code><a href="#script">script</a></code>
+ element.</p>
<p>When a <code><a href="#script">script</a></code> element that is not marked as being
<a href="#parser-inserted">"parser-inserted"</a> experiences one of the events listed
- in the following list, the user agent must synchronously <a href="#running-a-script" title="running a script">run</a> the <code><a href="#script">script</a></code>
+ in the following list, the user agent must synchronously <a href="#prepare-a-script" title="prepare a script">prepare</a> the <code><a href="#script">script</a></code>
element:</p>
<ul><li>The <code><a href="#script">script</a></code> element gets <a href="#insert-an-element-into-a-document" title="insert an
@@ -12889,9 +12890,8 @@
<code>Document</code></a> and has a <code title="attr-script-src"><a href="#attr-script-src">src</a></code> attribute set where previously
the element had no such attribute.</li>
- </ul><p><dfn id="running-a-script" title="running a script">Running a script</dfn>: When a
- <code><a href="#script">script</a></code> element is to be run, the user agent must act as
- follows:</p>
+ </ul><p>To <dfn id="prepare-a-script" title="prepare a script">prepare a script</dfn>, the user
+ agent must act as follows:</p>
<ol><li>
@@ -13171,7 +13171,7 @@
<p>The element must be added to the end of the <dfn id="list-of-scripts-that-will-execute-in-order-as-soon-as-possible">list of
scripts that will execute in order as soon as possible</dfn>
associated with the <code><a href="#document">Document</a></code> of the
- <code><a href="#script">script</a></code> element at the time the <a href="#running-a-script">running a
+ <code><a href="#script">script</a></code> element at the time the <a href="#prepare-a-script">prepare a
script</a> algorithm started.</p>
<p>The <a href="#concept-task" title="concept-task">task</a> that the
@@ -13185,10 +13185,10 @@
element as ready but abort these steps without executing the
script yet.</li>
- <li><p><i>Execution</i>: <a href="#executing-a-script-block" title="executing a script
- block">Execute the script block</a> corresponding to the
- first script element in this <a href="#list-of-scripts-that-will-execute-in-order-as-soon-as-possible">list of scripts that will
- execute in order as soon as possible</a>.</li>
+ <li><p><i>Execution</i>: <a href="#execute-the-script-block">Execute the script block</a>
+ corresponding to the first script element in this <a href="#list-of-scripts-that-will-execute-in-order-as-soon-as-possible">list of
+ scripts that will execute in order as soon as
+ possible</a>.</li>
<li><p>Remove the first element from this <a href="#list-of-scripts-that-will-execute-in-order-as-soon-as-possible">list of scripts
that will execute in order as soon as possible</a>.</li>
@@ -13208,24 +13208,22 @@
<p>The element must be added to the <dfn id="set-of-scripts-that-will-execute-as-soon-as-possible">set of scripts that
will execute as soon as possible</dfn> of the
<code><a href="#document">Document</a></code> of the <code><a href="#script">script</a></code> element at the
- time the <a href="#running-a-script">running a script</a> algorithm started.</p>
+ time the <a href="#prepare-a-script">prepare a script</a> algorithm started.</p>
<p>The <a href="#concept-task" title="concept-task">task</a> that the
<a href="#networking-task-source">networking task source</a> places on the <a href="#task-queue">task
queue</a> once the <a href="#fetch" title="fetch">fetching
- algorithm</a> has completed must <a href="#executing-a-script-block" title="executing a
- script block">execute the script block</a> and then remove
- the element from the <a href="#set-of-scripts-that-will-execute-as-soon-as-possible">set of scripts that will execute as
- soon as possible</a>.</p>
+ algorithm</a> has completed must <a href="#execute-the-script-block">execute the script
+ block</a> and then remove the element from the <a href="#set-of-scripts-that-will-execute-as-soon-as-possible">set of
+ scripts that will execute as soon as possible</a>.</p>
</dd>
<dt id="script-processing-inline">Otherwise</dt>
- <dd>The user agent must immediately <a href="#executing-a-script-block" title="executing a
- script block">execute the script block</a>, even if other
- scripts are already executing.</dd>
+ <dd>The user agent must immediately <a href="#execute-the-script-block">execute the script
+ block</a>, even if other scripts are already executing.</dd>
</dl></li>
@@ -13259,9 +13257,8 @@
blocking scripts" state, things aren't defined in terms of which
style sheets are blocking which scripts -->
- <p><dfn id="executing-a-script-block" title="executing a script block">Executing a script
- block</dfn>: When the steps above require that the script block be
- executed, the user agent must act as follows:</p>
+ <p>When the user agent is required to <dfn id="execute-the-script-block" title="execute the script
+ block">execute a script block</dfn>, it must act as follows:</p>
<dl class="switch"><dt>If the load resulted in an error (for example a DNS error, or
an HTTP 404 error)</dt>
@@ -13277,7 +13274,7 @@
<p>Executing the script block must consists of running the
following steps. For the purposes of these steps, the script is
considered to be from an <i>external file</i> if, while the
- <a href="#running-a-script">running a script</a> algorithm above was running for this
+ <a href="#prepare-a-script">prepare a script</a> algorithm above was running for this
script, the <code><a href="#script">script</a></code> element had a <code title="attr-script-src"><a href="#attr-script-src">src</a></code> attribute specified.</p>
<ol><li>
@@ -60387,7 +60384,7 @@
<p>Increment the parser's <a href="#script-nesting-level">script nesting level</a> by
one.</p>
- <p><a href="#running-a-script" title="running a script">Run</a> the <var title="">script</var>. This might cause some script to execute,
+ <p><a href="#prepare-a-script" title="prepare a script">Prepare</a> the <var title="">script</var>. This might cause some script to execute,
which might cause <a href="#dom-document-write" title="dom-document-write">new characters
to be inserted into the tokenizer</a>, and might cause the
tokenizer to output more tokens, resulting in a <a href="#nestedParsing">reentrant invocation of the parser</a>.</p>
@@ -60454,7 +60451,7 @@
by one (it should be zero before this step, so this sets it to
one).</li>
- <li><p><a href="#executing-a-script-block" title="executing a script block">Execute</a>
+ <li><p><a href="#execute-the-script-block" title="execute the script block">Execute</a>
<var title="">the script</var>.</li>
<li><p>Decrement the parser's <a href="#script-nesting-level">script nesting level</a>
@@ -61899,7 +61896,7 @@
the parser's <code><a href="#document">Document</a></code> <a href="#has-no-style-sheet-that-is-blocking-scripts">has no style sheet that
is blocking scripts</a>.</li>
- <li><p><a href="#executing-a-script-block" title="executing a script block">Execute</a> the
+ <li><p><a href="#execute-the-script-block" title="execute the script block">Execute</a> the
first <code><a href="#script">script</a></code> in the <a href="#list-of-scripts-that-will-execute-when-the-document-has-finished-parsing">list of scripts that will
execute when the document has finished parsing</a>.</li>
@@ -62910,10 +62907,10 @@
flag must be unset. If the parser was originally created for the
<a href="#xml-fragment-parsing-algorithm">XML fragment parsing algorithm</a>, then the element must
be marked as <a href="#already-started">"already started"</a> also. When the element's
- end tag is parsed, the user agent must <a href="#running-a-script" title="running a
- script">run</a> the <code><a href="#script">script</a></code> element. If this causes
- there to be a <a href="#pending-parsing-blocking-script">pending parsing-blocking script</a>, then the
- user agent must run the following steps:</p>
+ end tag is parsed, the user agent must <a href="#prepare-a-script" title="prepare a
+ script">prepare</a> the <code><a href="#script">script</a></code> element. If this
+ causes there to be a <a href="#pending-parsing-blocking-script">pending parsing-blocking script</a>,
+ then the user agent must run the following steps:</p>
<ol><li><p>Block this instance of the <a href="#xml-parser">XML parser</a>, such
that the <a href="#event-loop">event loop</a> will not run <a href="#concept-task" title="concept-task">tasks</a> that invoke it.</li>
@@ -62928,7 +62925,7 @@
that <a href="#concept-task" title="concept-task">tasks</a> that invoke it can
again be run.</li>
- <li><p><a href="#executing-a-script-block" title="executing a script block">Execute</a> the
+ <li><p><a href="#execute-the-script-block" title="execute the script block">Execute</a> the
<a href="#pending-parsing-blocking-script">pending parsing-blocking script</a>.</li>
<li><p>There is no longer a <a href="#pending-parsing-blocking-script">pending parsing-blocking
Received on Tuesday, 8 February 2011 21:05:19 UTC