From 019e30ac344d991f2b15b63a1b3e01eaccc663fd Mon Sep 17 00:00:00 2001 From: Domenic Denicola Date: Tue, 15 Dec 2015 14:28:44 -0500 Subject: [PATCH] Fix importScripts() script execution This fixes #193, which notes that importScripts() previously sent errors down the "report an exception" path instead of rethrowing them. It also makes a slight change of rethrowing any early errors that are not SyntaxErrors, instead of converting early ReferenceErrors into SyntaxErrors. --- source | 63 ++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/source b/source index bf16bbc41bf..2ad0e0d9a5e 100644 --- a/source +++ b/source @@ -85781,8 +85781,8 @@ interface NavigatorOnLine {
Calling scripts

When a user agent is to jump to a code entry-point for a script s, the user agent must run the - following steps:

+ data-x="concept-script">script s, given an optional rethrow errors + flag, the user agent must run the following steps:

    @@ -85797,15 +85797,40 @@ interface NavigatorOnLine {

  1. Let result be ParseScript(s's code entry-point, s).

    2. -

  2. If result is a List of errors, report the exception given by the - first element in result for the script s, and go to the step labeled - cleanup.

    3. +
  3. +

    If result is a List of errors, then:

    + +
      +

    1. If the rethrow errors flag is set and s's muted errors + flag is not set, rethrow the error given by the first element of result.

      2. + +

    2. If the rethrow errors flag is set and s's muted + errors flag is set, throw a NetworkError exception.

      3. + +

    3. If the rethrow errors flag is not set, report the exception + given by the first element in result for the script s.

      4. + +

    4. In all cases, go to the step labeled cleanup.

      5. +
    +

  4. Let status be ScriptEvaluation(result).

    5. -

  5. If status is an abrupt completion, report the exception given by - result.[[value]] for the script s.

    6. +
  6. +

    If status is an abrupt completion, then:

    + +
      +

    1. If the rethrow errors flag is set and s's muted errors + flag is not set, rethrow the error given by result.[[value]].

      2. + +

    2. If the rethrow errors flag is set and s's muted + errors flag is set, throw a NetworkError exception.

      3. + +

    3. If the rethrow errors flag is not set, report the exception + given result.[[value]] for the script s.

      4. +
    +

  7. Cleanup: Clean up after running a callback with settings.

    8. @@ -85962,8 +85987,8 @@ interface NavigatorOnLine {

    When the specification says that a script is to be created, given some script source, a script source URL, an - environment settings object, and optionally a muted errors flag, the user - agent must run the following steps:

    + environment settings object, and optionally muted errors and rethrow + errors flag, the user agent must run the following steps:

      @@ -85984,7 +86009,7 @@ interface NavigatorOnLine { errors flag.

    1. Jump to script's code - entry-point.

      2. + entry-point, passing the rethrow errors flag if it was given.

    @@ -95504,24 +95529,18 @@ interface SharedWorker : EventTarget {

  8. Create a script using source as the script source, the - URL from which source was obtained, and settings object as - the environment settings object.

    + URL from which source was obtained, settings object as + the environment settings object, and passing the rethrow errors + flag.

    If response is CORS-cross-origin, pass the muted errors flag to the create a script algorithm as well.

    -

    Let the newly created script run until it either - returns, fails to parse, fails to catch an exception, or gets prematurely aborted by the - "kill a worker" or "terminate a worker" algorithms defined +

    The newly created script will run until + it either returns, fails to parse, fails to catch an exception, or gets prematurely aborted + by the "kill a worker" or "terminate a worker" algorithms defined above.

    -

    If response is CORS-cross-origin and either it failed to parse or - an exception was thrown, then throw a NetworkError exception and abort all these - steps.

    - -

    If it failed to parse, then throw an ECMAScript SyntaxError exception and abort all these steps.

    -

    If an exception was thrown or if the script was prematurely aborted, then abort all these steps, letting the exception or aborting continue to be processed by the calling script.