[giow] (3) Revert the regression in the definition of 'entry script' …

…from r8114

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=22862
Affected topics: HTML

git-svn-id: http://svn.whatwg.org/webapps@8123 340c8d12-0b0e-0410-8428-c7bf67bfef74

complete.html

 
   <header class=head id=head><p><a href=http://www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 1 August 2013</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 2 August 2013</h2>
    </hgroup><dl><dt><strong>Web developer edition:</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
   <p>Each <a href=#unit-of-related-similar-origin-browsing-contexts>unit of related similar-origin browsing contexts</a> has a <dfn id=stack-of-incumbent-scripts>stack of
   incumbent scripts</dfn>, which must be initially empty. When a new script is <i>pushed</i> onto
   this stack, the specified script is to be added to the stack; when the script on this stack that
-  was most recently pushed onto it is to be <i>popped</i> from the stack, it must be removed.</p>
+  was most recently pushed onto it is to be <i>popped</i> from the stack, it must be removed.
+  Entries on this stack can be labeled as <dfn id=candidate-entry-scripts>candidate entry scripts</dfn>.</p>
 
   <p>When a user agent is to <dfn id=jump-to-a-code-entry-point>jump to a code entry-point</dfn> for a <a href=#concept-script title=concept-script>script</a>, for example to invoke an event listener defined in that
   <a href=#concept-script title=concept-script>script</a>, the user agent must run the following steps:</p>
    browsing context</a>, then abort these steps.</p>
 
    <li><p>Push the <a href=#concept-script title=concept-script>script</a> being invoked onto the <a href=#stack-of-incumbent-scripts>stack of
-   incumbent scripts</a>.</li>
+   incumbent scripts</a>, and label it as a <a href=#candidate-entry-scripts title="candidate entry scripts">candidate entry
+   script</a>.</li>
 
    <li><p>Make the <a href=#script-execution-environment title="script execution environment">script execution environment</a>
    for the <a href=#concept-script title=concept-script>script</a> execute the code for the given code
   onto the <a href=#stack-of-incumbent-scripts>stack of incumbent scripts</a> before the evaluation begins, and popped when the
   evaluation ends (regardless of whether it's an abrupt completion or not).</p>
 
-  <p>The <dfn id=entry-script>entry script</dfn> is the <a href=#concept-script title=concept-script>script</a> in the
-  <a href=#stack-of-incumbent-scripts>stack of incumbent scripts</a> that was least-recently added (i.e. the first one in the
-  stack). If the stack is empty, then there is no <a href=#entry-script>entry script</a>. It is used to obtain,
-  amongst other things, the <a href="#script's-base-url">script's base URL</a> to <a href=#resolve-a-url title="resolve a
+  <p>The <dfn id=entry-script>entry script</dfn> is the most-recently added <a href=#concept-script title=concept-script>script</a> in the <a href=#stack-of-incumbent-scripts>stack of incumbent scripts</a> that is
+  labeled as a <a href=#candidate-entry-scripts title="candidate entry scripts">candidate entry script</a>. If the stack is
+  empty, or has no entries labeled as such, then there is no <a href=#entry-script>entry script</a>. It is used
+  to obtain, amongst other things, the <a href="#script's-base-url">script's base URL</a> to <a href=#resolve-a-url title="resolve a
   url">resolve</a> relative <a href=#url title=URL>URLs</a> used in scripts running in that
   <a href=#unit-of-related-similar-origin-browsing-contexts>unit of related similar-origin browsing contexts</a>.</p>
 

index

 
   <header class=head id=head><p><a href=http://www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 1 August 2013</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 2 August 2013</h2>
    </hgroup><dl><dt><strong>Web developer edition:</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
   <p>Each <a href=#unit-of-related-similar-origin-browsing-contexts>unit of related similar-origin browsing contexts</a> has a <dfn id=stack-of-incumbent-scripts>stack of
   incumbent scripts</dfn>, which must be initially empty. When a new script is <i>pushed</i> onto
   this stack, the specified script is to be added to the stack; when the script on this stack that
-  was most recently pushed onto it is to be <i>popped</i> from the stack, it must be removed.</p>
+  was most recently pushed onto it is to be <i>popped</i> from the stack, it must be removed.
+  Entries on this stack can be labeled as <dfn id=candidate-entry-scripts>candidate entry scripts</dfn>.</p>
 
   <p>When a user agent is to <dfn id=jump-to-a-code-entry-point>jump to a code entry-point</dfn> for a <a href=#concept-script title=concept-script>script</a>, for example to invoke an event listener defined in that
   <a href=#concept-script title=concept-script>script</a>, the user agent must run the following steps:</p>
    browsing context</a>, then abort these steps.</p>
 
    <li><p>Push the <a href=#concept-script title=concept-script>script</a> being invoked onto the <a href=#stack-of-incumbent-scripts>stack of
