[] (0) Some more tidying around script settings objects.

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=18242 Affected topics: DOM APIs git-svn-id: http://svn.whatwg.org/webapps@8264 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Nov 11, 2013 · 58b8128 · 58b8128
1 parent aa4ecce
commit 58b8128
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 27 deletions.
diff --git a/complete.html b/complete.html
@@ -70046,10 +70046,13 @@ <h5 id=definitions-0><span class=secno>7.1.3.1 </span>Definitions</h5>
 
    </dd>
 
-  </dl><p>The <dfn id=relevant-settings-object>relevant settings object</dfn> for a global object <var title="">o</var> is the
+  </dl><p>The <dfn id=relevant-settings-object-for-a-global-object>relevant settings object for a global object</dfn> <var title="">o</var> is the
   <a href=#script-settings-object>script settings object</a> whose <a href=#global-object>global object</a> is <var title="">o</var>.
   (There is always a 1:1 mapping of global objects to script settings objects.)</p>
 
+  <p>The <dfn id=relevant-settings-object-for-a-script>relevant settings object for a script</dfn> <var title="">s</var> is the
+  <a href=#settings-object>settings object</a> of <var title="">s</var>.</p>
+
 
 
   <h5 id=script-settings-for-browsing-contexts><span class=secno>7.1.3.2 </span>Script settings for browsing contexts</h5>
@@ -70151,11 +70154,10 @@ <h5 id=script-settings-for-browsing-contexts><span class=secno>7.1.3.2 </span>Sc
   Entries on this stack can be labeled as <dfn id=candidate-entry-settings-object title="candidate entry settings object">candidate entry settings objects</dfn>.</p>
 
 <!--CLEANUP-->
-  <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> <var title="">s</var>, optionally with
-  a <a href=#script-settings-object>script settings object</a> <var title="">context</var>, the user agent must run the
+  <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> <var title="">s</var>, the user agent must run the
   following steps:</p>
 
-  <ol><li><p>If no <var title="">context</var> was provided, let <var title="">context</var> be the
+  <ol><li><p>Let <var title="">context</var> be the
    <a href=#settings-object>settings object</a> of <var title="">s</var>.</li>
 
 <!--CLEANUP-->
@@ -70165,7 +70167,7 @@ <h5 id=script-settings-for-browsing-contexts><span class=secno>7.1.3.2 </span>Sc
 
 <!--CLEANUP-->
    <li><p>Make the appropriate <a href=#script-execution-environment>script execution environment</a>
-   specified by <var title="">contet</var> execute the <var title="">s</var>'s <a href=#code-entry-point>code
+   specified by <var title="">context</var> execute the <var title="">s</var>'s <a href=#code-entry-point>code
    entry-point</a>.</li>
 
    <li><p><a href=#clean-up-after-running-a-callback>Clean up after running a callback</a>.</li>
@@ -70623,8 +70625,10 @@ <h5 id=processing-model-4><span class=secno>7.1.4.2 </span>Processing model</h5>
     browsing context</a> specified by the script's <a href=#settings-object>settings object</a> belongs, using the <a href=#task-wrapper-algorithm>task wrapper algorithm</a> as the steps to
     invoke each callback.</p>
 
-    <p class=note>This will typically invoke scripted callbacks, which calls the <a href=#jump-to-a-code-entry-point>jump to a
-    code entry-point</a> algorithm, which calls this <a href=#perform-a-microtask-checkpoint>perform a microtask checkpoint</a>
+<!--CLEANUP-->
+    <p class=note>This will typically invoke scripted callbacks, 
+    which eventually calls the <a href=#clean-up-after-running-a-callback>clean up after running a callback</a> steps,
+    which call this <a href=#perform-a-microtask-checkpoint>perform a microtask checkpoint</a>
     algorithm again, which is why we use the <a href=#running-mutation-observers>running mutation observers</a> flag to avoid
     reentrancy.</p>
 
@@ -71163,8 +71167,8 @@ <h5 id=event-handler-attributes><span class=secno>7.1.6.1 </span>Event handlers<
 
      </dd>
 
