Attachment 287071 Details for Bug 148897 – Patch

[patch] Patch

bug-148897-20160825205928.patch (text/plain), 144.83 KB, created by Yusuke Suzuki on 2016-08-25 21:01:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2016-08-25 21:01:31 PDT

Size: 144.83 KB

patch

obsolete

>Subversion Revision: 205002
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 720957356cd94cf3e38f05c2c0af5fed07caf2b4..19a28952f7614ed6caa3e53738429a755545e673 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,52 @@
>+2016-08-25  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        [ES6] Integrate ES6 Modules into WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=148897
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * builtins/ModuleLoaderPrototype.js:
>+        (requestFetch):
>+        (requestTranslate):
>+        (requestInstantiate):
>+        (requestResolveDependencies):
>+        (requestInstantiateAll):
>+        (requestLink):
>+        (moduleEvaluation):
>+        (provide):
>+        (loadAndEvaluateModule):
>+        (requestResolveDependencies.): Deleted.
>+        (requestReady): Deleted.
>+        (link): Deleted.
>+        (loadModule): Deleted.
>+        (linkAndEvaluateModule): Deleted.
>+        * jsc.cpp:
>+        (GlobalObject::moduleLoaderResolve):
>+        (GlobalObject::moduleLoaderFetch):
>+        * runtime/Completion.cpp:
>+        (JSC::loadAndEvaluateModule):
>+        (JSC::loadModule):
>+        (JSC::linkAndEvaluateModule):
>+        * runtime/Completion.h:
>+        * runtime/JSGlobalObject.h:
>+        * runtime/JSModuleLoader.cpp:
>+        (JSC::JSModuleLoader::loadAndEvaluateModule):
>+        (JSC::JSModuleLoader::loadModule):
>+        (JSC::JSModuleLoader::linkAndEvaluateModule):
>+        (JSC::JSModuleLoader::resolve):
>+        (JSC::JSModuleLoader::fetch):
>+        (JSC::JSModuleLoader::translate):
>+        (JSC::JSModuleLoader::instantiate):
>+        (JSC::JSModuleLoader::evaluate):
>+        * runtime/JSModuleLoader.h:
>+        * runtime/ModuleLoaderPrototype.cpp:
>+        (JSC::moduleLoaderPrototypeResolve):
>+        (JSC::moduleLoaderPrototypeFetch):
>+        (JSC::moduleLoaderPrototypeTranslate):
>+        (JSC::moduleLoaderPrototypeInstantiate):
>+        (JSC::moduleLoaderPrototypeEvaluate):
>+        * runtime/Symbol.h:
>+
> 2016-08-25  Alex Christensen  <achristensen@webkit.org>
> 
>         CMake build fix.
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 717823cce2703aea71e39dd8a59d4f90daaa6cba..df6d923aad45e9ee61b9facc31fa3b236b103abd 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,99 @@
>+2016-08-25  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        [ES6] Integrate ES6 Modules into WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=148897
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Tests: js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html
>+               js/dom/module-execution-error-should-be-propagated-to-onerror.html
>+               js/dom/module-execution-order-inline.html
>+               js/dom/module-execution-order-mixed.html
>+               js/dom/module-inline-dynamic.html
>+               js/dom/module-inline-simple.html
>+               js/dom/module-load-event-with-src.html
>+               js/dom/module-load-event.html
>+               js/dom/module-load-same-module-from-different-entry-point-dynamic.html
>+               js/dom/module-load-same-module-from-different-entry-point.html
>+               js/dom/module-not-found-error-event-with-src-and-import.html
>+               js/dom/module-not-found-error-event-with-src.html
>+               js/dom/module-not-found-error-event.html
>+               js/dom/module-src-dynamic.html
>+               js/dom/module-src-simple.html
>+               js/dom/module-will-fire-beforeload.html
>+
>+        * CMakeLists.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * bindings/js/JSBindingsAllInOne.cpp:
>+        * bindings/js/JSDOMWindowBase.cpp:
>+        (WebCore::JSDOMWindowBase::moduleLoaderResolve):
>+        (WebCore::JSDOMWindowBase::moduleLoaderFetch):
>+        (WebCore::JSDOMWindowBase::moduleLoaderEvaluate):
>+        * bindings/js/JSDOMWindowBase.h:
>+        * bindings/js/JSMainThreadExecState.h:
>+        (WebCore::JSMainThreadExecState::loadModule):
>+        (WebCore::JSMainThreadExecState::linkAndEvaluateModule):
>+        * bindings/js/JSModuleFetcher.cpp: Added.
>+        (WebCore::JSModuleFetcher::JSModuleFetcher):
>+        (WebCore::JSModuleFetcher::~JSModuleFetcher):
>+        (WebCore::JSModuleFetcher::create):
>+        (WebCore::JSModuleFetcher::run):
>+        (WebCore::JSModuleFetcher::notifyFinished):
>+        * bindings/js/JSModuleFetcher.h: Copied from Source/WebCore/bindings/js/JSModuleLoader.h.
>+        (WebCore::JSModuleFetcher::cachedScript):
>+        * bindings/js/JSModuleGraph.cpp: Added.
>+        (WebCore::JSModuleGraph::JSModuleGraph):
>+        (WebCore::JSModuleGraph::notifyLoaded):
>+        (WebCore::JSModuleGraph::notifyErrored):
>+        (WebCore::JSModuleGraph::evaluate):
>+        (WebCore::JSModuleGraph::notifyEvaluated):
>+        (WebCore::JSModuleGraph::load):
>+        * bindings/js/JSModuleGraph.h: Copied from Source/WebCore/bindings/js/JSModuleLoader.h.
>+        (WebCore::JSModuleGraph::element):
>+        (WebCore::JSModuleGraph::moduleKey):
>+        (WebCore::JSModuleGraph::weakElementPtr):
>+        (WebCore::JSModuleGraph::errorOccurred):
>+        (WebCore::JSModuleGraph::isLoaded):
>+        * bindings/js/JSModuleLoader.cpp:
>+        (WebCore::JSModuleLoader::resolve):
>+        (WebCore::JSModuleLoader::fetch):
>+        (WebCore::JSModuleLoader::evaluate):
>+        (WebCore::JSModuleLoader::notifyFinished):
>+        * bindings/js/JSModuleLoader.h:
>+        * bindings/js/ScriptController.cpp:
>+        (WebCore::ScriptController::ScriptController):
>+        (WebCore::ScriptController::evaluateInWorld):
>+        (WebCore::handleJSModuleLoaderError):
>+        (WebCore::ScriptController::loadModuleInWorld):
>+        (WebCore::ScriptController::loadModule):
>+        (WebCore::ScriptController::linkAndEvaluateModuleInWorld):
>+        (WebCore::ScriptController::linkAndEvaluateModule):
>+        (WebCore::ScriptController::evaluateModule):
>+        (WebCore::jsValueToModuleKey):
>+        (WebCore::ScriptController::initJSModuleGraph):
>+        (WebCore::ScriptController::executeScript):
>+        * bindings/js/ScriptController.h:
>+        (WebCore::ScriptController::moduleLoaderAlreadyReportedErrorSymbol):
>+        * dom/Document.cpp:
>+        * dom/Document.h:
>+        * dom/ScriptElement.cpp:
>+        (WebCore::ScriptElement::prepareScript):
>+        (WebCore::ScriptElement::requestScript):
>+        (WebCore::ScriptElement::requestModuleScript):
>+        (WebCore::ScriptElement::executeScript):
>+        (WebCore::ScriptElement::loadModule):
>+        * dom/ScriptElement.h:
>+        (WebCore::ScriptElement::moduleGraph):
>+        (WebCore::ScriptElement::scriptType):
>+        (WebCore::ScriptElement::cachedScript): Deleted.
>+        * dom/ScriptRunner.cpp:
>+        (WebCore::ScriptRunner::~ScriptRunner):
>+        (WebCore::ScriptRunner::queueJSModuleGraphForExecution):
>+        (WebCore::ScriptRunner::notifyJSModuleGraphReady):
>+        (WebCore::ScriptRunner::timerFired):
>+        * dom/ScriptRunner.h:
>+        (WebCore::ScriptRunner::hasPendingScripts):
>+
> 2016-08-25  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Dragging against the end of the inline media scrubber causes the media scrubber to hide
>diff --git a/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js b/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js
>index 6a3bc82430ef18abae634d0f12e620fbce09b332..87643408dfb7df049c9754e168a339c19fc9b8a5 100644
>--- a/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js
>+++ b/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js
>@@ -223,7 +223,7 @@ function instantiation(result, source, entry)
> 
> // Loader.
> 
>-function requestFetch(key)
>+function requestFetch(key, initiator)
> {
>     // https://whatwg.github.io/loader/#request-fetch
> 
>@@ -239,23 +239,21 @@ function requestFetch(key)
>     if (entry.fetch)
>         return entry.fetch;
> 
>-    var loader = this;
>-
>     // Hook point.
>     // 2. Loader.fetch
>     //     https://whatwg.github.io/loader/#browser-fetch
>     //     Take the key and fetch the resource actually.
>     //     For example, JavaScriptCore shell can provide the hook fetching the resource
>     //     from the local file system.
>-    var fetchPromise = this.fetch(key).then(function (payload) {
>-        loader.setStateToMax(entry, @ModuleTranslate);
>+    var fetchPromise = this.fetch(key, initiator).then((payload) => {
>+        this.setStateToMax(entry, @ModuleTranslate);
>         return payload;
>     });
>     entry.fetch = fetchPromise;
>     return fetchPromise;
> }
> 
>-function requestTranslate(key)
>+function requestTranslate(key, initiator)
> {
>     // https://whatwg.github.io/loader/#request-translate
> 
>@@ -271,15 +269,14 @@ function requestTranslate(key)
>     if (entry.translate)
>         return entry.translate;
> 
>-    var loader = this;
>-    var translatePromise = this.requestFetch(key).then(function (payload) {
>+    var translatePromise = this.requestFetch(key, initiator).then((payload) => {
>         // Hook point.
>         // 3. Loader.translate
>         //     https://whatwg.github.io/loader/#browser-translate
>         //     Take the key and the fetched source code and translate it to the ES6 source code.
>         //     Typically it is used by the transpilers.
>-        return loader.translate(key, payload).then(function (source) {
>-            loader.setStateToMax(entry, @ModuleInstantiate);
>+        return this.translate(key, payload, initiator).then((source) => {
>+            this.setStateToMax(entry, @ModuleInstantiate);
>             return source;
>         });
>     });
>@@ -287,7 +284,7 @@ function requestTranslate(key)
>     return translatePromise;
> }
> 
>-function requestInstantiate(key)
>+function requestInstantiate(key, initiator)
> {
>     // https://whatwg.github.io/loader/#request-instantiate
> 
>@@ -303,8 +300,7 @@ function requestInstantiate(key)
>     if (entry.instantiate)
>         return entry.instantiate;
> 
>-    var loader = this;
>-    var instantiatePromise = this.requestTranslate(key).then(function (source) {
>+    var instantiatePromise = this.requestTranslate(key, initiator).then((source) => {
>         // Hook point.
>         // 4. Loader.instantiate
>         //     https://whatwg.github.io/loader/#browser-instantiate
>@@ -312,8 +308,8 @@ function requestInstantiate(key)
>         //     by parsing the module source code.
>         //     It has the chance to provide the optional module instance that is different from
>         //     the ordinary one.
>-        return loader.instantiate(key, source).then(function (optionalInstance) {
>-            loader.commitInstantiated(entry, optionalInstance, source);
>+        return this.instantiate(key, source, initiator).then((optionalInstance) => {
>+            this.commitInstantiated(entry, optionalInstance, source);
>             return entry;
>         });
>     });
>@@ -321,7 +317,7 @@ function requestInstantiate(key)
>     return instantiatePromise;
> }
> 
>-function requestResolveDependencies(key)
>+function requestResolveDependencies(key, initiator)
> {
>     // FIXME: In the spec, after requesting instantiation, we will resolve
>     // the dependencies without any status change. As a result, when there
>@@ -345,8 +341,7 @@ function requestResolveDependencies(key)
>     if (entry.resolveDependencies)
>         return entry.resolveDependencies;
> 
>-    var loader = this;
>-    var resolveDependenciesPromise = this.requestInstantiate(key).then(function (entry) {
>+    var resolveDependenciesPromise = this.requestInstantiate(key, initiator).then((entry) => {
>         var depLoads = [];
>         for (var i = 0, length = entry.dependencies.length; i < length; ++i) {
>             let pair = entry.dependencies[i];
>@@ -356,8 +351,8 @@ function requestResolveDependencies(key)
>             //     https://whatwg.github.io/loader/#browser-resolve
>             //     Take the name and resolve it to the unique identifier for the resource location.
>             //     For example, take the "jquery" and return the URL for the resource.
>-            var promise = loader.resolve(pair.key, key).then(function (depKey) {
>-                var depEntry = loader.ensureRegistered(depKey);
>+            var promise = this.resolve(pair.key, key, initiator).then((depKey) => {
>+                var depEntry = this.ensureRegistered(depKey);
> 
>                 // Recursive resolving. The dependencies of this entry is being resolved or already resolved.
>                 // Stop tracing the circular dependencies.
>@@ -369,13 +364,13 @@ function requestResolveDependencies(key)
>                 // rejected by the Promises runtime. Since only we need is the instantiated module, instead of waiting
>                 // the ResolveDependencies for this module, we just wait Instantiate for this.
>                 if (depEntry.resolveDependencies) {
>-                    return depEntry.instantiate.then(function (entry) {
>+                    return depEntry.instantiate.then((entry) => {
>                         pair.value = entry.module;
>                         return entry;
>                     });
>                 }
> 
>-                return loader.requestResolveDependencies(depKey).then(function (entry) {
>+                return this.requestResolveDependencies(depKey, initiator).then((entry) => {
>                     pair.value = entry.module;
>                     return entry;
>                 });
>@@ -383,8 +378,8 @@ function requestResolveDependencies(key)
>             @putByValDirect(depLoads, i, promise);
>         }
> 
>-        return @InternalPromise.internalAll(depLoads).then(function (modules) {
>-            loader.setStateToMax(entry, @ModuleLink);
>+        return @InternalPromise.internalAll(depLoads).then((modules) => {
>+            this.setStateToMax(entry, @ModuleLink);
>             return entry;
>         });
>     });
>@@ -393,16 +388,16 @@ function requestResolveDependencies(key)
>     return resolveDependenciesPromise;
> }
> 
>-function requestInstantiateAll(key)
>+function requestInstantiateAll(key, initiator)
> {
>     // https://whatwg.github.io/loader/#request-instantiate-all
> 
>     "use strict";
> 
>-    return this.requestResolveDependencies(key);
>+    return this.requestResolveDependencies(key, initiator);
> }
> 
>-function requestLink(key)
>+function requestLink(key, initiator)
> {
>     // https://whatwg.github.io/loader/#request-link
> 
>@@ -415,28 +410,26 @@ function requestLink(key)
>         return deferred.@promise;
>     }
> 
>-    var loader = this;
>-    return this.requestInstantiateAll(key).then(function (entry) {
>-        loader.link(entry);
>+    return this.requestInstantiateAll(key, initiator).then((entry) => {
>+        this.link(entry, initiator);
>         return entry;
>     });
> }
> 
>-function requestReady(key)
>+function requestReady(key, initiator)
> {
>     // https://whatwg.github.io/loader/#request-ready
> 
>     "use strict";
> 
>-    var loader = this;
>-    return this.requestLink(key).then(function (entry) {
>-        loader.moduleEvaluation(entry.module);
>+    return this.requestLink(key, initiator).then((entry) => {
>+        this.moduleEvaluation(entry.module, initiator);
>     });
> }
> 
> // Linking semantics.
> 
>-function link(entry)
>+function link(entry, initiator)
> {
>     // https://whatwg.github.io/loader/#link
> 
>@@ -456,15 +449,15 @@ function link(entry)
>     var dependencies = entry.dependencies;
>     for (var i = 0, length = dependencies.length; i < length; ++i) {
>         var pair = dependencies[i];
>-        this.link(pair.value.registryEntry);
>+        this.link(pair.value.registryEntry, initiator);
>     }
> 
>-    this.moduleDeclarationInstantiation(entry.module);
>+    this.moduleDeclarationInstantiation(entry.module, initiator);
> }
> 
> // Module semantics.
> 
>-function moduleEvaluation(moduleRecord)
>+function moduleEvaluation(moduleRecord, initiator)
> {
>     // http://www.ecma-international.org/ecma-262/6.0/#sec-moduleevaluation
> 
>@@ -481,9 +474,9 @@ function moduleEvaluation(moduleRecord)
>     for (var i = 0, length = dependencies.length; i < length; ++i) {
>         var pair = dependencies[i];
>         var requiredModuleRecord = pair.value;
>-        this.moduleEvaluation(requiredModuleRecord);
>+        this.moduleEvaluation(requiredModuleRecord, initiator);
>     }
>-    this.evaluate(entry.key, moduleRecord);
>+    this.evaluate(entry.key, moduleRecord, initiator);
> }
> 
> // APIs to control the module loader.
>@@ -514,9 +507,8 @@ function provide(key, stage, value)
>             throw new @TypeError("Requested module is already instantiated.");
>         this.fulfillFetch(entry, @undefined);
>         this.fulfillTranslate(entry, value);
>-        var loader = this;
>-        entry.translate.then(function (source) {
>-            loader.fulfillInstantiate(entry, value, source);
>+        entry.translate.then((source) => {
>+            this.fulfillInstantiate(entry, value, source);
>         });
>         return;
>     }
>@@ -524,39 +516,37 @@ function provide(key, stage, value)
>     throw new @TypeError("Requested module is already ready to be executed.");
> }
> 
>-function loadAndEvaluateModule(moduleName, referrer)
>+function loadAndEvaluateModule(moduleName, referrer, initiator)
> {
>     "use strict";
> 
>-    var loader = this;
>     // Loader.resolve hook point.
>     // resolve: moduleName => Promise(moduleKey)
>     // Take the name and resolve it to the unique identifier for the resource location.
>     // For example, take the "jquery" and return the URL for the resource.
>-    return this.resolve(moduleName, referrer).then(function (key) {
>-        return loader.requestReady(key);
>+    return this.resolve(moduleName, referrer, initiator).then((key) => {
>+        return this.requestReady(key, initiator);
>     });
> }
> 
>-function loadModule(moduleName, referrer)
>+function loadModule(moduleName, referrer, initiator)
> {
>     "use strict";
> 
>-    var loader = this;
>     // Loader.resolve hook point.
>     // resolve: moduleName => Promise(moduleKey)
>     // Take the name and resolve it to the unique identifier for the resource location.
>     // For example, take the "jquery" and return the URL for the resource.
>-    return this.resolve(moduleName, referrer).then(function (key) {
>-        return loader.requestInstantiateAll(key);
>-    }).then(function (entry) {
>+    return this.resolve(moduleName, referrer, initiator).then((key) => {
>+        return this.requestInstantiateAll(key, initiator);
>+    }).then((entry) => {
>         return entry.key;
>     });
> }
> 
>-function linkAndEvaluateModule(key)
>+function linkAndEvaluateModule(key, initiator)
> {
>     "use strict";
> 
>-    return this.requestReady(key);
>+    return this.requestReady(key, initiator);
> }
>diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp
>index 2b22e40048a17a15d044c09a903ba540b8311fdd..1626e75d41224c136230641836a9e9dd1a049cd2 100644
>--- a/Source/JavaScriptCore/jsc.cpp
>+++ b/Source/JavaScriptCore/jsc.cpp
>@@ -885,8 +885,8 @@ class GlobalObject : public JSGlobalObject {
>         putDirect(vm, identifier, JSFunction::create(vm, this, arguments, identifier.string(), function, NoIntrinsic, function));
>     }
> 
>-    static JSInternalPromise* moduleLoaderResolve(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue);
>-    static JSInternalPromise* moduleLoaderFetch(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue);
>+    static JSInternalPromise* moduleLoaderResolve(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue, JSValue);
>+    static JSInternalPromise* moduleLoaderFetch(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue);
> };
> 
> const ClassInfo GlobalObject::s_info = { "global", &JSGlobalObject::s_info, nullptr, CREATE_METHOD_TABLE(GlobalObject) };
>@@ -1017,7 +1017,7 @@ static String resolvePath(const DirectoryName& directoryName, const ModuleName&
>     return builder.toString();
> }
> 
>-JSInternalPromise* GlobalObject::moduleLoaderResolve(JSGlobalObject* globalObject, ExecState* exec, JSModuleLoader*, JSValue keyValue, JSValue referrerValue)
>+JSInternalPromise* GlobalObject::moduleLoaderResolve(JSGlobalObject* globalObject, ExecState* exec, JSModuleLoader*, JSValue keyValue, JSValue referrerValue, JSValue)
> {
>     JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
>     const Identifier key = keyValue.toPropertyKey(exec);
>@@ -1122,7 +1122,7 @@ static bool fetchModuleFromLocalFileSystem(const String& fileName, Vector<char>&
>     return result;
> }
> 
>-JSInternalPromise* GlobalObject::moduleLoaderFetch(JSGlobalObject* globalObject, ExecState* exec, JSModuleLoader*, JSValue key)
>+JSInternalPromise* GlobalObject::moduleLoaderFetch(JSGlobalObject* globalObject, ExecState* exec, JSModuleLoader*, JSValue key, JSValue)
> {
>     JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
>     String moduleKey = key.toWTFString(exec);
>diff --git a/Source/JavaScriptCore/runtime/Completion.cpp b/Source/JavaScriptCore/runtime/Completion.cpp
>index c5869566747a27d109e5a362ff7223ae7fa66c98..e97f12178553fcf985c18b5a0cd66cfde80fa4cd 100644
>--- a/Source/JavaScriptCore/runtime/Completion.cpp
>+++ b/Source/JavaScriptCore/runtime/Completion.cpp
>@@ -155,26 +155,26 @@ static JSInternalPromise* rejectPromise(ExecState* exec, JSGlobalObject* globalO
>     return deferred->promise();
> }
> 
>-static JSInternalPromise* loadAndEvaluateModule(const JSLockHolder&, ExecState* exec, JSGlobalObject* globalObject, JSValue moduleName, JSValue referrer)
>+static JSInternalPromise* loadAndEvaluateModule(const JSLockHolder&, ExecState* exec, JSGlobalObject* globalObject, JSValue moduleName, JSValue referrer, JSValue initiator)
> {
>-    return globalObject->moduleLoader()->loadAndEvaluateModule(exec, moduleName, referrer);
>+    return globalObject->moduleLoader()->loadAndEvaluateModule(exec, moduleName, referrer, initiator);
> }
> 
>-static JSInternalPromise* loadAndEvaluateModule(const JSLockHolder& lock, ExecState* exec, JSGlobalObject* globalObject, const Identifier& moduleName)
>+static JSInternalPromise* loadAndEvaluateModule(const JSLockHolder& lock, ExecState* exec, JSGlobalObject* globalObject, const Identifier& moduleName, JSValue initiator)
> {
>-    return loadAndEvaluateModule(lock, exec, globalObject, identifierToJSValue(exec->vm(), moduleName), jsUndefined());
>+    return loadAndEvaluateModule(lock, exec, globalObject, identifierToJSValue(exec->vm(), moduleName), jsUndefined(), initiator);
> }
> 
>-JSInternalPromise* loadAndEvaluateModule(ExecState* exec, const String& moduleName)
>+JSInternalPromise* loadAndEvaluateModule(ExecState* exec, const String& moduleName, JSValue initiator)
> {
>     JSLockHolder lock(exec);
>     RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
>     RELEASE_ASSERT(!exec->vm().isCollectorBusy());
> 
>-    return loadAndEvaluateModule(lock, exec, exec->vmEntryGlobalObject(), Identifier::fromString(exec, moduleName));
>+    return loadAndEvaluateModule(lock, exec, exec->vmEntryGlobalObject(), Identifier::fromString(exec, moduleName), initiator);
> }
> 
>-JSInternalPromise* loadAndEvaluateModule(ExecState* exec, const SourceCode& source)
>+JSInternalPromise* loadAndEvaluateModule(ExecState* exec, const SourceCode& source, JSValue initiator)
> {
>     JSLockHolder lock(exec);
>     RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
>@@ -189,29 +189,29 @@ JSInternalPromise* loadAndEvaluateModule(ExecState* exec, const SourceCode& sour
>     if (exec->hadException())
>         return rejectPromise(exec, globalObject);
> 
>-    return loadAndEvaluateModule(lock, exec, globalObject, key, jsUndefined());
>+    return loadAndEvaluateModule(lock, exec, globalObject, key, jsUndefined(), initiator);
> }
> 
>-static JSInternalPromise* loadModule(const JSLockHolder&, ExecState* exec, JSGlobalObject* globalObject, JSValue moduleName, JSValue referrer)
>+static JSInternalPromise* loadModule(const JSLockHolder&, ExecState* exec, JSGlobalObject* globalObject, JSValue moduleName, JSValue referrer, JSValue initiator)
> {
>-    return globalObject->moduleLoader()->loadModule(exec, moduleName, referrer);
>+    return globalObject->moduleLoader()->loadModule(exec, moduleName, referrer, initiator);
> }
> 
>-static JSInternalPromise* loadModule(const JSLockHolder& lock, ExecState* exec, JSGlobalObject* globalObject, const Identifier& moduleName)
>+static JSInternalPromise* loadModule(const JSLockHolder& lock, ExecState* exec, JSGlobalObject* globalObject, const Identifier& moduleName, JSValue initiator)
> {
>-    return loadModule(lock, exec, globalObject, identifierToJSValue(exec->vm(), moduleName), jsUndefined());
>+    return loadModule(lock, exec, globalObject, identifierToJSValue(exec->vm(), moduleName), jsUndefined(), initiator);
> }
> 
>-JSInternalPromise* loadModule(ExecState* exec, const String& moduleName)
>+JSInternalPromise* loadModule(ExecState* exec, const String& moduleName, JSValue initiator)
> {
>     JSLockHolder lock(exec);
>     RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
>     RELEASE_ASSERT(!exec->vm().isCollectorBusy());
> 
>-    return loadModule(lock, exec, exec->vmEntryGlobalObject(), Identifier::fromString(exec, moduleName));
>+    return loadModule(lock, exec, exec->vmEntryGlobalObject(), Identifier::fromString(exec, moduleName), initiator);
> }
> 
>-JSInternalPromise* loadModule(ExecState* exec, const SourceCode& source)
>+JSInternalPromise* loadModule(ExecState* exec, const SourceCode& source, JSValue initiator)
> {
>     JSLockHolder lock(exec);
>     RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
>@@ -226,17 +226,17 @@ JSInternalPromise* loadModule(ExecState* exec, const SourceCode& source)
>     if (exec->hadException())
>         return rejectPromise(exec, globalObject);
> 
>-    return loadModule(lock, exec, globalObject, key, jsUndefined());
>+    return loadModule(lock, exec, globalObject, key, jsUndefined(), initiator);
> }
> 
>-JSInternalPromise* linkAndEvaluateModule(ExecState* exec, const Identifier& moduleKey)
>+JSInternalPromise* linkAndEvaluateModule(ExecState* exec, const Identifier& moduleKey, JSValue initiator)
> {
>     JSLockHolder lock(exec);
>     RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
>     RELEASE_ASSERT(!exec->vm().isCollectorBusy());
> 
>     JSGlobalObject* globalObject = exec->vmEntryGlobalObject();
>-    return globalObject->moduleLoader()->linkAndEvaluateModule(exec, identifierToJSValue(exec->vm(), moduleKey));
>+    return globalObject->moduleLoader()->linkAndEvaluateModule(exec, identifierToJSValue(exec->vm(), moduleKey), initiator);
> }
> 
> } // namespace JSC
>diff --git a/Source/JavaScriptCore/runtime/Completion.h b/Source/JavaScriptCore/runtime/Completion.h
>index f131cc5ae571cb6be0b6d3cb015e8991a2240b57..b34108086f70164004c471a9ea3aee15a38d53cb 100644
>--- a/Source/JavaScriptCore/runtime/Completion.h
>+++ b/Source/JavaScriptCore/runtime/Completion.h
>@@ -58,15 +58,15 @@ inline JSValue profiledEvaluate(ExecState* exec, ProfilingReason reason, const S
> JS_EXPORT_PRIVATE JSValue evaluateWithScopeExtension(ExecState*, const SourceCode&, JSObject* scopeExtension, NakedPtr<Exception>& returnedException);
> 
> // Load the module source and evaluate it.
>-JS_EXPORT_PRIVATE JSInternalPromise* loadAndEvaluateModule(ExecState*, const String& moduleName);
>-JS_EXPORT_PRIVATE JSInternalPromise* loadAndEvaluateModule(ExecState*, const SourceCode&);
>+JS_EXPORT_PRIVATE JSInternalPromise* loadAndEvaluateModule(ExecState*, const String& moduleName, JSValue initiator = jsUndefined());
>+JS_EXPORT_PRIVATE JSInternalPromise* loadAndEvaluateModule(ExecState*, const SourceCode&, JSValue initiator = jsUndefined());
> 
> // Fetch the module source, and instantiate the module record.
>-JS_EXPORT_PRIVATE JSInternalPromise* loadModule(ExecState*, const String& moduleName);
>-JS_EXPORT_PRIVATE JSInternalPromise* loadModule(ExecState*, const SourceCode&);
>+JS_EXPORT_PRIVATE JSInternalPromise* loadModule(ExecState*, const String& moduleName, JSValue initiator = jsUndefined());
>+JS_EXPORT_PRIVATE JSInternalPromise* loadModule(ExecState*, const SourceCode&, JSValue initiator = jsUndefined());
> 
> // Link and evaluate the already linked module.
>-JS_EXPORT_PRIVATE JSInternalPromise* linkAndEvaluateModule(ExecState*, const Identifier& moduleKey);
>+JS_EXPORT_PRIVATE JSInternalPromise* linkAndEvaluateModule(ExecState*, const Identifier& moduleKey, JSValue initiator = jsUndefined());
> 
> } // namespace JSC
> 
>diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.h b/Source/JavaScriptCore/runtime/JSGlobalObject.h
>index f5671160f2cf8c0c36cd57836be2c44b0ef39d9e..7837ac6adfa8fadbc9bcd041a407f8da8add0083 100644
>--- a/Source/JavaScriptCore/runtime/JSGlobalObject.h
>+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.h
>@@ -166,19 +166,19 @@ struct GlobalObjectMethodTable {
>     typedef bool (*ShouldInterruptScriptBeforeTimeoutPtr)(const JSGlobalObject*);
>     ShouldInterruptScriptBeforeTimeoutPtr shouldInterruptScriptBeforeTimeout;
> 
>-    typedef JSInternalPromise* (*ModuleLoaderResolvePtr)(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue);
>+    typedef JSInternalPromise* (*ModuleLoaderResolvePtr)(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue, JSValue);
>     ModuleLoaderResolvePtr moduleLoaderResolve;
> 
>-    typedef JSInternalPromise* (*ModuleLoaderFetchPtr)(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue);
>+    typedef JSInternalPromise* (*ModuleLoaderFetchPtr)(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue);
>     ModuleLoaderFetchPtr moduleLoaderFetch;
> 
>-    typedef JSInternalPromise* (*ModuleLoaderTranslatePtr)(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue);
>+    typedef JSInternalPromise* (*ModuleLoaderTranslatePtr)(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue, JSValue);
>     ModuleLoaderTranslatePtr moduleLoaderTranslate;
> 
>-    typedef JSInternalPromise* (*ModuleLoaderInstantiatePtr)(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue);
>+    typedef JSInternalPromise* (*ModuleLoaderInstantiatePtr)(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue, JSValue);
>     ModuleLoaderInstantiatePtr moduleLoaderInstantiate;
> 
>-    typedef JSValue (*ModuleLoaderEvaluatePtr)(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue);
>+    typedef JSValue (*ModuleLoaderEvaluatePtr)(JSGlobalObject*, ExecState*, JSModuleLoader*, JSValue, JSValue, JSValue);
>     ModuleLoaderEvaluatePtr moduleLoaderEvaluate;
> 
>     typedef String (*DefaultLanguageFunctionPtr)();
>diff --git a/Source/JavaScriptCore/runtime/JSModuleLoader.cpp b/Source/JavaScriptCore/runtime/JSModuleLoader.cpp
>index d3b5a6a46f5bd417360b32d1565e9d651f442111..4eaebd75d5abcc58ed37833da217008defa9805f 100644
>--- a/Source/JavaScriptCore/runtime/JSModuleLoader.cpp
>+++ b/Source/JavaScriptCore/runtime/JSModuleLoader.cpp
>@@ -86,7 +86,7 @@ JSValue JSModuleLoader::provide(ExecState* exec, JSValue key, Status status, con
>     return call(exec, function, callType, callData, this, arguments);
> }
> 
>-JSInternalPromise* JSModuleLoader::loadAndEvaluateModule(ExecState* exec, JSValue moduleName, JSValue referrer)
>+JSInternalPromise* JSModuleLoader::loadAndEvaluateModule(ExecState* exec, JSValue moduleName, JSValue referrer, JSValue initiator)
> {
>     JSObject* function = jsCast<JSObject*>(get(exec, exec->propertyNames().builtinNames().loadAndEvaluateModulePublicName()));
>     CallData callData;
>@@ -96,11 +96,12 @@ JSInternalPromise* JSModuleLoader::loadAndEvaluateModule(ExecState* exec, JSValu
>     MarkedArgumentBuffer arguments;
>     arguments.append(moduleName);
>     arguments.append(referrer);
>+    arguments.append(initiator);
> 
>     return jsCast<JSInternalPromise*>(call(exec, function, callType, callData, this, arguments));
> }
> 
>-JSInternalPromise* JSModuleLoader::loadModule(ExecState* exec, JSValue moduleName, JSValue referrer)
>+JSInternalPromise* JSModuleLoader::loadModule(ExecState* exec, JSValue moduleName, JSValue referrer, JSValue initiator)
> {
>     JSObject* function = jsCast<JSObject*>(get(exec, exec->propertyNames().builtinNames().loadModulePublicName()));
>     CallData callData;
>@@ -110,11 +111,12 @@ JSInternalPromise* JSModuleLoader::loadModule(ExecState* exec, JSValue moduleNam
>     MarkedArgumentBuffer arguments;
>     arguments.append(moduleName);
>     arguments.append(referrer);
>+    arguments.append(initiator);
> 
>     return jsCast<JSInternalPromise*>(call(exec, function, callType, callData, this, arguments));
> }
> 
>-JSInternalPromise* JSModuleLoader::linkAndEvaluateModule(ExecState* exec, JSValue moduleKey)
>+JSInternalPromise* JSModuleLoader::linkAndEvaluateModule(ExecState* exec, JSValue moduleKey, JSValue initiator)
> {
>     JSObject* function = jsCast<JSObject*>(get(exec, exec->propertyNames().builtinNames().linkAndEvaluateModulePublicName()));
>     CallData callData;
>@@ -123,31 +125,32 @@ JSInternalPromise* JSModuleLoader::linkAndEvaluateModule(ExecState* exec, JSValu
> 
>     MarkedArgumentBuffer arguments;
>     arguments.append(moduleKey);
>+    arguments.append(initiator);
> 
>     return jsCast<JSInternalPromise*>(call(exec, function, callType, callData, this, arguments));
> }
> 
>-JSInternalPromise* JSModuleLoader::resolve(ExecState* exec, JSValue name, JSValue referrer)
>+JSInternalPromise* JSModuleLoader::resolve(ExecState* exec, JSValue name, JSValue referrer, JSValue initiator)
> {
>     if (Options::dumpModuleLoadingState())
>         dataLog("Loader [resolve] ", printableModuleKey(exec, name), "\n");
> 
>     JSGlobalObject* globalObject = exec->lexicalGlobalObject();
>     if (globalObject->globalObjectMethodTable()->moduleLoaderResolve)
>-        return globalObject->globalObjectMethodTable()->moduleLoaderResolve(globalObject, exec, this, name, referrer);
>+        return globalObject->globalObjectMethodTable()->moduleLoaderResolve(globalObject, exec, this, name, referrer, initiator);
>     JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
>     deferred->resolve(exec, name);
>     return deferred->promise();
> }
> 
>-JSInternalPromise* JSModuleLoader::fetch(ExecState* exec, JSValue key)
>+JSInternalPromise* JSModuleLoader::fetch(ExecState* exec, JSValue key, JSValue initiator)
> {
>     if (Options::dumpModuleLoadingState())
>         dataLog("Loader [fetch] ", printableModuleKey(exec, key), "\n");
> 
>     JSGlobalObject* globalObject = exec->lexicalGlobalObject();
>     if (globalObject->globalObjectMethodTable()->moduleLoaderFetch)
>-        return globalObject->globalObjectMethodTable()->moduleLoaderFetch(globalObject, exec, this, key);
>+        return globalObject->globalObjectMethodTable()->moduleLoaderFetch(globalObject, exec, this, key, initiator);
>     JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
>     String moduleKey = key.toString(exec)->value(exec);
>     if (exec->hadException()) {
>@@ -160,40 +163,40 @@ JSInternalPromise* JSModuleLoader::fetch(ExecState* exec, JSValue key)
>     return deferred->promise();
> }
> 
>-JSInternalPromise* JSModuleLoader::translate(ExecState* exec, JSValue key, JSValue payload)
>+JSInternalPromise* JSModuleLoader::translate(ExecState* exec, JSValue key, JSValue payload, JSValue initiator)
> {
>     if (Options::dumpModuleLoadingState())
>         dataLog("Loader [translate] ", printableModuleKey(exec, key), "\n");
> 
>     JSGlobalObject* globalObject = exec->lexicalGlobalObject();
>     if (globalObject->globalObjectMethodTable()->moduleLoaderTranslate)
>-        return globalObject->globalObjectMethodTable()->moduleLoaderTranslate(globalObject, exec, this, key, payload);
>+        return globalObject->globalObjectMethodTable()->moduleLoaderTranslate(globalObject, exec, this, key, payload, initiator);
>     JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
>     deferred->resolve(exec, payload);
>     return deferred->promise();
> }
> 
>-JSInternalPromise* JSModuleLoader::instantiate(ExecState* exec, JSValue key, JSValue source)
>+JSInternalPromise* JSModuleLoader::instantiate(ExecState* exec, JSValue key, JSValue source, JSValue initiator)
> {
>     if (Options::dumpModuleLoadingState())
>         dataLog("Loader [instantiate] ", printableModuleKey(exec, key), "\n");
> 
>     JSGlobalObject* globalObject = exec->lexicalGlobalObject();
>     if (globalObject->globalObjectMethodTable()->moduleLoaderInstantiate)
>-        return globalObject->globalObjectMethodTable()->moduleLoaderInstantiate(globalObject, exec, this, key, source);
>+        return globalObject->globalObjectMethodTable()->moduleLoaderInstantiate(globalObject, exec, this, key, source, initiator);
>     JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
>     deferred->resolve(exec, jsUndefined());
>     return deferred->promise();
> }
> 
>-JSValue JSModuleLoader::evaluate(ExecState* exec, JSValue key, JSValue moduleRecordValue)
>+JSValue JSModuleLoader::evaluate(ExecState* exec, JSValue key, JSValue moduleRecordValue, JSValue initiator)
> {
>     if (Options::dumpModuleLoadingState())
>         dataLog("Loader [evaluate] ", printableModuleKey(exec, key), "\n");
> 
>     JSGlobalObject* globalObject = exec->lexicalGlobalObject();
>     if (globalObject->globalObjectMethodTable()->moduleLoaderEvaluate)
>-        return globalObject->globalObjectMethodTable()->moduleLoaderEvaluate(globalObject, exec, this, key, moduleRecordValue);
>+        return globalObject->globalObjectMethodTable()->moduleLoaderEvaluate(globalObject, exec, this, key, moduleRecordValue, initiator);
> 
>     JSModuleRecord* moduleRecord = jsDynamicCast<JSModuleRecord*>(moduleRecordValue);
>     if (!moduleRecord)
>diff --git a/Source/JavaScriptCore/runtime/JSModuleLoader.h b/Source/JavaScriptCore/runtime/JSModuleLoader.h
>index 4cd5904065ef5ff56da9b850efbb9bf074e40403..b87b7aeb5a93d198094c717e7c58c20fa2ce66cb 100644
>--- a/Source/JavaScriptCore/runtime/JSModuleLoader.h
>+++ b/Source/JavaScriptCore/runtime/JSModuleLoader.h
>@@ -63,18 +63,18 @@ class JSModuleLoader : public JSNonFinalObject {
> 
>     // APIs to control the module loader.
>     JSValue provide(ExecState*, JSValue key, Status, const String&);
>-    JSInternalPromise* loadAndEvaluateModule(ExecState*, JSValue moduleName, JSValue referrer);
>-    JSInternalPromise* loadModule(ExecState*, JSValue moduleName, JSValue referrer);
>-    JSInternalPromise* linkAndEvaluateModule(ExecState*, JSValue moduleKey);
>+    JSInternalPromise* loadAndEvaluateModule(ExecState*, JSValue moduleName, JSValue referrer, JSValue initiator);
>+    JSInternalPromise* loadModule(ExecState*, JSValue moduleName, JSValue referrer, JSValue initiator);
>+    JSInternalPromise* linkAndEvaluateModule(ExecState*, JSValue moduleKey, JSValue initiator);
> 
>     // Platform dependent hooked APIs.
>-    JSInternalPromise* resolve(ExecState*, JSValue name, JSValue referrer);
>-    JSInternalPromise* fetch(ExecState*, JSValue key);
>-    JSInternalPromise* translate(ExecState*, JSValue key, JSValue payload);
>-    JSInternalPromise* instantiate(ExecState*, JSValue key, JSValue source);
>+    JSInternalPromise* resolve(ExecState*, JSValue name, JSValue referrer, JSValue initiator);
>+    JSInternalPromise* fetch(ExecState*, JSValue key, JSValue initiator);
>+    JSInternalPromise* translate(ExecState*, JSValue key, JSValue payload, JSValue initiator);
>+    JSInternalPromise* instantiate(ExecState*, JSValue key, JSValue source, JSValue initiator);
> 
>     // Additional platform dependent hooked APIs.
>-    JSValue evaluate(ExecState*, JSValue key, JSValue moduleRecord);
>+    JSValue evaluate(ExecState*, JSValue key, JSValue moduleRecord, JSValue initiator);
> 
> protected:
>     void finishCreation(VM&, JSGlobalObject*);
>diff --git a/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp b/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp
>index 2a5600b8aec07e0e0fc4075cf9e0a22ea2307392..2d9046f745fd1b0b54bf14faca411f6ff612fb31 100644
>--- a/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp
>+++ b/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp
>@@ -181,7 +181,7 @@ EncodedJSValue JSC_HOST_CALL moduleLoaderPrototypeResolve(ExecState* exec)
>     JSModuleLoader* loader = jsDynamicCast<JSModuleLoader*>(exec->thisValue());
>     if (!loader)
>         return JSValue::encode(jsUndefined());
>-    return JSValue::encode(loader->resolve(exec, exec->argument(0), exec->argument(1)));
>+    return JSValue::encode(loader->resolve(exec, exec->argument(0), exec->argument(1), exec->argument(2)));
> }
> 
> EncodedJSValue JSC_HOST_CALL moduleLoaderPrototypeFetch(ExecState* exec)
>@@ -194,7 +194,7 @@ EncodedJSValue JSC_HOST_CALL moduleLoaderPrototypeFetch(ExecState* exec)
>     JSModuleLoader* loader = jsDynamicCast<JSModuleLoader*>(exec->thisValue());
>     if (!loader)
>         return JSValue::encode(jsUndefined());
>-    return JSValue::encode(loader->fetch(exec, exec->argument(0)));
>+    return JSValue::encode(loader->fetch(exec, exec->argument(0), exec->argument(1)));
> }
> 
> EncodedJSValue JSC_HOST_CALL moduleLoaderPrototypeTranslate(ExecState* exec)
>@@ -206,7 +206,7 @@ EncodedJSValue JSC_HOST_CALL moduleLoaderPrototypeTranslate(ExecState* exec)
>     JSModuleLoader* loader = jsDynamicCast<JSModuleLoader*>(exec->thisValue());
>     if (!loader)
>         return JSValue::encode(jsUndefined());
>-    return JSValue::encode(loader->translate(exec, exec->argument(0), exec->argument(1)));
>+    return JSValue::encode(loader->translate(exec, exec->argument(0), exec->argument(1), exec->argument(2)));
> }
> 
> EncodedJSValue JSC_HOST_CALL moduleLoaderPrototypeInstantiate(ExecState* exec)
>@@ -220,7 +220,7 @@ EncodedJSValue JSC_HOST_CALL moduleLoaderPrototypeInstantiate(ExecState* exec)
>     JSModuleLoader* loader = jsDynamicCast<JSModuleLoader*>(exec->thisValue());
>     if (!loader)
>         return JSValue::encode(jsUndefined());
>-    return JSValue::encode(loader->instantiate(exec, exec->argument(0), exec->argument(1)));
>+    return JSValue::encode(loader->instantiate(exec, exec->argument(0), exec->argument(1), exec->argument(2)));
> }
> 
> // ------------------- Additional Hook Functions ---------------------------
>@@ -233,7 +233,7 @@ EncodedJSValue JSC_HOST_CALL moduleLoaderPrototypeEvaluate(ExecState* exec)
>     JSModuleLoader* loader = jsDynamicCast<JSModuleLoader*>(exec->thisValue());
>     if (!loader)
>         return JSValue::encode(jsUndefined());
>-    return JSValue::encode(loader->evaluate(exec, exec->argument(0), exec->argument(1)));
>+    return JSValue::encode(loader->evaluate(exec, exec->argument(0), exec->argument(1), exec->argument(2)));
> }
> 
> } // namespace JSC
>diff --git a/Source/JavaScriptCore/runtime/Symbol.h b/Source/JavaScriptCore/runtime/Symbol.h
>index 933a2e5184ab99ff26fcc12f6230b8d03ee19d80..dd6b305ef1219d3a10342377a8098ff0b976ae50 100644
>--- a/Source/JavaScriptCore/runtime/Symbol.h
>+++ b/Source/JavaScriptCore/runtime/Symbol.h
>@@ -64,7 +64,7 @@ class Symbol final : public JSCell {
> 
>     Symbol(VM&);
>     Symbol(VM&, const String&);
>-    Symbol(VM&, SymbolImpl& uid);
>+    JS_EXPORT_PRIVATE Symbol(VM&, SymbolImpl& uid);
> 
>     void finishCreation(VM&);
> 
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index 49a68e66b2658f9a1753b38e9659af36a95dbf41..f8c68fcd929417c9dc3bc6d4e8687681a90fb6c2 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1209,6 +1209,8 @@ set(WebCore_SOURCES
>     bindings/js/JSMessageChannelCustom.cpp
>     bindings/js/JSMessageEventCustom.cpp
>     bindings/js/JSMessagePortCustom.cpp
>+    bindings/js/JSModuleFetcher.cpp
>+    bindings/js/JSModuleGraph.cpp
>     bindings/js/JSModuleLoader.cpp
>     bindings/js/JSMutationCallback.cpp
>     bindings/js/JSMutationObserverCustom.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index c11fdd5dfffb64cd589443012cb328bfd1f492da..6f26d45a2fafe2be701e49ebd04ecf55bb6663b6 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -24128,6 +24128,7 @@
> 				937FF3D51A1012D6008EBA31 /* DictionaryLookup.h in Headers */,
> 				2D5646B01B8F8493003C4994 /* DictionaryPopupInfo.h in Headers */,
> 				FDAF19991513D131008DB0C3 /* DirectConvolver.h in Headers */,
>+				E339A5241BA6BD4600A3A7AE /* JSModuleGraph.h in Headers */,
> 				7EDAAFC919A2CCDC0034DFD1 /* DiskCacheMonitorCocoa.h in Headers */,
> 				0FE5FBD31C3DD51E0007A2CA /* DisplayList.h in Headers */,
> 				0FE5FBD51C3DD51E0007A2CA /* DisplayListItems.h in Headers */,
>@@ -25465,6 +25466,7 @@
> 				CE1252411A16B1B600864480 /* MediaPlayerSPI.h in Headers */,
> 				52E2CAFC19FF0207001EEB4F /* MediaProducer.h in Headers */,
> 				4E19592A0A39DACC00220FE5 /* MediaQuery.h in Headers */,
>+				E38838991BAD145F00D62EE3 /* JSModuleLoader.h in Headers */,
> 				4E19592C0A39DACC00220FE5 /* MediaQueryEvaluator.h in Headers */,
> 				4E19592E0A39DACC00220FE5 /* MediaQueryExp.h in Headers */,
> 				D3A94A39122DABAC00A37BBC /* MediaQueryList.h in Headers */,
>@@ -26557,6 +26559,7 @@
> 				080E49281255F3BD00EFCA27 /* SVGTextLayoutEngineSpacing.h in Headers */,
> 				08F0BFC61255C53C00075185 /* SVGTextMetrics.h in Headers */,
> 				7117445914BC34EC00EE5FC8 /* SVGTextMetricsBuilder.h in Headers */,
>+				E38838971BAD145F00D62EE3 /* JSModuleFetcher.h in Headers */,
> 				B2227ACE0D00BF220071B782 /* SVGTextPathElement.h in Headers */,
> 				B2227AD10D00BF220071B782 /* SVGTextPositioningElement.h in Headers */,
> 				0854B0251255E4E600B9CDD0 /* SVGTextQuery.h in Headers */,
>@@ -27385,6 +27388,7 @@
> 				CD0EEE0E14743F39003EAFA2 /* AudioDestinationIOS.cpp in Sources */,
> 				FD3160BC12B0272A00C1A359 /* AudioDestinationMac.cpp in Sources */,
> 				FD31600712B0267600C1A359 /* AudioDestinationNode.cpp in Sources */,
>+				E339A5231BA6BD4600A3A7AE /* JSModuleGraph.cpp in Sources */,
> 				FD31608112B026F700C1A359 /* AudioDSPKernelProcessor.cpp in Sources */,
> 				CD5596911475B678001D0BD0 /* AudioFileReaderIOS.cpp in Sources */,
> 				FD3160BE12B0272A00C1A359 /* AudioFileReaderMac.cpp in Sources */,
>@@ -28145,6 +28149,7 @@
> 				A871DB2E0A150BD600B12A68 /* HTMLTableCellElement.cpp in Sources */,
> 				A871DB290A150BD600B12A68 /* HTMLTableColElement.cpp in Sources */,
> 				A871DB280A150BD600B12A68 /* HTMLTableElement.cpp in Sources */,
>+				E38838961BAD145F00D62EE3 /* JSModuleFetcher.cpp in Sources */,
> 				A871DB2D0A150BD600B12A68 /* HTMLTablePartElement.cpp in Sources */,
> 				A871DB300A150BD600B12A68 /* HTMLTableRowElement.cpp in Sources */,
> 				93442CA00D2B336000338FF9 /* HTMLTableRowsCollection.cpp in Sources */,
>diff --git a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>index 4c3acd00a6e9a8e98013864c31ac98aa750712f7..f0e12ca9077447dfbeae5dbb6f65f84a473a9915 100644
>--- a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>+++ b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>@@ -108,6 +108,8 @@
> #include "JSMessageChannelCustom.cpp"
> #include "JSMessageEventCustom.cpp"
> #include "JSMessagePortCustom.cpp"
>+#include "JSModuleFetcher.cpp"
>+#include "JSModuleGraph.cpp"
> #include "JSModuleLoader.cpp"
> #include "JSMutationCallback.cpp"
> #include "JSMutationObserverCustom.cpp"
>diff --git a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp b/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>index 69074f7235cac2fbe146623de1cdaf0679629231..c34c10c9636a529b2aaafe6d21472d7f09f112e5 100644
>--- a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>+++ b/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>@@ -323,29 +323,29 @@ void JSDOMWindowBase::fireFrameClearedWatchpointsForWindow(DOMWindow* window)
> }
> 
> 
>-JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderResolve(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleName, JSC::JSValue importerModuleKey)
>+JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderResolve(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleName, JSC::JSValue importerModuleKey, JSC::JSValue initiator)
> {
>     JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
>     if (RefPtr<Document> document = thisObject->wrapped().document())
>-        return document->moduleLoader()->resolve(globalObject, exec, moduleLoader, moduleName, importerModuleKey);
>+        return document->moduleLoader()->resolve(globalObject, exec, moduleLoader, moduleName, importerModuleKey, initiator);
>     JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>     return deferred->reject(exec, jsUndefined());
> }
> 
>-JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderFetch(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey)
>+JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderFetch(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue initiator)
> {
>     JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
>     if (RefPtr<Document> document = thisObject->wrapped().document())
>-        return document->moduleLoader()->fetch(globalObject, exec, moduleLoader, moduleKey);
>+        return document->moduleLoader()->fetch(globalObject, exec, moduleLoader, moduleKey, initiator);
>     JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>     return deferred->reject(exec, jsUndefined());
> }
> 
>-JSC::JSValue JSDOMWindowBase::moduleLoaderEvaluate(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue moduleRecord)
>+JSC::JSValue JSDOMWindowBase::moduleLoaderEvaluate(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue moduleRecord, JSC::JSValue initiator)
> {
>     JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
>     if (RefPtr<Document> document = thisObject->wrapped().document())
>-        return document->moduleLoader()->evaluate(globalObject, exec, moduleLoader, moduleKey, moduleRecord);
>+        return document->moduleLoader()->evaluate(globalObject, exec, moduleLoader, moduleKey, moduleRecord, initiator);
>     return JSC::jsUndefined();
> }
> 
>diff --git a/Source/WebCore/bindings/js/JSDOMWindowBase.h b/Source/WebCore/bindings/js/JSDOMWindowBase.h
>index 80d9608fa60307e1600fc21c9ad86f2d7d932a4b..f5f3be0523e5969ad2e37160fbe40bcc672dc398 100644
>--- a/Source/WebCore/bindings/js/JSDOMWindowBase.h
>+++ b/Source/WebCore/bindings/js/JSDOMWindowBase.h
>@@ -78,9 +78,9 @@ namespace WebCore {
>         JSC::WatchpointSet m_windowCloseWatchpoints;
> 
>     private:
>-        static JSC::JSInternalPromise* moduleLoaderResolve(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue);
>-        static JSC::JSInternalPromise* moduleLoaderFetch(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue);
>-        static JSC::JSValue moduleLoaderEvaluate(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue);
>+        static JSC::JSInternalPromise* moduleLoaderResolve(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue, JSC::JSValue);
>+        static JSC::JSInternalPromise* moduleLoaderFetch(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue);
>+        static JSC::JSValue moduleLoaderEvaluate(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue, JSC::JSValue);
> 
>         RefPtr<DOMWindow> m_wrapped;
>         JSDOMWindowShell* m_shell;
>diff --git a/Source/WebCore/bindings/js/JSMainThreadExecState.h b/Source/WebCore/bindings/js/JSMainThreadExecState.h
>index 597c77fe80ea398e0ed6a25d6beaf6b5b471e5d0..9b9df9c4f0751150fadf87312f479b8a22ae672a 100644
>--- a/Source/WebCore/bindings/js/JSMainThreadExecState.h
>+++ b/Source/WebCore/bindings/js/JSMainThreadExecState.h
>@@ -92,6 +92,24 @@ class JSMainThreadExecState {
>         task.run(exec);
>     }
> 
>+    static JSC::JSInternalPromise* loadModule(JSC::ExecState* exec, const String& moduleName, JSC::JSValue initiator)
>+    {
>+        JSMainThreadExecState currentState(exec);
>+        return JSC::loadModule(exec, moduleName, initiator);
>+    }
>+
>+    static JSC::JSInternalPromise* loadModule(JSC::ExecState* exec, const JSC::SourceCode& sourceCode, JSC::JSValue initiator)
>+    {
>+        JSMainThreadExecState currentState(exec);
>+        return JSC::loadModule(exec, sourceCode, initiator);
>+    }
>+
>+    static JSC::JSInternalPromise* linkAndEvaluateModule(JSC::ExecState* exec, const JSC::Identifier& moduleKey, JSC::JSValue initiator)
>+    {
>+        JSMainThreadExecState currentState(exec);
>+        return JSC::linkAndEvaluateModule(exec, moduleKey, initiator);
>+    }
>+
>     static InspectorInstrumentationCookie instrumentFunctionCall(ScriptExecutionContext*, JSC::CallType, const JSC::CallData&);
>     static InspectorInstrumentationCookie instrumentFunctionConstruct(ScriptExecutionContext*, JSC::ConstructType, const JSC::ConstructData&);
> 
>diff --git a/Source/WebCore/bindings/js/JSModuleFetcher.cpp b/Source/WebCore/bindings/js/JSModuleFetcher.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..4c527ae2ca1346526ea0d1c804d05c482fbd92f8
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/JSModuleFetcher.cpp
>@@ -0,0 +1,147 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "JSModuleFetcher.h"
>+
>+#include "CachedResourceLoader.h"
>+#include "CachedScript.h"
>+#include "DOMWrapperWorld.h"
>+#include "Frame.h"
>+#include "JSDOMBinding.h"
>+#include "JSModuleLoader.h"
>+#include "ResourceLoaderOptions.h"
>+#include "ScriptController.h"
>+#include "ScriptSourceCode.h"
>+
>+namespace WebCore {
>+
>+JSModuleFetcher::JSModuleFetcher(JSDOMGlobalObject* globalObject, const URL& sourceURL, JSC::JSInternalPromiseDeferred* deferred, Document& document)
>+    : m_document(document)
>+    , m_sourceURL(sourceURL)
>+    , m_globalObject(globalObject->vm(), globalObject)
>+    , m_deferred(globalObject->vm(), deferred)
>+{
>+}
>+
>+JSModuleFetcher::~JSModuleFetcher()
>+{
>+    if (m_cachedScript) {
>+        m_cachedScript->removeClient(this);
>+        m_cachedScript = nullptr;
>+    }
>+}
>+
>+Ref<JSModuleFetcher> JSModuleFetcher::create(JSDOMGlobalObject* globalObject, const URL& sourceURL, JSC::JSInternalPromiseDeferred* deferred, Document& document)
>+{
>+    return adoptRef(*new JSModuleFetcher(globalObject, sourceURL, deferred, document));
>+}
>+
>+bool JSModuleFetcher::run(ScriptElement* element)
>+{
>+    if (element)
>+        m_cachedScript = element->requestModuleScript(m_sourceURL);
>+    else {
>+        ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
>+        options.contentSecurityPolicyImposition = ContentSecurityPolicyImposition::DoPolicyCheck;
>+
>+        CachedResourceRequest request(ResourceRequest(m_sourceURL), options);
>+
>+        // Module fetcher always interpret scripts as UTF-8.
>+        // https://github.com/whatwg/loader/issues/83
>+        request.setCharset(ASCIILiteral("utf-8"));
>+
>+        // FIXME: Should handle "crossorigin" options.
>+        // Once the spec describes the details, we will follow it.
>+        request.setInitiator(AtomicString(m_sourceURL.string()));
>+
>+        m_cachedScript = m_document.cachedResourceLoader().requestScript(request);
>+    }
>+
>+    if (!m_cachedScript)
>+        return false;
>+
>+    // Note: If the content is already cached, this immeidately calls notifyFinished.
>+    m_cachedScript->addClient(this);
>+    return true;
>+}
>+
>+void JSModuleFetcher::notifyFinished(CachedResource* resource)
>+{
>+    ASSERT_UNUSED(resource, resource == m_cachedScript);
>+    if (!m_cachedScript)
>+        return;
>+
>+    ASSERT(m_cachedScript);
>+    CachedResourceHandle<CachedScript> cachedScript = m_cachedScript;
>+    m_cachedScript = nullptr;
>+
>+#if ENABLE(NOSNIFF)
>+    if (cachedScript && !cachedScript->mimeTypeAllowedByNosniff()) {
>+        m_document.addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Refused to execute script from '" + cachedScript->url().stringCenterEllipsizedToLength() + "' because its MIME type ('" + cachedScript->mimeType() + "') is not executable, and strict MIME type checking is enabled.");
>+        cachedScript->removeClient(this);
>+        return;
>+    }
>+#endif
>+
>+    Ref<Document> protector(m_document);
>+
>+    if (Frame* frame = m_document.frame()) {
>+        JSC::JSLockHolder lock(m_globalObject->vm());
>+        JSC::ExecState* exec = m_globalObject->globalExec();
>+        if (cachedScript->errorOccurred()) {
>+            // The module loader pipeline is constructed as a chain of promises.
>+            // Rejecting a promise if some error occurs is important because the execution flow of
>+            // the promise chain is driven by "rejected" or "fulfilled" events.
>+            // If the promise is not rejected while error occurs, reject handler won't be executed
>+            // and all the subsequent promise chain will wait the result forever.
>+            //
>+            // As a result, even if the error is already reported to the inspector elsewhere,
>+            // it should be propagated in the pipeline. For example, the error of loading
>+            // CachedResource is already reported to the inspector by the loader. But we still need
>+            // to reject the promise by some error.
>+            //
>+            // Not to report the error twice, when we propagate the error that is already reported
>+            // to the inspector, we throw moduleLoaderAlreadyReportedErrorSymbol symbol instead.
>+            // By comparing the thrown error with this symbol, we can distinguish errors raised
>+            // when linking or executing a module graph from errors reported already.
>+            // In the reject handler of the promise, we only report a error that is not this symbol.
>+            m_deferred->reject(exec, JSC::Symbol::create(exec->vm(), *(frame->script().moduleLoaderAlreadyReportedErrorSymbol().uid())));
>+        } else if (!cachedScript->wasCanceled()) {
>+            ScriptSourceCode sourceCode(cachedScript.get());
>+            m_deferred->resolve(exec, JSC::jsString(exec, sourceCode.source().toString()));
>+        }
>+    }
>+
>+    // A CachedResourceHandle alone does not prevent the underlying CachedResource
>+    // from purging its data buffer. Until we finish using the backing buffer of the
>+    // cached script, we don't remove the client.
>+    cachedScript->removeClient(this);
>+
>+    m_document.moduleLoader()->notifyFinished(this);
>+    // After JSModuleLoader::notifyFinished call, |this| may be destroyed.
>+}
>+
>+}
>diff --git a/Source/WebCore/bindings/js/JSModuleFetcher.h b/Source/WebCore/bindings/js/JSModuleFetcher.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..cc9507584a083da33cfa3787c78a556b09be9a95
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/JSModuleFetcher.h
>@@ -0,0 +1,71 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef JSModuleFetcher_h
>+#define JSModuleFetcher_h
>+
>+#include "CachedResourceClient.h"
>+#include "CachedResourceHandle.h"
>+#include "ScriptElement.h"
>+#include "URL.h"
>+#include <heap/StrongInlines.h>
>+#include <runtime/JSInternalPromiseDeferred.h>
>+#include <wtf/Noncopyable.h>
>+#include <wtf/Ref.h>
>+
>+namespace WebCore {
>+
>+class CachedScript;
>+class Document;
>+class JSDOMGlobalObject;
>+class ScriptElement;
>+
>+class JSModuleFetcher : public RefCounted<JSModuleFetcher>, private CachedResourceClient {
>+    WTF_MAKE_NONCOPYABLE(JSModuleFetcher); WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    static Ref<JSModuleFetcher> create(JSDOMGlobalObject*, const URL& sourceURL, JSC::JSInternalPromiseDeferred*, Document&);
>+
>+    ~JSModuleFetcher();
>+
>+    bool run(ScriptElement*);
>+
>+    CachedScript* cachedScript() { return m_cachedScript.get(); }
>+
>+private:
>+    JSModuleFetcher(JSDOMGlobalObject*, const URL& sourceURL, JSC::JSInternalPromiseDeferred*, Document&);
>+
>+    // For CachedResourceClient.
>+    void notifyFinished(CachedResource*) override;
>+
>+    Document& m_document;
>+    URL m_sourceURL;
>+    JSC::Strong<JSDOMGlobalObject> m_globalObject;
>+    JSC::Strong<JSC::JSInternalPromiseDeferred> m_deferred;
>+    CachedResourceHandle<CachedScript> m_cachedScript { };
>+};
>+
>+} // namespace WebCore
>+
>+#endif // JSModuleFetcher_h
>diff --git a/Source/WebCore/bindings/js/JSModuleGraph.cpp b/Source/WebCore/bindings/js/JSModuleGraph.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..a8754cdb74ae4f02446cac22b92a4bfbe3629989
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/JSModuleGraph.cpp
>@@ -0,0 +1,85 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "JSModuleGraph.h"
>+
>+#include "DOMWrapperWorld.h"
>+#include "Document.h"
>+#include "Element.h"
>+#include "ExceptionCode.h"
>+#include "Frame.h"
>+#include "JSModuleLoader.h"
>+#include "ScriptController.h"
>+#include "ScriptElement.h"
>+#include "ScriptRunner.h"
>+#include "ScriptSourceCode.h"
>+
>+namespace WebCore {
>+
>+JSModuleGraph::JSModuleGraph(Element& element)
>+    : m_element(element)
>+    , m_weakPtrFactory(&element)
>+{
>+}
>+
>+void JSModuleGraph::notifyLoaded(UniquedStringImpl* moduleKey)
>+{
>+    m_moduleKey = moduleKey;
>+    m_element.document().scriptRunner()->notifyJSModuleGraphReady(toScriptElementIfPossible(&m_element));
>+}
>+
>+void JSModuleGraph::notifyErrored()
>+{
>+    m_errored = true;
>+    m_element.document().scriptRunner()->notifyJSModuleGraphReady(toScriptElementIfPossible(&m_element));
>+}
>+
>+void JSModuleGraph::evaluate()
>+{
>+    if (m_errored)
>+        toScriptElementIfPossible(&m_element)->dispatchErrorEvent();
>+    else if (Frame* frame = m_element.document().frame())
>+        frame->script().linkAndEvaluateModule(*this, m_element);
>+}
>+
>+void JSModuleGraph::notifyEvaluated()
>+{
>+    toScriptElementIfPossible(&m_element)->dispatchLoadEvent();
>+}
>+
>+void JSModuleGraph::load(const String& moduleName)
>+{
>+    ASSERT(m_element.document().frame());
>+    m_element.document().frame()->script().loadModule(*this, moduleName, m_element);
>+}
>+
>+void JSModuleGraph::load(const ScriptSourceCode& sourceCode)
>+{
>+    ASSERT(m_element.document().frame());
>+    m_element.document().frame()->script().loadModule(*this, sourceCode, m_element);
>+}
>+
>+}
>diff --git a/Source/WebCore/bindings/js/JSModuleGraph.h b/Source/WebCore/bindings/js/JSModuleGraph.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..5badf0ef59f3f24fbf75d4c2250438e1664e4d43
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/JSModuleGraph.h
>@@ -0,0 +1,75 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef JSModuleGraph_h
>+#define JSModuleGraph_h
>+
>+#include "JSModuleFetcher.h"
>+#include <runtime/JSInternalPromise.h>
>+#include <wtf/Noncopyable.h>
>+#include <wtf/WeakPtr.h>
>+
>+namespace WebCore {
>+
>+class Element;
>+class ScriptSourceCode;
>+
>+// Keep lifetime of a JSModuleGraph the same to a ScriptElement.
>+class JSModuleGraph {
>+    WTF_MAKE_NONCOPYABLE(JSModuleGraph); WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    explicit JSModuleGraph(Element&);
>+
>+    Element& element() { return m_element; }
>+    UniquedStringImpl* moduleKey() { return m_moduleKey.get(); }
>+
>+    void load(const String& moduleName);
>+    void load(const ScriptSourceCode&);
>+    void evaluate();
>+
>+    WeakPtr<Element> weakElementPtr()
>+    {
>+        return m_weakPtrFactory.createWeakPtr();
>+    }
>+
>+    void notifyLoaded(UniquedStringImpl* moduleKey);
>+    void notifyErrored();
>+
>+    void notifyEvaluated();
>+
>+    bool errorOccurred() const { return m_errored; }
>+    bool isLoaded() const { return m_moduleKey; }
>+
>+private:
>+
>+    Element& m_element;
>+    RefPtr<UniquedStringImpl> m_moduleKey;
>+    WeakPtrFactory<Element> m_weakPtrFactory;
>+    bool m_errored { false };
>+};
>+
>+} // namespace WebCore
>+
>+#endif // JSModuleLoader_h
>diff --git a/Source/WebCore/bindings/js/JSModuleLoader.cpp b/Source/WebCore/bindings/js/JSModuleLoader.cpp
>index ba1e3ecc1dd0c6eeaebe270eb4cbf25ee478a519..bd0f114cf24b986d3967c5d755685039a3139eab 100644
>--- a/Source/WebCore/bindings/js/JSModuleLoader.cpp
>+++ b/Source/WebCore/bindings/js/JSModuleLoader.cpp
>@@ -30,6 +30,9 @@
> #include "ExceptionCode.h"
> #include "Frame.h"
> #include "JSDOMBinding.h"
>+#include "JSElement.h"
>+#include "JSModuleFetcher.h"
>+#include "ScriptController.h"
> #include <runtime/JSInternalPromiseDeferred.h>
> #include <runtime/JSModuleRecord.h>
> #include <runtime/JSString.h>
>@@ -42,7 +45,7 @@ JSModuleLoader::JSModuleLoader(Document& document)
> {
> }
> 
>-JSC::JSInternalPromise* JSModuleLoader::resolve(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleNameValue, JSC::JSValue importerModuleKey)
>+JSC::JSInternalPromise* JSModuleLoader::resolve(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleNameValue, JSC::JSValue importerModuleKey, JSC::JSValue)
> {
>     JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
> 
>@@ -82,7 +85,7 @@ JSC::JSInternalPromise* JSModuleLoader::resolve(JSC::JSGlobalObject* globalObjec
>     return deferred->resolve(exec, jsString(exec, completedUrl.string()));
> }
> 
>-JSC::JSInternalPromise* JSModuleLoader::fetch(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue)
>+JSC::JSInternalPromise* JSModuleLoader::fetch(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue, JSC::JSValue initiator)
> {
>     JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
> 
>@@ -96,12 +99,21 @@ JSC::JSInternalPromise* JSModuleLoader::fetch(JSC::JSGlobalObject* globalObject,
>     if (!completedUrl.isValid())
>         return deferred->reject(exec, JSC::createTypeError(exec, "Module key is an invalid URL."));
> 
>-    // FIXME: Implement the module fetcher.
>+    ScriptElement* scriptElement = nullptr;
>+    if (auto* element = JSC::jsDynamicCast<JSElement*>(initiator))
>+        scriptElement = toScriptElementIfPossible(&element->wrapped());
>+
>+    Ref<JSModuleFetcher> fetcher = JSModuleFetcher::create(JSC::jsCast<JSDOMGlobalObject*>(globalObject), completedUrl, deferred, m_document);
>+    m_fetchingSet.add(&fetcher.get());
>+    if (!fetcher->run(scriptElement)) {
>+        if (Frame* frame = m_document.frame())
>+            return deferred->reject(exec, JSC::Symbol::create(exec->vm(), *(frame->script().moduleLoaderAlreadyReportedErrorSymbol().uid())));
>+    }
> 
>     return deferred->promise();
> }
> 
>-JSC::JSValue JSModuleLoader::evaluate(JSC::JSGlobalObject*, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue, JSC::JSValue moduleRecordValue)
>+JSC::JSValue JSModuleLoader::evaluate(JSC::JSGlobalObject*, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue, JSC::JSValue moduleRecordValue, JSC::JSValue)
> {
>     // FIXME: Currently, we only support JSModuleRecord.
>     // Once the reflective part of the module loader is supported, we will handle arbitrary values.
>@@ -121,9 +133,14 @@ JSC::JSValue JSModuleLoader::evaluate(JSC::JSGlobalObject*, JSC::ExecState* exec
>     if (!sourceUrl.isValid())
>         return JSC::throwTypeError(exec, ASCIILiteral("Module key is an invalid URL."));
> 
>-    // FIXME: Implement evaluating module code.
>-
>+    if (Frame* frame = m_document.frame())
>+        return frame->script().evaluateModule(sourceUrl, moduleRecord);
>     return JSC::jsUndefined();
> }
> 
>+void JSModuleLoader::notifyFinished(JSModuleFetcher* fetcher)
>+{
>+    m_fetchingSet.remove(fetcher);
>+}
>+
> }
>diff --git a/Source/WebCore/bindings/js/JSModuleLoader.h b/Source/WebCore/bindings/js/JSModuleLoader.h
>index 69a501a5ae53a56214c5cc59cecb3190076fe1fd..2e47503a5c5cc4503832a244f4ced3e9637cf4b2 100644
>--- a/Source/WebCore/bindings/js/JSModuleLoader.h
>+++ b/Source/WebCore/bindings/js/JSModuleLoader.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include <runtime/JSCJSValue.h>
>+#include <wtf/HashSet.h>
> #include <wtf/Noncopyable.h>
> 
> namespace JSC {
>@@ -40,6 +41,7 @@ class JSModuleLoader;
> namespace WebCore {
> 
> class Document;
>+class JSModuleFetcher;
> 
> class JSModuleLoader {
>     WTF_MAKE_NONCOPYABLE(JSModuleLoader); WTF_MAKE_FAST_ALLOCATED;
>@@ -48,12 +50,15 @@ class JSModuleLoader {
> 
>     Document& document() { return m_document; }
> 
>-    JSC::JSInternalPromise* resolve(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue moduleName, JSC::JSValue importerModuleKey);
>-    JSC::JSInternalPromise* fetch(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue moduleKey);
>-    JSC::JSValue evaluate(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue moduleKey, JSC::JSValue moduleRecord);
>+    JSC::JSInternalPromise* resolve(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue moduleName, JSC::JSValue importerModuleKey, JSC::JSValue initiator);
>+    JSC::JSInternalPromise* fetch(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue moduleKey, JSC::JSValue initiator);
>+    JSC::JSValue evaluate(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue moduleKey, JSC::JSValue moduleRecord, JSC::JSValue initiator);
>+
>+    void notifyFinished(JSModuleFetcher*);
> 
> private:
>     Document& m_document;
>+    HashSet<RefPtr<JSModuleFetcher>> m_fetchingSet;
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/ScriptController.cpp b/Source/WebCore/bindings/js/ScriptController.cpp
>index 688397a05c78010ccea2495d2303909517c4e609..7798fef2c8eef884c6d43ce4e18f929b434f6a86 100644
>--- a/Source/WebCore/bindings/js/ScriptController.cpp
>+++ b/Source/WebCore/bindings/js/ScriptController.cpp
>@@ -34,6 +34,7 @@
> #include "JSDOMWindow.h"
> #include "JSDocument.h"
> #include "JSMainThreadExecState.h"
>+#include "JSModuleGraph.h"
> #include "MainFrame.h"
> #include "MemoryPressureHandler.h"
> #include "NP_jsobject.h"
>@@ -41,6 +42,7 @@
> #include "PageConsoleClient.h"
> #include "PageGroup.h"
> #include "PluginViewBase.h"
>+#include "ScriptElement.h"
> #include "ScriptSourceCode.h"
> #include "ScriptableDocumentParser.h"
> #include "Settings.h"
>@@ -53,7 +55,11 @@
> #include <heap/StrongInlines.h>
> #include <inspector/ScriptCallStack.h>
> #include <runtime/InitializeThreading.h>
>+#include <runtime/JSFunction.h>
>+#include <runtime/JSInternalPromise.h>
> #include <runtime/JSLock.h>
>+#include <runtime/JSModuleRecord.h>
>+#include <runtime/JSNativeStdFunction.h>
> #include <wtf/Threading.h>
> #include <wtf/text/TextPosition.h>
> 
>@@ -85,6 +91,7 @@ ScriptController::ScriptController(Frame& frame)
>     : m_frame(frame)
>     , m_sourceURL(0)
>     , m_paused(false)
>+    , m_moduleLoaderAlreadyReportedErrorSymbol()
> #if ENABLE(NETSCAPE_PLUGIN_API)
>     , m_windowScriptNPObject(0)
> #endif
>@@ -155,7 +162,7 @@ JSValue ScriptController::evaluateInWorld(const ScriptSourceCode& sourceCode, DO
>     const String* savedSourceURL = m_sourceURL;
>     m_sourceURL = &sourceURL;
> 
>-    Ref<Frame> protect(m_frame);
>+    Ref<Frame> protector(m_frame);
> 
>     InspectorInstrumentationCookie cookie = InspectorInstrumentation::willEvaluateScript(m_frame, sourceURL, sourceCode.startLine());
> 
>@@ -179,6 +186,123 @@ JSValue ScriptController::evaluate(const ScriptSourceCode& sourceCode, Exception
>     return evaluateInWorld(sourceCode, mainThreadNormalWorld(), exceptionDetails);
> }
> 
>+static void handleJSModuleLoaderError(ExecState* exec, JSValue error, const PrivateName& moduleLoaderAlreadyReportedErrorSymbol)
>+{
>+    // Once reported error is marked as moduleLoaderAlreadyReportedErrorSymbol.
>+    // Don't report it here again.
>+    if (Symbol* symbol = jsDynamicCast<Symbol*>(error)) {
>+        if (symbol->privateName() == moduleLoaderAlreadyReportedErrorSymbol)
>+            return;
>+    }
>+
>+    // FIXME: Because we have not supported the "crossorigin" attribute in the module tag,
>+    // we pass the nullptr to reportException's CachedScript* parameter. When passing nullptr
>+    // to reportException, WebCore does not show the detail of the error if the URL of the
>+    // source does not pass the same origin policy. So the current behavior is conservative;
>+    // only the module code that URL is within the same origin can report the details of the
>+    // error. Once the spec describes the behavior, we will follow it.
>+    reportException(exec, error, nullptr);
>+}
>+
>+void ScriptController::loadModuleInWorld(JSModuleGraph& moduleGraph, const String& moduleName, DOMWrapperWorld& world, Element& element)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    initJSModuleGraph(moduleGraph, JSMainThreadExecState::loadModule(exec, moduleName, toJS(exec, shell->window(), &element)), world);
>+}
>+
>+void ScriptController::loadModule(JSModuleGraph& moduleGraph, const String& moduleName, Element& element)
>+{
>+    loadModuleInWorld(moduleGraph, moduleName, mainThreadNormalWorld(), element);
>+}
>+
>+void ScriptController::loadModuleInWorld(JSModuleGraph& moduleGraph, const ScriptSourceCode& sourceCode, DOMWrapperWorld& world, Element& element)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    initJSModuleGraph(moduleGraph, JSMainThreadExecState::loadModule(exec, sourceCode.jsSourceCode(), toJS(exec, shell->window(), &element)), world);
>+}
>+
>+void ScriptController::loadModule(JSModuleGraph& moduleGraph, const ScriptSourceCode& sourceCode, Element& element)
>+{
>+    loadModuleInWorld(moduleGraph, sourceCode, mainThreadNormalWorld(), element);
>+}
>+
>+void ScriptController::linkAndEvaluateModuleInWorld(JSModuleGraph& moduleGraph, DOMWrapperWorld& world, Element& element)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    JSInternalPromise* promise = JSMainThreadExecState::linkAndEvaluateModule(exec, Identifier::fromUid(&exec->vm(), moduleGraph.moduleKey()), toJS(exec, shell->window(), &element));
>+
>+    WeakPtr<Element> weakPtr(moduleGraph.weakElementPtr());
>+    JSFunction* fulfillHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [weakPtr](ExecState*) {
>+        if (RefPtr<Element> element = weakPtr.get())
>+            toScriptElementIfPossible(element.get())->moduleGraph()->notifyEvaluated();
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    PrivateName moduleLoaderAlreadyReportedErrorSymbol = m_moduleLoaderAlreadyReportedErrorSymbol;
>+    JSFunction* rejectHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [moduleLoaderAlreadyReportedErrorSymbol, weakPtr](ExecState* exec) {
>+        if (RefPtr<Element> element = weakPtr.get())
>+            toScriptElementIfPossible(element.get())->moduleGraph()->notifyEvaluated();
>+        handleJSModuleLoaderError(exec, exec->argument(0), moduleLoaderAlreadyReportedErrorSymbol);
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    promise->then(exec, fulfillHandler, rejectHandler);
>+}
>+
>+void ScriptController::linkAndEvaluateModule(JSModuleGraph& moduleGraph, Element& element)
>+{
>+    linkAndEvaluateModuleInWorld(moduleGraph, mainThreadNormalWorld(), element);
>+}
>+
>+JSC::JSValue ScriptController::evaluateModule(const URL& sourceURL, JSModuleRecord* moduleRecord, DOMWrapperWorld& world)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    const SourceCode& jsSourceCode = moduleRecord->sourceCode();
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+    const String* savedSourceURL = m_sourceURL;
>+    m_sourceURL = &sourceURL.string();
>+
>+    Ref<Frame> protector(m_frame);
>+
>+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willEvaluateScript(m_frame, sourceURL, jsSourceCode.firstLine());
>+
>+    JSValue returnValue = moduleRecord->evaluate(exec);
>+    NakedPtr<Exception> evaluationException;
>+    if (exec->hadException())
>+        evaluationException = exec->vm().exception();
>+
>+    InspectorInstrumentation::didEvaluateScript(cookie, m_frame);
>+
>+    if (evaluationException) {
>+        reportException(exec, evaluationException, nullptr);
>+        m_sourceURL = savedSourceURL;
>+        return jsUndefined();
>+    }
>+
>+    m_sourceURL = savedSourceURL;
>+    return returnValue;
>+}
>+
>+JSC::JSValue ScriptController::evaluateModule(const URL& sourceURL, JSModuleRecord* moduleRecord)
>+{
>+    return evaluateModule(sourceURL, moduleRecord, mainThreadNormalWorld());
>+}
>+
> Ref<DOMWrapperWorld> ScriptController::createWorld()
> {
>     return DOMWrapperWorld::create(JSDOMWindow::commonVM());
>@@ -259,6 +383,41 @@ JSDOMWindowShell* ScriptController::initScript(DOMWrapperWorld& world)
>     return &windowShell;
> }
> 
>+static Identifier jsValueToModuleKey(ExecState* exec, JSValue value)
>+{
>+    if (value.isSymbol())
>+        return Identifier::fromUid(jsCast<Symbol*>(value)->privateName());
>+    ASSERT(value.isString());
>+    return Identifier::fromString(exec, jsCast<JSString*>(value)->value(exec));
>+}
>+
>+void ScriptController::initJSModuleGraph(JSModuleGraph& moduleGraph, JSInternalPromise* promise, DOMWrapperWorld& world)
>+{
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    WeakPtr<Element> weakPtr(moduleGraph.weakElementPtr());
>+    JSFunction* fulfillHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [weakPtr](ExecState* exec) {
>+        // JSModuleGraph, script element and document may be destroyed during loading the module.
>+        // In this case, we should not execute module body.
>+        if (RefPtr<Element> element = weakPtr.get()) {
>+            Identifier moduleKey = jsValueToModuleKey(exec, exec->argument(0));
>+            toScriptElementIfPossible(element.get())->moduleGraph()->notifyLoaded(moduleKey.impl());
>+        }
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    PrivateName moduleLoaderAlreadyReportedErrorSymbol = m_moduleLoaderAlreadyReportedErrorSymbol;
>+    JSFunction* rejectHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [moduleLoaderAlreadyReportedErrorSymbol, weakPtr](ExecState* exec) {
>+        if (RefPtr<Element> element = weakPtr.get())
>+            toScriptElementIfPossible(element.get())->moduleGraph()->notifyErrored();
>+        handleJSModuleLoaderError(exec, exec->argument(0), moduleLoaderAlreadyReportedErrorSymbol);
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    promise->then(exec, fulfillHandler, rejectHandler);
>+}
>+
> TextPosition ScriptController::eventHandlerPosition() const
> {
>     // FIXME: If we are not currently parsing, we should use our current location
>@@ -520,7 +679,7 @@ JSValue ScriptController::executeScript(const ScriptSourceCode& sourceCode, Exce
>     if (!canExecuteScripts(AboutToExecuteScript) || isPaused())
>         return { }; // FIXME: Would jsNull be better?
> 
>-    Ref<Frame> protect(m_frame); // Script execution can destroy the frame, and thus the ScriptController.
>+    Ref<Frame> protector(m_frame); // Script execution can destroy the frame, and thus the ScriptController.
> 
>     return evaluate(sourceCode, exceptionDetails);
> }
>diff --git a/Source/WebCore/bindings/js/ScriptController.h b/Source/WebCore/bindings/js/ScriptController.h
>index a0c71f260812b0d3211916868119d70bf671762f..0cd4dd7484d541610450d4995918a1e317dcf959 100644
>--- a/Source/WebCore/bindings/js/ScriptController.h
>+++ b/Source/WebCore/bindings/js/ScriptController.h
>@@ -44,6 +44,8 @@ class ScriptValue;
> 
> namespace JSC {
> class JSGlobalObject;
>+class JSModuleRecord;
>+class JSInternalPromise;
> class ExecState;
> 
> namespace Bindings {
>@@ -57,6 +59,7 @@ namespace WebCore {
> class Frame;
> class HTMLDocument;
> class HTMLPlugInElement;
>+class JSModuleGraph;
> class ScriptSourceCode;
> class SecurityOrigin;
> class Widget;
>@@ -115,6 +118,17 @@ class ScriptController {
>     JSC::JSValue evaluate(const ScriptSourceCode&, ExceptionDetails* = nullptr);
>     JSC::JSValue evaluateInWorld(const ScriptSourceCode&, DOMWrapperWorld&, ExceptionDetails* = nullptr);
> 
>+    void loadModuleInWorld(JSModuleGraph&, const String& moduleName, DOMWrapperWorld&, Element&);
>+    void loadModule(JSModuleGraph&, const String& moduleName, Element&);
>+    void loadModuleInWorld(JSModuleGraph&, const ScriptSourceCode&, DOMWrapperWorld&, Element&);
>+    void loadModule(JSModuleGraph&, const ScriptSourceCode&, Element&);
>+
>+    void linkAndEvaluateModuleInWorld(JSModuleGraph& , DOMWrapperWorld&, Element&);
>+    void linkAndEvaluateModule(JSModuleGraph&, Element&);
>+
>+    JSC::JSValue evaluateModule(const URL&, JSC::JSModuleRecord*, DOMWrapperWorld&);
>+    JSC::JSValue evaluateModule(const URL&, JSC::JSModuleRecord*);
>+
>     WTF::TextPosition eventHandlerPosition() const;
> 
>     void enableEval();
>@@ -135,6 +149,8 @@ class ScriptController {
> 
>     const String* sourceURL() const { return m_sourceURL; } // 0 if we are not evaluating any script
> 
>+    const JSC::PrivateName& moduleLoaderAlreadyReportedErrorSymbol() const { return m_moduleLoaderAlreadyReportedErrorSymbol; }
>+
>     void clearWindowShell(DOMWindow* newDOMWindow, bool goingIntoPageCache);
>     void updateDocument();
> 
>@@ -167,6 +183,7 @@ class ScriptController {
> 
> private:
>     WEBCORE_EXPORT JSDOMWindowShell* initScript(DOMWrapperWorld&);
>+    void initJSModuleGraph(JSModuleGraph&, JSC::JSInternalPromise*, DOMWrapperWorld&);
> 
>     void disconnectPlatformScriptObjects();
> 
>@@ -175,6 +192,7 @@ class ScriptController {
>     const String* m_sourceURL;
> 
>     bool m_paused;
>+    JSC::PrivateName m_moduleLoaderAlreadyReportedErrorSymbol;
> 
>     // The root object used for objects bound outside the context of a plugin, such
>     // as NPAPI plugins. The plugins using these objects prevent a page from being cached so they
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index 4d0308d7a3778fd3a4d84245c80ef6ce3f8d665b..039f925698d271de2083c5612dd9e0eb1a61219f 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -103,6 +103,7 @@
> #include "InspectorInstrumentation.h"
> #include "JSCustomElementInterface.h"
> #include "JSLazyEventListener.h"
>+#include "JSModuleFetcher.h"
> #include "JSModuleLoader.h"
> #include "KeyboardEvent.h"
> #include "Language.h"
>diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
>index 7e38d8fda1eab0d64fe452d208ef5ae04c4e5186..a67360c6b082d09e030f5cd391677585919c9b3c 100644
>--- a/Source/WebCore/dom/Document.h
>+++ b/Source/WebCore/dom/Document.h
>@@ -133,6 +133,7 @@ class MediaPlaybackTarget;
> class MediaPlaybackTargetClient;
> class MediaQueryList;
> class MediaQueryMatcher;
>+class JSModuleLoader;
> class MouseEventWithHitTestResults;
> class NamedFlowCollection;
> class NodeFilter;
>diff --git a/Source/WebCore/dom/ScriptElement.cpp b/Source/WebCore/dom/ScriptElement.cpp
>index f1871115b328a6f12630936e85eb09ab7a1f357c..d3a3e8c626568588409ce6d7e2bed3077dff09db 100644
>--- a/Source/WebCore/dom/ScriptElement.cpp
>+++ b/Source/WebCore/dom/ScriptElement.cpp
>@@ -37,6 +37,7 @@
> #include "HTMLNames.h"
> #include "HTMLParserIdioms.h"
> #include "IgnoreDestructiveWriteCountIncrementer.h"
>+#include "JSModuleGraph.h"
> #include "MIMETypeRegistry.h"
> #include "Page.h"
> #include "SVGNames.h"
>@@ -197,7 +198,10 @@ bool ScriptElement::prepareScript(const TextPosition& scriptStartPosition, Legac
>     if (!m_element.inDocument())
>         return false;
> 
>-    if (!determineScriptType(supportLegacyTypes))
>+    ScriptType scriptType = ScriptType::Classic;
>+    if (Optional<ScriptType> result = determineScriptType(supportLegacyTypes))
>+        scriptType = result.value();
>+    else
>         return false;
> 
>     if (wasParserInserted) {
>@@ -219,7 +223,7 @@ bool ScriptElement::prepareScript(const TextPosition& scriptStartPosition, Legac
>     if (!document.frame()->script().canExecuteScripts(AboutToExecuteScript))
>         return false;
> 
>-    if (!isScriptForEventSupported())
>+    if (scriptType == ScriptType::Classic && !isScriptForEventSupported())
>         return false;
> 
>     if (!charsetAttributeValue().isEmpty())
>@@ -227,26 +231,38 @@ bool ScriptElement::prepareScript(const TextPosition& scriptStartPosition, Legac
>     else
>         m_characterEncoding = document.charset();
> 
>-    if (hasSourceAttribute())
>-        if (!requestScript(sourceAttributeValue()))
>+    if (scriptType == ScriptType::Module) {
>+        if (!loadModule(scriptStartPosition))
>             return false;
>+        return true;
>+    }
>+
>+    if (scriptType == ScriptType::Classic) {
>+        if (hasSourceAttribute()) {
>+            if (!requestScript(scriptType, sourceAttributeValue()))
>+                return false;
>+        }
>+    }
> 
>-    if (hasSourceAttribute() && deferAttributeValue() && m_parserInserted && !asyncAttributeValue()) {
>+    if ((scriptType == ScriptType::Classic && hasSourceAttribute() && deferAttributeValue() && m_parserInserted && !asyncAttributeValue()) || (scriptType == ScriptType::Module && m_parserInserted && !asyncAttributeValue())) {
>         m_willExecuteWhenDocumentFinishedParsing = true;
>         m_willBeParserExecuted = true;
>-    } else if (hasSourceAttribute() && m_parserInserted && !asyncAttributeValue())
>+    } else if (scriptType == ScriptType::Classic && hasSourceAttribute() && m_parserInserted && !asyncAttributeValue()) {
>+        ASSERT(scriptType == ScriptType::Classic);
>         m_willBeParserExecuted = true;
>-    else if (!hasSourceAttribute() && m_parserInserted && !document.haveStylesheetsLoaded()) {
>-        m_willBeParserExecuted = true;
>-        m_readyToBeParserExecuted = true;
>-    } else if (hasSourceAttribute() && !asyncAttributeValue() && !m_forceAsync) {
>+    } else if ((scriptType == ScriptType::Classic && hasSourceAttribute() && !asyncAttributeValue() && !m_forceAsync) || (scriptType == ScriptType::Module && !asyncAttributeValue() && !m_forceAsync)) {
>         m_willExecuteInOrder = true;
>         document.scriptRunner()->queueScriptForExecution(this, m_cachedScript, ScriptRunner::IN_ORDER_EXECUTION);
>         m_cachedScript->addClient(this);
>-    } else if (hasSourceAttribute()) {
>+    } else if (hasSourceAttribute() || scriptType == ScriptType::Module) {
>         m_element.document().scriptRunner()->queueScriptForExecution(this, m_cachedScript, ScriptRunner::ASYNC_EXECUTION);
>         m_cachedScript->addClient(this);
>+    } else if (!hasSourceAttribute() && m_parserInserted && !document.haveStylesheetsLoaded()) {
>+        ASSERT(scriptType == ScriptType::Classic);
>+        m_willBeParserExecuted = true;
>+        m_readyToBeParserExecuted = true;
>     } else {
>+        ASSERT(scriptType == ScriptType::Classic);
>         // Reset line numbering for nested writes.
>         TextPosition position = document.isInDocumentWrite() ? TextPosition() : scriptStartPosition;
>         executeScript(ScriptSourceCode(scriptContent(), document.url(), position));
>@@ -255,7 +271,7 @@ bool ScriptElement::prepareScript(const TextPosition& scriptStartPosition, Legac
>     return true;
> }
> 
>-bool ScriptElement::requestScript(const String& sourceUrl)
>+bool ScriptElement::requestScript(ScriptType, const String& sourceUrl)
> {
>     Ref<Document> originalDocument(m_element.document());
>     if (!m_element.dispatchBeforeLoadEvent(sourceUrl))
>@@ -296,6 +312,31 @@ bool ScriptElement::requestScript(const String& sourceUrl)
>     return false;
> }
> 
>+CachedResourceHandle<CachedScript> ScriptElement::requestModuleScript(URL sourceUrl)
>+{
>+    bool hasKnownNonce = m_element.document().contentSecurityPolicy()->allowScriptWithNonce(m_element.attributeWithoutSynchronization(HTMLNames::nonceAttr), m_element.isInUserAgentShadowTree());
>+    ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
>+    options.contentSecurityPolicyImposition = hasKnownNonce ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
>+
>+    CachedResourceRequest request(ResourceRequest(sourceUrl), options);
>+
>+    m_element.document().contentSecurityPolicy()->upgradeInsecureRequestIfNeeded(request.mutableResourceRequest(), ContentSecurityPolicy::InsecureRequestType::Load);
>+
>+    String crossOriginMode = m_element.attributeWithoutSynchronization(HTMLNames::crossoriginAttr);
>+    if (!crossOriginMode.isNull()) {
>+        m_requestUsesAccessControl = true;
>+        StoredCredentials allowCredentials = equalLettersIgnoringASCIICase(crossOriginMode, "use-credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials;
>+        ASSERT(m_element.document().securityOrigin());
>+        updateRequestForAccessControl(request.mutableResourceRequest(), *m_element.document().securityOrigin(), allowCredentials);
>+    }
>+    request.setCharset(ASCIILiteral("utf-8"));
>+    request.setInitiator(&element());
>+
>+    m_isExternalScript = true;
>+
>+    return m_element.document().cachedResourceLoader().requestScript(request);
>+}
>+
> void ScriptElement::executeScript(const ScriptSourceCode& sourceCode)
> {
>     ASSERT(m_alreadyStarted);
>@@ -328,6 +369,9 @@ void ScriptElement::executeScript(const ScriptSourceCode& sourceCode)
>         // Note: This is where the script is compiled and actually executed.
>         frame->script().evaluate(sourceCode);
>     }
>+    // FIXME: The module loader should have the mechanism to stop loading.
>+    // The current loader spec does not have this. Once it is specified
>+    // we will introduce this feature.
> }
> 
> void ScriptElement::stopLoadRequest()
>@@ -352,6 +396,64 @@ void ScriptElement::execute(CachedScript* cachedScript)
>     cachedScript->removeClient(this);
> }
> 
>+bool ScriptElement::loadModule(const TextPosition& scriptStartPosition)
>+{
>+    // The browser module loader loads the module sources.
>+    // Since the module involves loading of the dependent modules and the dependent modules does not have corresponding script elements,
>+    // the functionality of loading modules is separated from the script element.
>+    if (hasSourceAttribute()) {
>+        String sourceUrl = sourceAttributeValue();
>+        Ref<Document> originalDocument(m_element.document());
>+        if (!m_element.dispatchBeforeLoadEvent(sourceUrl))
>+            return false;
>+
>+        // Script element may be detached and attached to a different document while executing the event listener.
>+        if (!m_element.inDocument() || &m_element.document() != originalDocument.ptr())
>+            return false;
>+
>+        if (stripLeadingAndTrailingHTMLSpaces(sourceUrl).isEmpty()) {
>+            dispatchErrorEvent();
>+            return false;
>+        }
>+
>+        // FIXME: Should support cross-origin mode in the module tag.
>+        // However we don't have the policy to apply this mode to the resources of the dependent modules.
>+        // Provided multiple module tags,
>+        //
>+        //   A: <script type="module" src="..." crossorigin="anonymous"></script>
>+        //   B: <script type="module" src="..."></script>
>+        //
>+        // 'A' has the "crossorigin" attribute. But 'B' does not have it.
>+        // However, ES6 modules allow 'A' and 'B' to load the same module and it will be cached in the
>+        // module loader. In that case, it is controversial that which "crossorigin" attribute will be
>+        // applied to the module loaded by the both. Once the spec of the module loader is fixed, we
>+        // should follow it.
>+
>+        m_isExternalScript = true;
>+        m_moduleGraph = std::make_unique<JSModuleGraph>(m_element);
>+        m_element.document().scriptRunner()->queueJSModuleGraphForExecution(this, *m_moduleGraph);
>+        m_moduleGraph->load(sourceAttributeValue());
>+        return true;
>+    }
>+
>+    // Reset line numbering for nested writes.
>+    TextPosition position = m_element.document().isInDocumentWrite() ? TextPosition() : scriptStartPosition;
>+    ScriptSourceCode sourceCode(scriptContent(), m_element.document().url(), position);
>+
>+    {
>+        ASSERT(m_element.document().contentSecurityPolicy());
>+        const ContentSecurityPolicy& contentSecurityPolicy = *m_element.document().contentSecurityPolicy();
>+        bool hasKnownNonce = contentSecurityPolicy.allowScriptWithNonce(m_element.attributeWithoutSynchronization(HTMLNames::nonceAttr), m_element.isInUserAgentShadowTree());
>+        if (!contentSecurityPolicy.allowInlineScript(m_element.document().url(), m_startLineNumber, sourceCode.source().toStringWithoutCopying(), hasKnownNonce))
>+            return true;
>+    }
>+
>+    m_moduleGraph = std::make_unique<JSModuleGraph>(m_element);
>+    m_element.document().scriptRunner()->queueJSModuleGraphForExecution(this, *m_moduleGraph);
>+    m_moduleGraph->load(sourceCode);
>+    return true;
>+}
>+
> void ScriptElement::notifyFinished(CachedResource* resource)
> {
>     ASSERT(!m_willBeParserExecuted);
>diff --git a/Source/WebCore/dom/ScriptElement.h b/Source/WebCore/dom/ScriptElement.h
>index 1aa4f2e83b311171246a230e6588062f9cf3d084..92d1537df72bea58c4f304c2c46ce20e420b0860 100644
>--- a/Source/WebCore/dom/ScriptElement.h
>+++ b/Source/WebCore/dom/ScriptElement.h
>@@ -24,6 +24,7 @@
> #include "CachedResourceClient.h"
> #include "CachedResourceHandle.h"
> #include "Timer.h"
>+#include "URL.h"
> #include <wtf/text/TextPosition.h>
> #include <wtf/text/WTFString.h>
> 
>@@ -32,6 +33,7 @@ namespace WebCore {
> class CachedScript;
> class ContainerNode;
> class Element;
>+class JSModuleGraph;
> class ScriptElement;
> class ScriptSourceCode;
> 
>@@ -59,6 +61,14 @@ class ScriptElement : private CachedResourceClient {
>     bool readyToBeParserExecuted() const { return m_readyToBeParserExecuted; }
>     bool willExecuteWhenDocumentFinishedParsing() const { return m_willExecuteWhenDocumentFinishedParsing; }
>     CachedResourceHandle<CachedScript> cachedScript() { return m_cachedScript; }
>+    JSModuleGraph* moduleGraph() { return m_moduleGraph.get(); }
>+
>+    CachedResourceHandle<CachedScript> requestModuleScript(URL);
>+
>+    // https://html.spec.whatwg.org/multipage/scripting.html#concept-script-type
>+    enum class ScriptType { Classic, Module };
>+
>+    ScriptType scriptType() const { return m_isClassicScript ? ScriptType::Classic : ScriptType::Module; }
> 
> protected:
>     ScriptElement(Element&, bool createdByParser, bool isEvaluated);
>@@ -76,13 +86,13 @@ class ScriptElement : private CachedResourceClient {
>     void handleAsyncAttribute();
> 
> private:
>-    // https://html.spec.whatwg.org/multipage/scripting.html#concept-script-type
>-    enum class ScriptType { Classic, Module };
>     Optional<ScriptType> determineScriptType(LegacyTypeSupport) const;
>     bool ignoresLoadRequest() const;
>     bool isScriptForEventSupported() const;
> 
>-    bool requestScript(const String& sourceUrl);
>+    bool loadModule(const TextPosition&);
>+
>+    bool requestScript(ScriptType, const String& sourceUrl);
>     void stopLoadRequest();
> 
>     void notifyFinished(CachedResource*) override;
>@@ -110,8 +120,10 @@ class ScriptElement : private CachedResourceClient {
>     bool m_forceAsync : 1;
>     bool m_willExecuteInOrder : 1;
>     bool m_requestUsesAccessControl : 1;
>+    bool m_isClassicScript : 1;
>     String m_characterEncoding;
>     String m_fallbackCharacterEncoding;
>+    std::unique_ptr<JSModuleGraph> m_moduleGraph;
> };
> 
> // FIXME: replace with downcast<ScriptElement>.
>diff --git a/Source/WebCore/dom/ScriptRunner.cpp b/Source/WebCore/dom/ScriptRunner.cpp
>index d2605bddb7b5b62b914538ef6262acb7b3d5002e..2beb40efe65322dac7bd6bd358af8fa397a8ba8c 100644
>--- a/Source/WebCore/dom/ScriptRunner.cpp
>+++ b/Source/WebCore/dom/ScriptRunner.cpp
>@@ -28,6 +28,7 @@
> 
> #include "CachedScript.h"
> #include "Element.h"
>+#include "JSModuleGraph.h"
> #include "PendingScript.h"
> #include "ScriptElement.h"
> 
>@@ -47,6 +48,10 @@ ScriptRunner::~ScriptRunner()
>         m_document.decrementLoadEventDelayCount();
>     for (unsigned i = 0; i < m_pendingAsyncScripts.size(); ++i)
>         m_document.decrementLoadEventDelayCount();
>+    for (size_t i = 0; i < m_moduleScriptElementsToExecuteSoon.size(); ++i)
>+        m_document.decrementLoadEventDelayCount();
>+    for (unsigned i = 0; i < m_pendingModuleScriptElements.size(); ++i)
>+        m_document.decrementLoadEventDelayCount();
> }
> 
> void ScriptRunner::queueScriptForExecution(ScriptElement* scriptElement, CachedResourceHandle<CachedScript> cachedScript, ExecutionType executionType)
>@@ -70,6 +75,18 @@ void ScriptRunner::queueScriptForExecution(ScriptElement* scriptElement, CachedR
>     }
> }
> 
>+void ScriptRunner::queueJSModuleGraphForExecution(ScriptElement* scriptElement, JSModuleGraph&)
>+{
>+    ASSERT(scriptElement);
>+
>+    Element& element = scriptElement->element();
>+    ASSERT(element.inDocument());
>+
>+    m_document.incrementLoadEventDelayCount();
>+
>+    m_pendingModuleScriptElements.add(&element);
>+}
>+
> void ScriptRunner::suspend()
> {
>     m_timer.stop();
>@@ -96,6 +113,26 @@ void ScriptRunner::notifyScriptReady(ScriptElement* scriptElement, ExecutionType
>     m_timer.startOneShot(0);
> }
> 
>+void ScriptRunner::notifyJSModuleGraphReady(ScriptElement* scriptElement)
>+{
>+    ASSERT_UNUSED(scriptElement, m_pendingModuleScriptElements.contains(&scriptElement->element()));
>+
>+    // ListHashSet correctly preserves the insertion order.
>+    // And it allow us to remove element during iteration.
>+    auto iterator = m_pendingModuleScriptElements.begin();
>+    while (iterator != m_pendingModuleScriptElements.end()) {
>+        JSModuleGraph* moduleGraph = toScriptElementIfPossible(iterator->get())->moduleGraph();
>+        if (!moduleGraph->errorOccurred() && !moduleGraph->isLoaded())
>+            break;
>+        auto previous = iterator;
>+        ++iterator;
>+        m_moduleScriptElementsToExecuteSoon.append(*previous);
>+        m_pendingModuleScriptElements.remove(previous);
>+    }
>+    if (!m_moduleScriptElementsToExecuteSoon.isEmpty())
>+        m_timer.startOneShot(0);
>+}
>+
> void ScriptRunner::timerFired()
> {
>     Ref<Document> protect(m_document);
>@@ -119,6 +156,20 @@ void ScriptRunner::timerFired()
>         toScriptElementIfPossible(element.get())->execute(cachedScript);
>         m_document.decrementLoadEventDelayCount();
>     }
>+
>+    Vector<RefPtr<Element>> moduleScriptElements;
>+    moduleScriptElements.swap(m_moduleScriptElementsToExecuteSoon);
>+
>+    for (RefPtr<Element>& pendingModuleScriptElement : moduleScriptElements) {
>+        RefPtr<Element> element;
>+        pendingModuleScriptElement.swap(element);
>+        ASSERT(element);
>+        // Paper over https://bugs.webkit.org/show_bug.cgi?id=144050
>+        if (!element)
>+            continue;
>+        toScriptElementIfPossible(element.get())->moduleGraph()->evaluate();
>+        m_document.decrementLoadEventDelayCount();
>+    }
> }
> 
> }
>diff --git a/Source/WebCore/dom/ScriptRunner.h b/Source/WebCore/dom/ScriptRunner.h
>index 8cd332a5734c1cb92f2a5ff5fc4cca158fe3bc41..82cf5e7b3f4697812a6f8beb8139b16e50f620ea 100644
>--- a/Source/WebCore/dom/ScriptRunner.h
>+++ b/Source/WebCore/dom/ScriptRunner.h
>@@ -29,6 +29,7 @@
> #include "CachedResourceHandle.h"
> #include "Timer.h"
> #include <wtf/HashMap.h>
>+#include <wtf/ListHashSet.h>
> #include <wtf/Noncopyable.h>
> #include <wtf/Vector.h>
> 
>@@ -36,6 +37,8 @@ namespace WebCore {
> 
> class CachedScript;
> class Document;
>+class Element;
>+class JSModuleGraph;
> class PendingScript;
> class ScriptElement;
> 
>@@ -47,11 +50,14 @@ class ScriptRunner {
> 
>     enum ExecutionType { ASYNC_EXECUTION, IN_ORDER_EXECUTION };
>     void queueScriptForExecution(ScriptElement*, CachedResourceHandle<CachedScript>, ExecutionType);
>-    bool hasPendingScripts() const { return !m_scriptsToExecuteSoon.isEmpty() || !m_scriptsToExecuteInOrder.isEmpty() || !m_pendingAsyncScripts.isEmpty(); }
>+    void queueJSModuleGraphForExecution(ScriptElement*, JSModuleGraph&);
>+    bool hasPendingScripts() const { return !m_scriptsToExecuteSoon.isEmpty() || !m_scriptsToExecuteInOrder.isEmpty() || !m_pendingAsyncScripts.isEmpty() || !m_moduleScriptElementsToExecuteSoon.isEmpty() || !m_pendingModuleScriptElements.isEmpty(); }
>     void suspend();
>     void resume();
>     void notifyScriptReady(ScriptElement*, ExecutionType);
> 
>+    void notifyJSModuleGraphReady(ScriptElement*);
>+
> private:
>     void timerFired();
> 
>@@ -59,6 +65,8 @@ class ScriptRunner {
>     Vector<PendingScript> m_scriptsToExecuteInOrder;
>     Vector<PendingScript> m_scriptsToExecuteSoon; // http://www.whatwg.org/specs/web-apps/current-work/#set-of-scripts-that-will-execute-as-soon-as-possible
>     HashMap<ScriptElement*, PendingScript> m_pendingAsyncScripts;
>+    Vector<RefPtr<Element>> m_moduleScriptElementsToExecuteSoon;
>+    ListHashSet<RefPtr<Element>> m_pendingModuleScriptElements;
>     Timer m_timer;
> };
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c6d8cf984dc57bbd6dad98a9efd38c274f3d2527..9522b69fac905232b379b9ce2fa477a49d5f8fed 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,69 @@
>+2016-08-25  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        [ES6] Integrate ES6 Modules into WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=148897
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestExpectations:
>+        * js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-expected.txt: Added.
>+        * js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html: Added.
>+        * js/dom/module-execution-error-should-be-propagated-to-onerror-expected.txt: Added.
>+        * js/dom/module-execution-error-should-be-propagated-to-onerror.html: Added.
>+        * js/dom/module-execution-order-inline-expected.txt: Added.
>+        * js/dom/module-execution-order-inline.html: Added.
>+        * js/dom/module-execution-order-mixed-expected.txt: Added.
>+        * js/dom/module-execution-order-mixed.html: Added.
>+        * js/dom/module-inline-dynamic-expected.txt: Added.
>+        * js/dom/module-inline-dynamic.html: Added.
>+        * js/dom/module-inline-simple-expected.txt: Added.
>+        * js/dom/module-inline-simple.html: Added.
>+        * js/dom/module-load-event-expected.txt: Added.
>+        * js/dom/module-load-event-with-src-expected.txt: Added.
>+        * js/dom/module-load-event-with-src.html: Added.
>+        * js/dom/module-load-event.html: Added.
>+        * js/dom/module-load-same-module-from-different-entry-point-dynamic-expected.txt: Added.
>+        * js/dom/module-load-same-module-from-different-entry-point-dynamic.html: Added.
>+        * js/dom/module-load-same-module-from-different-entry-point-expected.txt: Added.
>+        * js/dom/module-load-same-module-from-different-entry-point.html: Added.
>+        * js/dom/module-not-found-error-event-expected.txt: Added.
>+        * js/dom/module-not-found-error-event-with-src-and-import-expected.txt: Added.
>+        * js/dom/module-not-found-error-event-with-src-and-import.html: Added.
>+        * js/dom/module-not-found-error-event-with-src-expected.txt: Added.
>+        * js/dom/module-not-found-error-event-with-src.html: Added.
>+        * js/dom/module-not-found-error-event.html: Added.
>+        * js/dom/module-src-dynamic-expected.txt: Added.
>+        * js/dom/module-src-dynamic.html: Added.
>+        * js/dom/module-src-simple-expected.txt: Added.
>+        * js/dom/module-src-simple.html: Added.
>+        * js/dom/module-will-fire-beforeload-expected.txt: Added.
>+        * js/dom/module-will-fire-beforeload.html: Added.
>+        * js/dom/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js: Added.
>+        * js/dom/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js: Added.
>+        * js/dom/script-tests/module-execution-order-mixed-2.js: Added.
>+        * js/dom/script-tests/module-execution-order-mixed-cappuccino.js: Added.
>+        * js/dom/script-tests/module-execution-order-mixed-cocoa.js: Added.
>+        * js/dom/script-tests/module-execution-order-mixed-matcha.js: Added.
>+        * js/dom/script-tests/module-execution-order-mixed.js: Added.
>+        * js/dom/script-tests/module-inline-dynamic.js: Added.
>+        (export.default.Cocoa.prototype.taste):
>+        (export.default.Cocoa):
>+        * js/dom/script-tests/module-inline-simple.js: Added.
>+        (export.default.Cocoa.prototype.taste):
>+        (export.default.Cocoa):
>+        * js/dom/script-tests/module-load-event-with-src.js: Added.
>+        * js/dom/script-tests/module-load-same-module-from-different-entry-point.js: Added.
>+        * js/dom/script-tests/module-not-found-error-event-with-src-and-import.js: Added.
>+        * js/dom/script-tests/module-src-dynamic-cocoa.js: Added.
>+        (Cocoa.prototype.taste):
>+        (Cocoa):
>+        * js/dom/script-tests/module-src-dynamic.js: Added.
>+        * js/dom/script-tests/module-src-simple-cocoa.js: Added.
>+        (Cocoa.prototype.taste):
>+        (Cocoa):
>+        * js/dom/script-tests/module-src-simple.js: Added.
>+        * js/dom/script-tests/module-will-fire-beforeload.js: Added.
>+
> 2016-08-25  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         Unreviewed, rebase iOS simulator WK1 imported/w3c tests
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 52e23eaf3a991aba16caeeeac5b054cdce66861e..b559fe22ca185196aee714131176217d686706ba 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -1245,3 +1245,21 @@ webkit.org/b/159755 fast/text/emoji-gender.html [ ImageOnlyFailure ]
> webkit.org/b/160017 js/regress-139548.html [ Slow ]
> 
> webkit.org/b/161088 imported/w3c/web-platform-tests/resource-timing/resource-timing.html [ Pass Failure ]
>+
>+# ES6 Modules are not yet enabled by default: ENABLE(ES6_MODULES)
>+# js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html [ Skip ]
>+# js/dom/module-execution-error-should-be-propagated-to-onerror.html [ Skip ]
>+# js/dom/module-execution-order-inline.html [ Skip ]
>+# js/dom/module-execution-order-mixed.html [ Skip ]
>+# js/dom/module-inline-dynamic.html [ Skip ]
>+# js/dom/module-inline-simple.html [ Skip ]
>+# js/dom/module-load-event-with-src.html [ Skip ]
>+# js/dom/module-load-event.html [ Skip ]
>+# js/dom/module-load-same-module-from-different-entry-point-dynamic.html [ Skip ]
>+# js/dom/module-load-same-module-from-different-entry-point.html [ Skip ]
>+# js/dom/module-not-found-error-event-with-src-and-import.html [ Skip ]
>+# js/dom/module-not-found-error-event-with-src.html [ Skip ]
>+# js/dom/module-not-found-error-event.html [ Skip ]
>+# js/dom/module-src-dynamic.html [ Skip ]
>+# js/dom/module-src-simple.html [ Skip ]
>+# js/dom/module-will-fire-beforeload.html [ Skip ]
>diff --git a/LayoutTests/js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-expected.txt b/LayoutTests/js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..9bdb275a2fb8348964fbe8deb82553b4b9db9a52
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-expected.txt
>@@ -0,0 +1,11 @@
>+Test window.onerror will be fired when the dependent module throw an error.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Executing the dependent module
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html b/LayoutTests/js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..177b5dd764dbe243423d1c38e374cc0fddc24371
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html
>@@ -0,0 +1,22 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test window.onerror will be fired when the dependent module throw an error.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+window.onerror = function () {
>+    finishJSTest();
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module">
>+import "script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js"
>+testFailed("executed");
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-execution-error-should-be-propagated-to-onerror-expected.txt b/LayoutTests/js/dom/module-execution-error-should-be-propagated-to-onerror-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..a5df7028f354936692922efe61a2dfba5f1f0935
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-error-should-be-propagated-to-onerror-expected.txt
>@@ -0,0 +1,11 @@
>+Test window.onerror will be fired when the inlined module throws an error.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Executing the module.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-execution-error-should-be-propagated-to-onerror.html b/LayoutTests/js/dom/module-execution-error-should-be-propagated-to-onerror.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..c4462f37ed8173061f7f99536c42d2995c252728
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-error-should-be-propagated-to-onerror.html
>@@ -0,0 +1,22 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test window.onerror will be fired when the inlined module throws an error.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+window.onerror = function () {
>+    finishJSTest();
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module">
>+debug('Executing the module.');
>+throw new Error("module is executed.");
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-execution-order-inline-expected.txt b/LayoutTests/js/dom/module-execution-order-inline-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..fffdf339757a4a37964e889aec69afcc599ab78f
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-order-inline-expected.txt
>@@ -0,0 +1,14 @@
>+Test module execution order between inlined module tags.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+PASS count++ is 0
>+PASS count++ is 1
>+PASS count++ is 2
>+PASS count++ is 3
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-execution-order-inline.html b/LayoutTests/js/dom/module-execution-order-inline.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..5525e76908cfb6fea0107f4daadd1d2931bf3ce6
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-order-inline.html
>@@ -0,0 +1,27 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test module execution order between inlined module tags.');
>+window.count = 0;
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+shouldBe("count++", "0");
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module">
>+shouldBe("count++", "1");
>+</script>
>+<script type="module">
>+shouldBe("count++", "2");
>+</script>
>+<script type="module">
>+shouldBe("count++", "3");
>+finishJSTest();
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-execution-order-mixed-expected.txt b/LayoutTests/js/dom/module-execution-order-mixed-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..f37f524f531905d8a53f44a33ab6ffb400121030
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-order-mixed-expected.txt
>@@ -0,0 +1,18 @@
>+Test module execution order between mixed tags.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+We keep the execution order between modules.
>+Module is not executed yet.
>+PASS count++ is 0
>+PASS count++ is 1
>+PASS count++ is 2
>+PASS count++ is 3
>+PASS count++ is 4
>+PASS count++ is 5
>+PASS count++ is 6
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-execution-order-mixed.html b/LayoutTests/js/dom/module-execution-order-mixed.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..5191d303edd757738128dd9d15bb40c7e76c2cd7
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-order-mixed.html
>@@ -0,0 +1,27 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test module execution order between mixed tags.');
>+debug('We keep the execution order between modules.');
>+window.count = 0;
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module" src="script-tests/module-execution-order-mixed.js"></script>
>+<script type="module">
>+shouldBe("count++", "4");
>+</script>
>+<script type="module" src="script-tests/module-execution-order-mixed-2.js"></script>
>+<script type="module">
>+shouldBe("count++", "6");
>+finishJSTest();
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-inline-dynamic-expected.txt b/LayoutTests/js/dom/module-inline-dynamic-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..6c939aaf0a5015f479386cd3195aa59dd1690975
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-inline-dynamic-expected.txt
>@@ -0,0 +1,14 @@
>+Test inlined module.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Module execution is confined in the module environment.
>+PASS typeof cocoa is "undefined"
>+PASS typeof exportedCocoa is "object"
>+PASS exportedCocoa.taste() is "awesome"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-inline-dynamic.html b/LayoutTests/js/dom/module-inline-dynamic.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..a8c0e259ab291effc4bee78ae65c3417c11d05ee
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-inline-dynamic.html
>@@ -0,0 +1,35 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test inlined module.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script>
>+debug('Module is not executed yet.');
>+(function () {
>+    var element = document.createElement("script");
>+    element.textContent = `
>+        import Cocoa from "./script-tests/module-inline-dynamic.js";
>+        var cocoa = new Cocoa();
>+
>+        debug("Module execution is confined in the module environment.");
>+        shouldBeEqualToString("typeof cocoa", "undefined");
>+
>+        window.exportedCocoa = cocoa;
>+        shouldBeEqualToString("typeof exportedCocoa", "object");
>+        shouldBeEqualToString("exportedCocoa.taste()", "awesome");
>+        finishJSTest();
>+    `;
>+    element.type = "module";
>+    document.body.appendChild(element);
>+} ());
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-inline-simple-expected.txt b/LayoutTests/js/dom/module-inline-simple-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..6c939aaf0a5015f479386cd3195aa59dd1690975
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-inline-simple-expected.txt
>@@ -0,0 +1,14 @@
>+Test inlined module.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Module execution is confined in the module environment.
>+PASS typeof cocoa is "undefined"
>+PASS typeof exportedCocoa is "object"
>+PASS exportedCocoa.taste() is "awesome"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-inline-simple.html b/LayoutTests/js/dom/module-inline-simple.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..78bcf060d1bd6945b08916eba1529a558fe6b2d1
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-inline-simple.html
>@@ -0,0 +1,30 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test inlined module.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+</script>
>+<script>
>+debug('Module is not executed yet.');
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module">
>+import Cocoa from "./script-tests/module-inline-simple.js";
>+var cocoa = new Cocoa();
>+
>+debug("Module execution is confined in the module environment.");
>+shouldBeEqualToString("typeof cocoa", "undefined");
>+
>+window.exportedCocoa = cocoa;
>+shouldBeEqualToString("typeof exportedCocoa", "object");
>+shouldBeEqualToString("exportedCocoa.taste()", "awesome");
>+finishJSTest();
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-load-event-expected.txt b/LayoutTests/js/dom/module-load-event-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..586266802da57c758ce3e4a2f31d7890d0e5b7d5
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-event-expected.txt
>@@ -0,0 +1,11 @@
>+Test module execution order between tags.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Executing an inlined module.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-load-event-with-src-expected.txt b/LayoutTests/js/dom/module-load-event-with-src-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..e8a2f9b99616ff470aee2a45e72bbda6efacd409
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-event-with-src-expected.txt
>@@ -0,0 +1,11 @@
>+Test script.onload will be fired when the module tag with src loads and executes.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Executing a module with src attribute.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-load-event-with-src.html b/LayoutTests/js/dom/module-load-event-with-src.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..494a4a3070a96e6dacbd8b746a77c057a42c56a5
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-event-with-src.html
>@@ -0,0 +1,16 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test script.onload will be fired when the module tag with src loads and executes.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module" onload="finishJSTest()" src="script-tests/module-load-event-with-src.js"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-load-event.html b/LayoutTests/js/dom/module-load-event.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..1bb8c809f2d45cd3f31789afe2df7b30dce1f45d
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-event.html
>@@ -0,0 +1,18 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test module execution order between tags.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module" onload="finishJSTest()">
>+debug('Executing an inlined module.');
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-load-same-module-from-different-entry-point-dynamic-expected.txt b/LayoutTests/js/dom/module-load-same-module-from-different-entry-point-dynamic-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..71ab49d1497624df22e034797b39aa8ec8694ecc
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-same-module-from-different-entry-point-dynamic-expected.txt
>@@ -0,0 +1,13 @@
>+2 different module tag will attempt to load the same module from a dynamically generated tag
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Currently, this is not defined in the spec. This issue should be fixed in the future.
>+Module is not executed yet.
>+Executing module-load-same-module-from-different-entry-point.js.
>+Executing the module.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-load-same-module-from-different-entry-point-dynamic.html b/LayoutTests/js/dom/module-load-same-module-from-different-entry-point-dynamic.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..25d51e2b6cea8617bacf0c40e337e909a1d31a38
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-same-module-from-different-entry-point-dynamic.html
>@@ -0,0 +1,25 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('2 different module tag will attempt to load the same module from a dynamically generated tag');
>+debug('Currently, this is not defined in the spec. This issue should be fixed in the future.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module">
>+import "script-tests/module-load-same-module-from-different-entry-point.js"
>+debug('Executing the module.');
>+var element = document.createElement("script");
>+element.type = "module";
>+element.innerText = "script-tests/module-load-same-module-from-different-entry-point.js";
>+element.onerror = finishJSTest();
>+document.body.appendChild(element);
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-load-same-module-from-different-entry-point-expected.txt b/LayoutTests/js/dom/module-load-same-module-from-different-entry-point-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..b0f98fccb6fafa06447e3032ef06d982027f251d
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-same-module-from-different-entry-point-expected.txt
>@@ -0,0 +1,14 @@
>+2 different module tag will attempt to load the same module
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Currently, this is not defined in the spec. This issue should be fixed in the future.
>+Module is not executed yet.
>+Executing module-load-same-module-from-different-entry-point.js.
>+Executing the module.
>+Executing the module.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-load-same-module-from-different-entry-point.html b/LayoutTests/js/dom/module-load-same-module-from-different-entry-point.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..606d4e0b63cdc01274133befd93844255558b187
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-same-module-from-different-entry-point.html
>@@ -0,0 +1,24 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('2 different module tag will attempt to load the same module');
>+debug('Currently, this is not defined in the spec. This issue should be fixed in the future.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module">
>+import "script-tests/module-load-same-module-from-different-entry-point.js"
>+debug('Executing the module.');
>+</script>
>+<script type="module" onload="finishJSTest()">
>+import "script-tests/module-load-same-module-from-different-entry-point.js"
>+debug('Executing the module.');
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-not-found-error-event-expected.txt b/LayoutTests/js/dom/module-not-found-error-event-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..f38ba3c2e79977e2c9f7934809736fd9837d72f9
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-not-found-error-event-expected.txt
>@@ -0,0 +1,11 @@
>+CONSOLE MESSAGE: line 2: SyntaxError: Unexpected string literal "not-found.js". Expected 'from' before imported module name.
>+Test script.onerror will be fired when the resource specified by the import declaration in the inlined module is not found.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-not-found-error-event-with-src-and-import-expected.txt b/LayoutTests/js/dom/module-not-found-error-event-with-src-and-import-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..748787501a1292768109187907afc47dfb6d2893
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-not-found-error-event-with-src-and-import-expected.txt
>@@ -0,0 +1,10 @@
>+Test script.onerror will be fired when the resource specified by the import declaration in the dependent module is not found.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-not-found-error-event-with-src-and-import.html b/LayoutTests/js/dom/module-not-found-error-event-with-src-and-import.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..def398685ae05a11ce8a1e0b22098e98531d6291
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-not-found-error-event-with-src-and-import.html
>@@ -0,0 +1,21 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test script.onerror will be fired when the resource specified by the import declaration in the dependent module is not found.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+function onError()
>+{
>+    successfullyParsed = true;
>+    finishJSTest()
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module" src="script-tests/module-not-found-error-event-with-src-and-import.js" onerror="onError()"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-not-found-error-event-with-src-expected.txt b/LayoutTests/js/dom/module-not-found-error-event-with-src-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..b80d15dfe6d09bfc6b8583a48dec6dcb1b5b1414
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-not-found-error-event-with-src-expected.txt
>@@ -0,0 +1,10 @@
>+Test script.onerror will be fired when the resource specified by "src" is not found.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-not-found-error-event-with-src.html b/LayoutTests/js/dom/module-not-found-error-event-with-src.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..b6a47f61069afecbcb38b0a9575625ce82df4818
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-not-found-error-event-with-src.html
>@@ -0,0 +1,21 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test script.onerror will be fired when the resource specified by "src" is not found.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+function onError()
>+{
>+    successfullyParsed = true;
>+    finishJSTest()
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module" src="not-found.js" onerror="onError()"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-not-found-error-event.html b/LayoutTests/js/dom/module-not-found-error-event.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..6cb594c646838e4c35e37561f6dce3d83770b771
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-not-found-error-event.html
>@@ -0,0 +1,24 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test script.onerror will be fired when the resource specified by the import declaration in the inlined module is not found.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+function onError()
>+{
>+    successfullyParsed = true;
>+    finishJSTest()
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module" onerror="onError()">
>+import from "not-found.js";
>+testFailed('executed');
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-src-dynamic-expected.txt b/LayoutTests/js/dom/module-src-dynamic-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..3d8b0062490ec72295cff5061a0839e40020cd8a
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-src-dynamic-expected.txt
>@@ -0,0 +1,14 @@
>+Test module with "src" attribute.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Module execution is confined in the module environment.
>+PASS typeof cocoa is "undefined"
>+PASS typeof exportedCocoa is "object"
>+PASS exportedCocoa.taste() is "nice"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-src-dynamic.html b/LayoutTests/js/dom/module-src-dynamic.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..384ff4264f981fe9649ed3a721b1cfa4fa5e91ce
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-src-dynamic.html
>@@ -0,0 +1,24 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test module with "src" attribute.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script>
>+debug('Module is not executed yet.');
>+(function () {
>+    var element = document.createElement('script');
>+    element.type = 'module';
>+    element.src = './script-tests/module-src-dynamic.js';
>+    document.body.appendChild(element);
>+}());
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-src-simple-expected.txt b/LayoutTests/js/dom/module-src-simple-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..3d8b0062490ec72295cff5061a0839e40020cd8a
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-src-simple-expected.txt
>@@ -0,0 +1,14 @@
>+Test module with "src" attribute.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Module execution is confined in the module environment.
>+PASS typeof cocoa is "undefined"
>+PASS typeof exportedCocoa is "object"
>+PASS exportedCocoa.taste() is "nice"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-src-simple.html b/LayoutTests/js/dom/module-src-simple.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3f73b0c54a25a4f76c14a3b5dc3173fe893cb3cd
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-src-simple.html
>@@ -0,0 +1,19 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test module with "src" attribute.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+</script>
>+<script>
>+debug('Module is not executed yet.');
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module" src="./script-tests/module-src-simple.js"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-will-fire-beforeload-expected.txt b/LayoutTests/js/dom/module-will-fire-beforeload-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..3a8d9708db3e05c4b0103be7dceb0c0071175c75
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-will-fire-beforeload-expected.txt
>@@ -0,0 +1,10 @@
>+Test script.beforeload will be fired when the module tag with src is prepared.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-will-fire-beforeload.html b/LayoutTests/js/dom/module-will-fire-beforeload.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..bfbff1653d06c06e1d74179d0110036e149d8690
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-will-fire-beforeload.html
>@@ -0,0 +1,16 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test script.beforeload will be fired when the module tag with src is prepared.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module" onbeforeload="finishJSTest()" src="script-tests/module-will-fire-beforeload.js"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js b/LayoutTests/js/dom/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..c6c15af2142b4802602ead03700f8bbe01bc2bec
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js
>@@ -0,0 +1,2 @@
>+debug("Executing the dependent module");
>+throw new Error("out");
>diff --git a/LayoutTests/js/dom/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js b/LayoutTests/js/dom/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..d6c7ca479b25889b00ca24cd5bbe331daa65f719
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js
>@@ -0,0 +1,2 @@
>+import "module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js"
>+testFailed("executed");
>diff --git a/LayoutTests/js/dom/script-tests/module-execution-order-mixed-2.js b/LayoutTests/js/dom/script-tests/module-execution-order-mixed-2.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..e33b9d352aec57b061ddbe00b7cf94ea574aec49
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-execution-order-mixed-2.js
>@@ -0,0 +1 @@
>+shouldBe("count++", "5");
>diff --git a/LayoutTests/js/dom/script-tests/module-execution-order-mixed-cappuccino.js b/LayoutTests/js/dom/script-tests/module-execution-order-mixed-cappuccino.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..f3146fd766e55a02ae78baf9dd63398eb85a890e
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-execution-order-mixed-cappuccino.js
>@@ -0,0 +1,3 @@
>+import "module-execution-order-mixed-matcha.js"
>+
>+shouldBe("count++", "2");
>diff --git a/LayoutTests/js/dom/script-tests/module-execution-order-mixed-cocoa.js b/LayoutTests/js/dom/script-tests/module-execution-order-mixed-cocoa.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..158d73243fef30a0b4949dba7fbf8534eeba9f73
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-execution-order-mixed-cocoa.js
>@@ -0,0 +1,3 @@
>+import "module-execution-order-mixed-matcha.js";
>+
>+shouldBe("count++", "1");
>diff --git a/LayoutTests/js/dom/script-tests/module-execution-order-mixed-matcha.js b/LayoutTests/js/dom/script-tests/module-execution-order-mixed-matcha.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..c2e15d7cf0cff4eaa1a0b5a1ee83dcce324a25e9
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-execution-order-mixed-matcha.js
>@@ -0,0 +1 @@
>+shouldBe("count++", "0");
>diff --git a/LayoutTests/js/dom/script-tests/module-execution-order-mixed.js b/LayoutTests/js/dom/script-tests/module-execution-order-mixed.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..44386fbb8681cbf7e59c4737637e87be38cff744
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-execution-order-mixed.js
>@@ -0,0 +1,4 @@
>+import "./module-execution-order-mixed-cocoa.js"
>+import "./module-execution-order-mixed-cappuccino.js"
>+
>+shouldBe("count++", "3");
>diff --git a/LayoutTests/js/dom/script-tests/module-inline-dynamic.js b/LayoutTests/js/dom/script-tests/module-inline-dynamic.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..24360a7bfe7e05a0cb253841367e71dc1e93b5c7
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-inline-dynamic.js
>@@ -0,0 +1,5 @@
>+export default class Cocoa {
>+    taste() {
>+        return "awesome";
>+    }
>+};
>diff --git a/LayoutTests/js/dom/script-tests/module-inline-simple.js b/LayoutTests/js/dom/script-tests/module-inline-simple.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..24360a7bfe7e05a0cb253841367e71dc1e93b5c7
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-inline-simple.js
>@@ -0,0 +1,5 @@
>+export default class Cocoa {
>+    taste() {
>+        return "awesome";
>+    }
>+};
>diff --git a/LayoutTests/js/dom/script-tests/module-load-event-with-src.js b/LayoutTests/js/dom/script-tests/module-load-event-with-src.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..cb870290d3ec7e080c05f9f666844cd067529fdd
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-load-event-with-src.js
>@@ -0,0 +1 @@
>+debug('Executing a module with src attribute.');
>diff --git a/LayoutTests/js/dom/script-tests/module-load-same-module-from-different-entry-point.js b/LayoutTests/js/dom/script-tests/module-load-same-module-from-different-entry-point.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..d5ad77f800804381bf4f1eadb517f560f0c4eb66
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-load-same-module-from-different-entry-point.js
>@@ -0,0 +1 @@
>+debug('Executing module-load-same-module-from-different-entry-point.js.');
>diff --git a/LayoutTests/js/dom/script-tests/module-not-found-error-event-with-src-and-import.js b/LayoutTests/js/dom/script-tests/module-not-found-error-event-with-src-and-import.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..4c1b47148138a0ec4522c227233a3c7413371299
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-not-found-error-event-with-src-and-import.js
>@@ -0,0 +1 @@
>+import "not-found.js"
>diff --git a/LayoutTests/js/dom/script-tests/module-src-dynamic-cocoa.js b/LayoutTests/js/dom/script-tests/module-src-dynamic-cocoa.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..479592dc513cf259841ff9d463904512b0ecb745
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-src-dynamic-cocoa.js
>@@ -0,0 +1,7 @@
>+class Cocoa {
>+    taste() {
>+        return "nice";
>+    }
>+}
>+
>+export default Cocoa;
>diff --git a/LayoutTests/js/dom/script-tests/module-src-dynamic.js b/LayoutTests/js/dom/script-tests/module-src-dynamic.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..b51a7be6b4f1293af59686fe3e57801d2e096c35
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-src-dynamic.js
>@@ -0,0 +1,10 @@
>+import Cocoa from "./module-src-dynamic-cocoa.js";
>+var cocoa = new Cocoa();
>+
>+debug("Module execution is confined in the module environment.");
>+shouldBeEqualToString("typeof cocoa", "undefined");
>+
>+window.exportedCocoa = cocoa;
>+shouldBeEqualToString("typeof exportedCocoa", "object");
>+shouldBeEqualToString("exportedCocoa.taste()", "nice");
>+finishJSTest();
>diff --git a/LayoutTests/js/dom/script-tests/module-src-simple-cocoa.js b/LayoutTests/js/dom/script-tests/module-src-simple-cocoa.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..479592dc513cf259841ff9d463904512b0ecb745
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-src-simple-cocoa.js
>@@ -0,0 +1,7 @@
>+class Cocoa {
>+    taste() {
>+        return "nice";
>+    }
>+}
>+
>+export default Cocoa;
>diff --git a/LayoutTests/js/dom/script-tests/module-src-simple.js b/LayoutTests/js/dom/script-tests/module-src-simple.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..4d9c774fd9e7a5c9d185924044e7a278ad733728
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-src-simple.js
>@@ -0,0 +1,10 @@
>+import Cocoa from "./module-src-simple-cocoa.js";
>+var cocoa = new Cocoa();
>+
>+debug("Module execution is confined in the module environment.");
>+shouldBeEqualToString("typeof cocoa", "undefined");
>+
>+window.exportedCocoa = cocoa;
>+shouldBeEqualToString("typeof exportedCocoa", "object");
>+shouldBeEqualToString("exportedCocoa.taste()", "nice");
>+finishJSTest();
>diff --git a/LayoutTests/js/dom/script-tests/module-will-fire-beforeload.js b/LayoutTests/js/dom/script-tests/module-will-fire-beforeload.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..f0a393835633aec55e5e595729da6919e9c3203b
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-will-fire-beforeload.js
>@@ -0,0 +1 @@
>+testFailed("executed");

Actions: View | Formatted Diff | Diff

Attachments on bug 148897: 260914 | 260987 | 261138 | 261183 | 261547 | 261562 | 261570 | 261672 | 261841 | 261844 | 261852 | 261854 | 261861 | 261880 | 261889 | 261892 | 261893 | 261946 | 286536 | 286556 | 286558 | 287071 | 287124 | 287165 | 287175 | 287176 | 287179 | 287187 | 287223 | 287225 | 287226 | 287227 | 287228 | 287247 | 287253 | 287254 | 287255 | 287257 | 287277 | 287279 | 287292 | 287294 | 287297 | 287300 | 287329 | 287479 | 287504 | 287545 | 287563 | 287596 | 287646 | 287690 | 287698 | 287716 | 287725 | 287727 | 287733 | 287742 | 287743 | 287744 | 287750 | 287764 | 287781 | 287836 | 287843 | 287844 | 287846 | 288049 | 288051 | 288066 | 288389 | 288462 | 291662 | 292487 | 292524 | 293120 | 293531 | 293606 | 294227 | 294478 | 294479 | 294483 | 294488 | 294609 | 294610 | 294611 | 294662 | 294786 | 294802 | 294805 | 294806 | 294813 | 294815 | 294817 | 294818 | 294823 | 294824 | 294826 | 294827 | 294829 | 294830 | 294928 | 294929