-   incumbent scripts</a>.</li>
+   incumbent scripts</a>, and label it as a <a href=#candidate-entry-scripts title="candidate entry scripts">candidate entry
+   script</a>.</li>
 
    <li><p>Make the <a href=#script-execution-environment title="script execution environment">script execution environment</a>
    for the <a href=#concept-script title=concept-script>script</a> execute the code for the given code
   onto the <a href=#stack-of-incumbent-scripts>stack of incumbent scripts</a> before the evaluation begins, and popped when the
   evaluation ends (regardless of whether it's an abrupt completion or not).</p>
 
-  <p>The <dfn id=entry-script>entry script</dfn> is the <a href=#concept-script title=concept-script>script</a> in the
-  <a href=#stack-of-incumbent-scripts>stack of incumbent scripts</a> that was least-recently added (i.e. the first one in the
-  stack). If the stack is empty, then there is no <a href=#entry-script>entry script</a>. It is used to obtain,
-  amongst other things, the <a href="#script's-base-url">script's base URL</a> to <a href=#resolve-a-url title="resolve a
+  <p>The <dfn id=entry-script>entry script</dfn> is the most-recently added <a href=#concept-script title=concept-script>script</a> in the <a href=#stack-of-incumbent-scripts>stack of incumbent scripts</a> that is
+  labeled as a <a href=#candidate-entry-scripts title="candidate entry scripts">candidate entry script</a>. If the stack is
+  empty, or has no entries labeled as such, then there is no <a href=#entry-script>entry script</a>. It is used
+  to obtain, amongst other things, the <a href="#script's-base-url">script's base URL</a> to <a href=#resolve-a-url title="resolve a
   url">resolve</a> relative <a href=#url title=URL>URLs</a> used in scripts running in that
   <a href=#unit-of-related-similar-origin-browsing-contexts>unit of related similar-origin browsing contexts</a>.</p>
 

source

   <p>Each <span>unit of related similar-origin browsing contexts</span> has a <dfn>stack of
   incumbent scripts</dfn>, which must be initially empty. When a new script is <i>pushed</i> onto
   this stack, the specified script is to be added to the stack; when the script on this stack that
-  was most recently pushed onto it is to be <i>popped</i> from the stack, it must be removed.</p>
+  was most recently pushed onto it is to be <i>popped</i> from the stack, it must be removed.
+  Entries on this stack can be labeled as <dfn>candidate entry scripts</dfn>.</p>
 
   <p>When a user agent is to <dfn>jump to a code entry-point</dfn> for a <span
   title="concept-script">script</span>, for example to invoke an event listener defined in that
    browsing context</span>, then abort these steps.</p>
 
    <li><p>Push the <span title="concept-script">script</span> being invoked onto the <span>stack of
-   incumbent scripts</span>.</p></li>
+   incumbent scripts</span>, and label it as a <span title="candidate entry scripts">candidate entry
+   script</span>.</p></li>
 
    <li><p>Make the <span title="script execution environment">script execution environment</span>
    for the <span title="concept-script">script</span> execute the code for the given code
   onto the <span>stack of incumbent scripts</span> before the evaluation begins, and popped when the
   evaluation ends (regardless of whether it's an abrupt completion or not).</p>
 
-  <p>The <dfn>entry script</dfn> is the <span title="concept-script">script</span> in the
-  <span>stack of incumbent scripts</span> that was least-recently added (i.e. the first one in the
-  stack). If the stack is empty, then there is no <span>entry script</span>. It is used to obtain,
-  amongst other things, the <span>script's base URL</span> to <span title="resolve a
+  <p>The <dfn>entry script</dfn> is the most-recently added <span
+  title="concept-script">script</span> in the <span>stack of incumbent scripts</span> that is
+  labeled as a <span title="candidate entry scripts">candidate entry script</span>. If the stack is
+  empty, or has no entries labeled as such, then there is no <span>entry script</span>. It is used
+  to obtain, amongst other things, the <span>script's base URL</span> to <span title="resolve a
   url">resolve</span> relative <span title="URL">URLs</span> used in scripts running in that
   <span>unit of related similar-origin browsing contexts</span>.</p>