-    </dl><p>In this step, <dfn id=concept-invoke-event-handler title=concept-invoke-event-handler>invoke</dfn> means to run the
-    <a href=#jump-to-a-code-entry-point>jump to a code entry-point</a> algorithm.</p>
+    </dl><p class=XXX>In this step, <dfn id=concept-invoke-event-handler title=concept-invoke-event-handler>invoke</dfn> means to run the
+    <a href=#jump-to-a-code-entry-point>jump to a code entry-point</a> algorithm.</p> <!-- bug 19211 / bug 23744 -->
 
    </li>
 

diff --git a/index b/index
@@ -70046,10 +70046,13 @@ interface <dfn id=navigatoronline>NavigatorOnLine</dfn> {
 
    </dd>
 
-  </dl><p>The <dfn id=relevant-settings-object>relevant settings object</dfn> for a global object <var title="">o</var> is the
+  </dl><p>The <dfn id=relevant-settings-object-for-a-global-object>relevant settings object for a global object</dfn> <var title="">o</var> is the
   <a href=#script-settings-object>script settings object</a> whose <a href=#global-object>global object</a> is <var title="">o</var>.
   (There is always a 1:1 mapping of global objects to script settings objects.)</p>
 
+  <p>The <dfn id=relevant-settings-object-for-a-script>relevant settings object for a script</dfn> <var title="">s</var> is the
+  <a href=#settings-object>settings object</a> of <var title="">s</var>.</p>
+
 
 
   <h5 id=script-settings-for-browsing-contexts><span class=secno>7.1.3.2 </span>Script settings for browsing contexts</h5>
@@ -70151,11 +70154,10 @@ interface <dfn id=navigatoronline>NavigatorOnLine</dfn> {
   Entries on this stack can be labeled as <dfn id=candidate-entry-settings-object title="candidate entry settings object">candidate entry settings objects</dfn>.</p>
 
 <!--CLEANUP-->
-  <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> <var title="">s</var>, optionally with
-  a <a href=#script-settings-object>script settings object</a> <var title="">context</var>, the user agent must run the
+  <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> <var title="">s</var>, the user agent must run the
   following steps:</p>
 
-  <ol><li><p>If no <var title="">context</var> was provided, let <var title="">context</var> be the
+  <ol><li><p>Let <var title="">context</var> be the
    <a href=#settings-object>settings object</a> of <var title="">s</var>.</li>
 
 <!--CLEANUP-->
@@ -70165,7 +70167,7 @@ interface <dfn id=navigatoronline>NavigatorOnLine</dfn> {
 
 <!--CLEANUP-->
    <li><p>Make the appropriate <a href=#script-execution-environment>script execution environment</a>
-   specified by <var title="">contet</var> execute the <var title="">s</var>'s <a href=#code-entry-point>code
+   specified by <var title="">context</var> execute the <var title="">s</var>'s <a href=#code-entry-point>code
    entry-point</a>.</li>
 
    <li><p><a href=#clean-up-after-running-a-callback>Clean up after running a callback</a>.</li>
@@ -70623,8 +70625,10 @@ dictionary <dfn id=erroreventinit>ErrorEventInit</dfn> : <a href=#eventinit>Even
     browsing context</a> specified by the script's <a href=#settings-object>settings object</a> belongs, using the <a href=#task-wrapper-algorithm>task wrapper algorithm</a> as the steps to
     invoke each callback.</p>
 
-    <p class=note>This will typically invoke scripted callbacks, which calls the <a href=#jump-to-a-code-entry-point>jump to a
-    code entry-point</a> algorithm, which calls this <a href=#perform-a-microtask-checkpoint>perform a microtask checkpoint</a>
+<!--CLEANUP-->
+    <p class=note>This will typically invoke scripted callbacks, 
+    which eventually calls the <a href=#clean-up-after-running-a-callback>clean up after running a callback</a> steps,
+    which call this <a href=#perform-a-microtask-checkpoint>perform a microtask checkpoint</a>
     algorithm again, which is why we use the <a href=#running-mutation-observers>running mutation observers</a> flag to avoid
     reentrancy.</p>
 
@@ -71163,8 +71167,8 @@ currently this is unnecessary: http://www.w3.org/Bugs/Public/show_bug.cgi?id=119
 
      </dd>
 
-    </dl><p>In this step, <dfn id=concept-invoke-event-handler title=concept-invoke-event-handler>invoke</dfn> means to run the
-    <a href=#jump-to-a-code-entry-point>jump to a code entry-point</a> algorithm.</p>
+    </dl><p class=XXX>In this step, <dfn id=concept-invoke-event-handler title=concept-invoke-event-handler>invoke</dfn> means to run the
+    <a href=#jump-to-a-code-entry-point>jump to a code entry-point</a> algorithm.</p> <!-- bug 19211 / bug 23744 -->
 
    </li>
 

diff --git a/source b/source
@@ -78166,10 +78166,13 @@ interface <dfn>NavigatorOnLine</dfn> {
 
   </dl>
 
-  <p>The <dfn>relevant settings object</dfn> for a global object <var data-x="">o</var> is the
+  <p>The <dfn>relevant settings object for a global object</dfn> <var data-x="">o</var> is the
   <span>script settings object</span> whose <span>global object</span> is <var data-x="">o</var>.
   (There is always a 1:1 mapping of global objects to script settings objects.)</p>
 
+  <p>The <dfn>relevant settings object for a script</dfn> <var data-x="">s</var> is the
+  <span>settings object</span> of <var data-x="">s</var>.</p>
+
 
 
   <h5>Script settings for browsing contexts</h5>
@@ -78279,13 +78282,12 @@ interface <dfn>NavigatorOnLine</dfn> {
 
 <!--CLEANUP-->
   <p>When a user agent is to <dfn>jump to a code entry-point</dfn> for a <span
-  data-x="concept-script">script</span> <var data-x="">s</var>, optionally with
-  a <span>script settings object</span> <var data-x="">context</var>, the user agent must run the
+  data-x="concept-script">script</span> <var data-x="">s</var>, the user agent must run the
   following steps:</p>
 
   <ol>
 
-   <li><p>If no <var data-x="">context</var> was provided, let <var data-x="">context</var> be the
+   <li><p>Let <var data-x="">context</var> be the
    <span>settings object</span> of <var data-x="">s</var>.</p></li>
 
 <!--CLEANUP-->
@@ -78295,7 +78297,7 @@ interface <dfn>NavigatorOnLine</dfn> {
 
 <!--CLEANUP-->
    <li><p>Make the appropriate <span>script execution environment</span>
-   specified by <var data-x="">contet</var> execute the <var data-x="">s</var>'s <span>code
+   specified by <var data-x="">context</var> execute the <var data-x="">s</var>'s <span>code
    entry-point</span>.</p></li>
 
    <li><p><span>Clean up after running a callback</span>.</p></li>
@@ -78821,8 +78823,10 @@ dictionary <dfn>ErrorEventInit</dfn> : <span>EventInit</span> {
     browsing context</span> specified by the script's <span>settings object</span> belongs, using the <span>task wrapper algorithm</span> as the steps to
     invoke each callback.</p>
 
-    <p class="note">This will typically invoke scripted callbacks, which calls the <span>jump to a
-    code entry-point</span> algorithm, which calls this <span>perform a microtask checkpoint</span>
+<!--CLEANUP-->
+    <p class="note">This will typically invoke scripted callbacks, 
+    which eventually calls the <span>clean up after running a callback</span> steps,
+    which call this <span>perform a microtask checkpoint</span>
     algorithm again, which is why we use the <span>running mutation observers</span> flag to avoid
     reentrancy.</p>
 
@@ -79461,8 +79465,8 @@ currently this is unnecessary: http://www.w3.org/Bugs/Public/show_bug.cgi?id=119
 
     </dl>
 
-    <p>In this step, <dfn data-x="concept-invoke-event-handler">invoke</dfn> means to run the
-    <span>jump to a code entry-point</span> algorithm.</p>
+    <p class="XXX">In this step, <dfn data-x="concept-invoke-event-handler">invoke</dfn> means to run the
+    <span>jump to a code entry-point</span> algorithm.</p> <!-- bug 19211 / bug 23744 -->
 
    </li>