Attachment 287504 Details for Bug 148897 – Patch

[patch] Patch

bug-148897-20160831171225.patch (text/plain), 199.73 KB, created by Yusuke Suzuki on 2016-08-31 01:14:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2016-08-31 01:14:37 PDT

Size: 199.73 KB

patch

obsolete

>Subversion Revision: 205224
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index b684b9f9c5ce7cd51278c64cd64b2c91a3473513..50307f66a788d38c7c3b3b6aaff91bd89ced33e2 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,52 @@
>+2016-08-31  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-30  Benjamin Poulain  <bpoulain@apple.com>
> 
>         [JSC] Some arith nodes are too pessimistic with the types supported on the fast path
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index caf092a727c3db6465a5a45ce21edabdf83783f4..483e998830dc5df8fb05b9cbcc20f2c5f86b94dc 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,147 @@
>+2016-08-31  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!).
>+
>+        Use the names, ScriptModuleLoader, ScriptModuleGraph, ScriptModuleFetcher instead of JSModuleLoader etc. in WebCore.
>+        JSModuleXXX is really confusing because it seems that we misunderstood they are JS class.
>+
>+        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/JSModuleLoader.cpp:
>+        (WebCore::JSModuleLoader::JSModuleLoader): Deleted.
>+        (WebCore::JSModuleLoader::resolve): Deleted.
>+        (WebCore::JSModuleLoader::fetch): Deleted.
>+        (WebCore::JSModuleLoader::evaluate): Deleted.
>+        * bindings/js/JSModuleLoader.h:
>+        (WebCore::JSModuleLoader::document): Deleted.
>+        * bindings/js/ScriptController.cpp:
>+        (WebCore::ScriptModuleGraphHolder::create):
>+        (WebCore::ScriptModuleGraphHolder::releaseAndClear):
>+        (WebCore::ScriptModuleGraphHolder::ScriptModuleGraphHolder):
>+        (WebCore::ScriptController::ScriptController):
>+        (WebCore::ScriptController::evaluateInWorld):
>+        (WebCore::handleScriptModuleLoaderError):
>+        (WebCore::ScriptController::loadModuleInWorld):
>+        (WebCore::ScriptController::loadModule):
>+        (WebCore::ScriptController::linkAndEvaluateModuleInWorld):
>+        (WebCore::ScriptController::linkAndEvaluateModule):
>+        (WebCore::ScriptController::evaluateModule):
>+        (WebCore::jsValueToModuleKey):
>+        (WebCore::ScriptController::initScriptModuleGraph):
>+        (WebCore::ScriptController::executeScript):
>+        * bindings/js/ScriptController.h:
>+        (WebCore::ScriptController::moduleLoaderAlreadyReportedErrorSymbol):
>+        * bindings/js/ScriptModuleFetcher.cpp: Added.
>+        (WebCore::ScriptModuleFetcher::ScriptModuleFetcher):
>+        (WebCore::ScriptModuleFetcher::~ScriptModuleFetcher):
>+        (WebCore::ScriptModuleFetcher::create):
>+        (WebCore::ScriptModuleFetcher::run):
>+        (WebCore::ScriptModuleFetcher::notifyFinished):
>+        * bindings/js/ScriptModuleFetcher.h: Copied from Source/WebCore/bindings/js/JSModuleLoader.h.
>+        (WebCore::ScriptModuleFetcher::cachedScript):
>+        * bindings/js/ScriptModuleGraph.cpp: Added.
>+        (WebCore::ScriptModuleGraph::~ScriptModuleGraph):
>+        (WebCore::ScriptModuleGraph::notifyLoaded):
>+        (WebCore::ScriptModuleGraph::notifyErrored):
>+        (WebCore::ScriptModuleGraph::notifyFinished):
>+        (WebCore::ScriptModuleGraph::evaluate):
>+        (WebCore::ScriptModuleGraph::addClient):
>+        (WebCore::ScriptModuleGraph::removeClient):
>+        (WebCore::ScriptModuleGraph::create):
>+        * bindings/js/ScriptModuleGraph.h: Copied from Source/WebCore/bindings/js/JSModuleLoader.h.
>+        (WebCore::ScriptModuleGraph::moduleKey):
>+        (WebCore::ScriptModuleGraph::errorOccurred):
>+        (WebCore::ScriptModuleGraph::isLoaded):
>+        * bindings/js/ScriptModuleGraphClient.h: Copied from Source/WebCore/dom/ScriptRunner.h.
>+        (WebCore::ScriptModuleGraphClient::~ScriptModuleGraphClient):
>+        * bindings/js/ScriptModuleLoader.cpp: Renamed from Source/WebCore/bindings/js/JSModuleLoader.cpp.
>+        (WebCore::ScriptModuleLoader::ScriptModuleLoader):
>+        (WebCore::ScriptModuleLoader::resolve):
>+        (WebCore::ScriptModuleLoader::fetch):
>+        (WebCore::ScriptModuleLoader::evaluate):
>+        (WebCore::ScriptModuleLoader::notifyFinished):
>+        * bindings/js/ScriptModuleLoader.h: Renamed from Source/WebCore/bindings/js/JSModuleLoader.h.
>+        (WebCore::ScriptModuleLoader::document):
>+        * dom/Document.cpp:
>+        (WebCore::Document::Document):
>+        * dom/Document.h:
>+        (WebCore::Document::moduleLoader):
>+        * dom/PendingScript.cpp:
>+        (WebCore::PendingScript::create):
>+        (WebCore::PendingScript::PendingScript):
>+        (WebCore::PendingScript::~PendingScript):
>+        (WebCore::PendingScript::moduleGraph):
>+        (WebCore::PendingScript::notifyFinished):
>+        (WebCore::PendingScript::isLoaded):
>+        (WebCore::PendingScript::errorOccurred):
>+        * dom/PendingScript.h:
>+        * dom/ScriptElement.cpp:
>+        (WebCore::ScriptElement::ScriptElement):
>+        (WebCore::ScriptElement::determineScriptType):
>+        (WebCore::ScriptElement::prepareScript):
>+        (WebCore::ScriptElement::requestCachedScript):
>+        (WebCore::ScriptElement::requestScript):
>+        (WebCore::ScriptElement::requestModuleScript):
>+        (WebCore::ScriptElement::stopLoadRequest):
>+        (WebCore::ScriptElement::execute):
>+        (WebCore::ScriptElement::loadModule):
>+        (WebCore::ScriptElement::notifyFinished):
>+        (WebCore::ScriptElement::failIfCrossOriginScriptLoadIsDenied):
>+        * dom/ScriptElement.h:
>+        (WebCore::ScriptElement::moduleGraph):
>+        (WebCore::ScriptElement::scriptType):
>+        (WebCore::ScriptElement::cachedScript): Deleted.
>+        * dom/ScriptRunner.cpp:
>+        (WebCore::ScriptRunner::queueScriptModuleGraphForExecution):
>+        (WebCore::ScriptRunner::timerFired):
>+        * dom/ScriptRunner.h:
>+        * html/parser/HTMLPreloadScanner.cpp:
>+        (WebCore::TokenPreloadScanner::StartTagScanner::StartTagScanner):
>+        (WebCore::TokenPreloadScanner::StartTagScanner::createPreloadRequest):
>+        (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
>+        * html/parser/HTMLScriptRunner.cpp:
>+        (WebCore::createScriptLoadEvent):
>+        (WebCore::executePendingScript):
>+        (WebCore::HTMLScriptRunner::executePendingScriptAndDispatchEvent):
>+        (WebCore::requestPendingScript):
>+        (WebCore::HTMLScriptRunner::sourceFromPendingScript): Deleted.
>+        * html/parser/HTMLScriptRunner.h:
>+        * loader/cache/CachedScript.cpp:
>+        (WebCore::CachedScript::mimeTypeAllowedByNosniff):
>+        * loader/cache/CachedScript.h:
>+        * platform/network/HTTPParsers.cpp:
>+        (WebCore::parseContentTypeOptionsHeader):
>+        * platform/network/HTTPParsers.h:
>+
> 2016-08-30  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Add "get" to CustomElementsRegistry
>diff --git a/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js b/Source/JavaScriptCore/builtins/ModuleLoaderPrototype.js
>index 6a3bc82430ef18abae634d0f12e620fbce09b332..81e4e7fa1d719484e70ba13ba120166583e18e6c 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
> 
>@@ -411,32 +406,30 @@ function requestLink(key)
>     var entry = this.ensureRegistered(key);
>     if (entry.state > @ModuleLink) {
>         var deferred = @newPromiseCapability(@InternalPromise);
>-        deferred.@resolve.@call(@undefined, entry.module);
>+        deferred.@resolve.@call(@undefined, entry);
>         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.
>@@ -495,14 +488,14 @@ function provide(key, stage, value)
>     var entry = this.ensureRegistered(key);
> 
>     if (stage === @ModuleFetch) {
>-        if (entry.status > @ModuleFetch)
>+        if (entry.state > @ModuleFetch)
>             throw new @TypeError("Requested module is already fetched.");
>         this.fulfillFetch(entry, value);
>         return;
>     }
> 
>     if (stage === @ModuleTranslate) {
>-        if (entry.status > @ModuleTranslate)
>+        if (entry.state > @ModuleTranslate)
>             throw new @TypeError("Requested module is already translated.");
>         this.fulfillFetch(entry, @undefined);
>         this.fulfillTranslate(entry, value);
>@@ -510,13 +503,12 @@ function provide(key, stage, value)
>     }
> 
>     if (stage === @ModuleInstantiate) {
>-        if (entry.status > @ModuleInstantiate)
>+        if (entry.state > @ModuleInstantiate)
>             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,42 @@ 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);
>+    var entry = this.ensureRegistered(key);
>+    if (entry.state < @ModuleLink)
>+        throw new @TypeError("Requested module is not instantiated yet.");
>+
>+    this.link(entry, initiator);
>+    return this.moduleEvaluation(entry.module, initiator);
> }
>diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp
>index 3a250782fa53a607180e6d100604657306278065..8e9a5e11a0bfb5f1e19f3018d20ac396de2edee4 100644
>--- a/Source/JavaScriptCore/jsc.cpp
>+++ b/Source/JavaScriptCore/jsc.cpp
>@@ -891,8 +891,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) };
>@@ -1023,7 +1023,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);
>@@ -1128,7 +1128,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..4a30d45c2a7a69a7d3a2870d9e6576db9e47fd90 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());
>@@ -222,21 +222,22 @@ JSInternalPromise* loadModule(ExecState* exec, const SourceCode& source)
>     JSGlobalObject* globalObject = exec->vmEntryGlobalObject();
> 
>     // Insert the given source code to the ModuleLoader registry as the fetched registry entry.
>+    // FIXME: Introduce JSSourceCode object to wrap around this source.
>     globalObject->moduleLoader()->provide(exec, key, JSModuleLoader::Status::Fetch, source.view().toString());
>     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)
>+JSValue 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..ae3a91a04867f0c11b9f45d6c17bf79a25bc8b0f 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 JSValue 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..1090f8c183859ecf6038b56f3dea27954ed65f29 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)
>+JSValue 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));
>+    return 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..3b50d615dd3f3beca4b929db5e9ec6e37fb64b32 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);
>+    JSValue 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 9ad3c4cd6167160f7722e8ce71823b5b65a1ba28..af9968c4fa874292030e4f1bdb7bc771be91838d 100644
>--- a/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp
>+++ b/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp
>@@ -183,7 +183,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)
>@@ -196,7 +196,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)
>@@ -208,7 +208,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)
>@@ -222,7 +222,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 ---------------------------
>@@ -235,7 +235,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..05c70968cf88f544c9ec1255d377efc8ea473e5e 100644
>--- a/Source/JavaScriptCore/runtime/Symbol.h
>+++ b/Source/JavaScriptCore/runtime/Symbol.h
>@@ -49,7 +49,7 @@ class Symbol final : public JSCell {
> 
>     static Symbol* create(VM&);
>     static Symbol* create(ExecState*, JSString* description);
>-    static Symbol* create(VM&, SymbolImpl& uid);
>+    JS_EXPORT_PRIVATE static Symbol* create(VM&, SymbolImpl& uid);
> 
>     const PrivateName& privateName() const { return m_privateName; }
>     String descriptiveString() const;
>@@ -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 6f4d08cd051a189e259a519efcd914651d00d5b6..61570255ca9bbf87ff3edb825ef2ceaf1d74bf6e 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1208,7 +1208,6 @@ set(WebCore_SOURCES
>     bindings/js/JSMessageChannelCustom.cpp
>     bindings/js/JSMessageEventCustom.cpp
>     bindings/js/JSMessagePortCustom.cpp
>-    bindings/js/JSModuleLoader.cpp
>     bindings/js/JSMutationCallback.cpp
>     bindings/js/JSMutationObserverCustom.cpp
>     bindings/js/JSNamedNodeMapCustom.cpp
>@@ -1257,6 +1256,9 @@ set(WebCore_SOURCES
>     bindings/js/ScriptCachedFrameData.cpp
>     bindings/js/ScriptController.cpp
>     bindings/js/ScriptGlobalObject.cpp
>+    bindings/js/ScriptModuleFetcher.cpp
>+    bindings/js/ScriptModuleGraph.cpp
>+    bindings/js/ScriptModuleLoader.cpp
>     bindings/js/ScriptState.cpp
>     bindings/js/StructuredClone.cpp
>     bindings/js/SerializedScriptValue.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index cd2addb01c9034719c173e69efca7f9fb0e9a610..09c8824ebd2554316ea55e9b72d43b24576beb4b 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -6089,9 +6089,14 @@
> 		E1FF57A60F01256B00891EBB /* ThreadGlobalData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */; };
> 		E1FF8F6C180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F6A180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp */; };
> 		E1FF8F6D180DB5BE00132674 /* CryptoAlgorithmRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF8F6B180DB5BE00132674 /* CryptoAlgorithmRegistry.h */; };
>-		E38838981BAD145F00D62EE3 /* JSModuleLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38838941BAD145F00D62EE3 /* JSModuleLoader.cpp */; };
>-		E38838991BAD145F00D62EE3 /* JSModuleLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E38838951BAD145F00D62EE3 /* JSModuleLoader.h */; };
>+		E34E49871D70A54F00646139 /* ScriptModuleGraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E34E49851D70A52B00646139 /* ScriptModuleGraph.cpp */; };
>+		E34E49881D70A55100646139 /* ScriptModuleFetcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E34E49831D70A52B00646139 /* ScriptModuleFetcher.cpp */; };
>+		E34E49891D70A55900646139 /* ScriptModuleGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = E34E49861D70A52B00646139 /* ScriptModuleGraph.h */; };
>+		E34E498A1D70A55C00646139 /* ScriptModuleFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E34E49841D70A52B00646139 /* ScriptModuleFetcher.h */; };
>+		E38838981BAD145F00D62EE3 /* ScriptModuleLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38838941BAD145F00D62EE3 /* ScriptModuleLoader.cpp */; };
>+		E38838991BAD145F00D62EE3 /* ScriptModuleLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E38838951BAD145F00D62EE3 /* ScriptModuleLoader.h */; };
> 		E3FA38641D71812D00AA5950 /* PendingScriptClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E3FA38611D716E7600AA5950 /* PendingScriptClient.h */; };
>+		E3FA38661D7182DA00AA5950 /* ScriptModuleGraphClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E3FA38651D7182D500AA5950 /* ScriptModuleGraphClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		E401C27517CE53EC00C41A35 /* ElementIteratorAssertions.h in Headers */ = {isa = PBXBuildFile; fileRef = E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		E401E0A41C3C0B8300F34D10 /* StyleChange.h in Headers */ = {isa = PBXBuildFile; fileRef = E401E0A31C3C0B8300F34D10 /* StyleChange.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		E401E0A61C3C0CF700F34D10 /* StyleChange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E401E0A51C3C0CF700F34D10 /* StyleChange.cpp */; };
>@@ -13656,9 +13661,14 @@
> 		E1FF8F661807460800132674 /* JSWebKitSubtleCryptoCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitSubtleCryptoCustom.cpp; sourceTree = "<group>"; };
> 		E1FF8F6A180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRegistry.cpp; sourceTree = "<group>"; };
> 		E1FF8F6B180DB5BE00132674 /* CryptoAlgorithmRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmRegistry.h; sourceTree = "<group>"; };
>-		E38838941BAD145F00D62EE3 /* JSModuleLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSModuleLoader.cpp; sourceTree = "<group>"; };
>-		E38838951BAD145F00D62EE3 /* JSModuleLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSModuleLoader.h; sourceTree = "<group>"; };
>+		E34E49831D70A52B00646139 /* ScriptModuleFetcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptModuleFetcher.cpp; sourceTree = "<group>"; };
>+		E34E49841D70A52B00646139 /* ScriptModuleFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptModuleFetcher.h; sourceTree = "<group>"; };
>+		E34E49851D70A52B00646139 /* ScriptModuleGraph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptModuleGraph.cpp; sourceTree = "<group>"; };
>+		E34E49861D70A52B00646139 /* ScriptModuleGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptModuleGraph.h; sourceTree = "<group>"; };
>+		E38838941BAD145F00D62EE3 /* ScriptModuleLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptModuleLoader.cpp; sourceTree = "<group>"; };
>+		E38838951BAD145F00D62EE3 /* ScriptModuleLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptModuleLoader.h; sourceTree = "<group>"; };
> 		E3FA38611D716E7600AA5950 /* PendingScriptClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PendingScriptClient.h; sourceTree = "<group>"; };
>+		E3FA38651D7182D500AA5950 /* ScriptModuleGraphClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptModuleGraphClient.h; sourceTree = "<group>"; };
> 		E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementIteratorAssertions.h; sourceTree = "<group>"; };
> 		E401E0A31C3C0B8300F34D10 /* StyleChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleChange.h; sourceTree = "<group>"; };
> 		E401E0A51C3C0CF700F34D10 /* StyleChange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleChange.cpp; sourceTree = "<group>"; };
>@@ -20969,8 +20979,13 @@
> 				8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */,
> 				8F934D831189F1EE00508D5D /* JSMainThreadExecState.h */,
> 				B56576E417DA599F00A56BDC /* JSMainThreadExecStateInstrumentation.h */,
>-				E38838941BAD145F00D62EE3 /* JSModuleLoader.cpp */,
>-				E38838951BAD145F00D62EE3 /* JSModuleLoader.h */,
>+				E34E49831D70A52B00646139 /* ScriptModuleFetcher.cpp */,
>+				E34E49841D70A52B00646139 /* ScriptModuleFetcher.h */,
>+				E3FA38651D7182D500AA5950 /* ScriptModuleGraphClient.h */,
>+				E34E49851D70A52B00646139 /* ScriptModuleGraph.cpp */,
>+				E34E49861D70A52B00646139 /* ScriptModuleGraph.h */,
>+				E38838941BAD145F00D62EE3 /* ScriptModuleLoader.cpp */,
>+				E38838951BAD145F00D62EE3 /* ScriptModuleLoader.h */,
> 				C6F420A016B7164E0052A9F2 /* JSMutationCallback.cpp */,
> 				C6F420A116B7164E0052A9F2 /* JSMutationCallback.h */,
> 				7C91A38D1B498ABE003F9EFA /* JSNodeOrString.cpp */,
>@@ -25084,7 +25099,7 @@
> 				E1ADEDDA0E76BD93004A1A5E /* JSMessagePort.h in Headers */,
> 				41F584C7104652CB009CAA64 /* JSMessagePortCustom.h in Headers */,
> 				2D6F3E951C1F85550061DBD4 /* JSMockPageOverlay.h in Headers */,
>-				E38838991BAD145F00D62EE3 /* JSModuleLoader.h in Headers */,
>+				E38838991BAD145F00D62EE3 /* ScriptModuleLoader.h in Headers */,
> 				A86629D109DA2B48009633A5 /* JSMouseEvent.h in Headers */,
> 				C6F420A316B7164E0052A9F2 /* JSMutationCallback.h in Headers */,
> 				65DF31FC09D1CC60000BE325 /* JSMutationEvent.h in Headers */,
>@@ -25464,6 +25479,7 @@
> 				985BB96E13A94058007A0B69 /* LinkRelAttribute.h in Headers */,
> 				BC7FA6210D1F0CBD00DB22A9 /* LiveNodeList.h in Headers */,
> 				9759E94914EF1D490026A2DD /* LoadableTextTrack.h in Headers */,
>+				E3FA38661D7182DA00AA5950 /* ScriptModuleGraphClient.h in Headers */,
> 				656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */,
> 				7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */,
> 				51E6821016387302003BBF3C /* LoaderStrategy.h in Headers */,
>@@ -25550,6 +25566,7 @@
> 				CE1252411A16B1B600864480 /* MediaPlayerSPI.h in Headers */,
> 				52E2CAFC19FF0207001EEB4F /* MediaProducer.h in Headers */,
> 				4E19592A0A39DACC00220FE5 /* MediaQuery.h in Headers */,
>+				E38838991BAD145F00D62EE3 /* ScriptModuleLoader.h in Headers */,
> 				4E19592C0A39DACC00220FE5 /* MediaQueryEvaluator.h in Headers */,
> 				4E19592E0A39DACC00220FE5 /* MediaQueryExp.h in Headers */,
> 				D3A94A39122DABAC00A37BBC /* MediaQueryList.h in Headers */,
>@@ -25701,6 +25718,7 @@
> 				9BB737651B41C03500AE13EB /* NSAttributedStringSPI.h in Headers */,
> 				31B313DF1B6988C500F2AABC /* NSButtonCellSPI.h in Headers */,
> 				CE1252511A1BEBD800864480 /* NSCalendarDateSPI.h in Headers */,
>+				E34E49891D70A55900646139 /* ScriptModuleGraph.h in Headers */,
> 				31DF63571AF187DD0078FD91 /* NSColorSPI.h in Headers */,
> 				2DB9C4AA1B3231F40070F27F /* NSEventSPI.h in Headers */,
> 				2DDB97F419F9AECA002025D8 /* NSExtensionSPI.h in Headers */,
>@@ -26184,6 +26202,7 @@
> 				41F066E40F64BCF600A07EAC /* ScriptGlobalObject.h in Headers */,
> 				FD31603612B0267600C1A359 /* ScriptProcessorNode.h in Headers */,
> 				8A413AE01207BBA50082016E /* ScriptRunner.h in Headers */,
>+				E34E498A1D70A55C00646139 /* ScriptModuleFetcher.h in Headers */,
> 				934CC10A0EDB223900A658F2 /* ScriptSourceCode.h in Headers */,
> 				41C760B10EDE03D300C1655F /* ScriptState.h in Headers */,
> 				228C284510D82500009D0D0E /* ScriptWrappable.h in Headers */,
>@@ -28763,7 +28782,7 @@
> 				410B7E721045FAB000D8224F /* JSMessageEventCustom.cpp in Sources */,
> 				E1ADEDDB0E76BD93004A1A5E /* JSMessagePort.cpp in Sources */,
> 				E1ADED470E76B8DD004A1A5E /* JSMessagePortCustom.cpp in Sources */,
>-				E38838981BAD145F00D62EE3 /* JSModuleLoader.cpp in Sources */,
>+				E38838981BAD145F00D62EE3 /* ScriptModuleLoader.cpp in Sources */,
> 				A86629D209DA2B48009633A5 /* JSMouseEvent.cpp in Sources */,
> 				C6F420A216B7164E0052A9F2 /* JSMutationCallback.cpp in Sources */,
> 				65DF31FB09D1CC60000BE325 /* JSMutationEvent.cpp in Sources */,
>@@ -28985,6 +29004,7 @@
> 				B2FA3DD80AB75A6F000E5AC4 /* JSSVGPathSegLinetoVerticalRel.cpp in Sources */,
> 				B2FA3DDA0AB75A6F000E5AC4 /* JSSVGPathSegList.cpp in Sources */,
> 				B2FA3DDC0AB75A6F000E5AC4 /* JSSVGPathSegMovetoAbs.cpp in Sources */,
>+				E34E49881D70A55100646139 /* ScriptModuleFetcher.cpp in Sources */,
> 				B2FA3DDE0AB75A6F000E5AC4 /* JSSVGPathSegMovetoRel.cpp in Sources */,
> 				B2FA3DE00AB75A6F000E5AC4 /* JSSVGPatternElement.cpp in Sources */,
> 				8542A7960AE5C94200DF58DF /* JSSVGPoint.cpp in Sources */,
>@@ -29771,6 +29791,7 @@
> 				0FEA3E87191B3BD7000F1B55 /* ScrollingTreeFrameScrollingNode.cpp in Sources */,
> 				0FC4E412187F82E10045882C /* ScrollingTreeFrameScrollingNodeIOS.mm in Sources */,
> 				93C4A4161629DF5A00C3EB6E /* ScrollingTreeFrameScrollingNodeMac.mm in Sources */,
>+				E34E49871D70A54F00646139 /* ScriptModuleGraph.cpp in Sources */,
> 				0FC4E40F187F82E10045882C /* ScrollingTreeIOS.cpp in Sources */,
> 				0FE5806319327A6200DE32EB /* ScrollingTreeMac.cpp in Sources */,
> 				1AAADDE314DC8C8F00AF64B3 /* ScrollingTreeNode.cpp in Sources */,
>diff --git a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>index c41bc7d947ca68fd0c49cf1ca49171a7a10a9ac2..602c38307fb7e1a6df84f374270e38d569fd9deb 100644
>--- a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>+++ b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>@@ -107,7 +107,6 @@
> #include "JSMessageChannelCustom.cpp"
> #include "JSMessageEventCustom.cpp"
> #include "JSMessagePortCustom.cpp"
>-#include "JSModuleLoader.cpp"
> #include "JSMutationCallback.cpp"
> #include "JSMutationObserverCustom.cpp"
> #include "JSNamedNodeMapCustom.cpp"
>@@ -147,6 +146,9 @@
> #include "ScriptCachedFrameData.cpp"
> #include "ScriptController.cpp"
> #include "ScriptGlobalObject.cpp"
>+#include "ScriptModuleFetcher.cpp"
>+#include "ScriptModuleGraph.cpp"
>+#include "ScriptModuleLoader.cpp"
> #include "ScriptState.cpp"
> #include "SerializedScriptValue.cpp"
> #include "WebCoreTypedArrayController.cpp"
>diff --git a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp b/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>index 69074f7235cac2fbe146623de1cdaf0679629231..0801dc507fc3b326e123f0f1abcd1e782b762a50 100644
>--- a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>+++ b/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>@@ -32,13 +32,13 @@
> #include "JSDOMGlobalObjectTask.h"
> #include "JSDOMWindowCustom.h"
> #include "JSMainThreadExecState.h"
>-#include "JSModuleLoader.h"
> #include "JSNode.h"
> #include "Language.h"
> #include "Logging.h"
> #include "Page.h"
> #include "RuntimeApplicationChecks.h"
> #include "ScriptController.h"
>+#include "ScriptModuleLoader.h"
> #include "SecurityOrigin.h"
> #include "Settings.h"
> #include "WebCoreJSClientData.h"
>@@ -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..1204229eb9af4ebdc182c5d379f4eb2d8fd688e6 100644
>--- a/Source/WebCore/bindings/js/JSMainThreadExecState.h
>+++ b/Source/WebCore/bindings/js/JSMainThreadExecState.h
>@@ -92,6 +92,30 @@ 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::JSValue linkAndEvaluateModule(JSC::ExecState* exec, const JSC::Identifier& moduleKey, JSC::JSValue initiator, NakedPtr<JSC::Exception>& returnedException)
>+    {
>+        JSMainThreadExecState currentState(exec);
>+        JSC::JSValue returnValue = JSC::linkAndEvaluateModule(exec, moduleKey, initiator);
>+        if (exec->hadException()) {
>+            returnedException = exec->vm().exception();
>+            exec->clearException();
>+            return JSC::jsUndefined();
>+        }
>+        return returnValue;
>+    }
>+
>     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/JSModuleLoader.cpp b/Source/WebCore/bindings/js/JSModuleLoader.cpp
>deleted file mode 100644
>index f11b24499f3ab4012912623981fe1d788dfe07d4..0000000000000000000000000000000000000000
>--- a/Source/WebCore/bindings/js/JSModuleLoader.cpp
>+++ /dev/null
>@@ -1,132 +0,0 @@
>-/*
>- * Copyright (C) 2015, 2016 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 "JSModuleLoader.h"
>-
>-#include "Document.h"
>-#include "ExceptionCode.h"
>-#include "Frame.h"
>-#include "JSDOMBinding.h"
>-#include <runtime/JSInternalPromiseDeferred.h>
>-#include <runtime/JSModuleRecord.h>
>-#include <runtime/JSString.h>
>-#include <runtime/Symbol.h>
>-
>-namespace WebCore {
>-
>-JSModuleLoader::JSModuleLoader(Document& document)
>-    : m_document(document)
>-{
>-}
>-
>-JSC::JSInternalPromise* JSModuleLoader::resolve(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleNameValue, JSC::JSValue importerModuleKey)
>-{
>-    JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>-
>-    // We use a Symbol as a special purpose; It means this module is an inline module.
>-    // So there is no correct URL to retrieve the module source code. If the module name
>-    // value is a Symbol, it is used directly as a module key.
>-    //
>-    // FIXME: Using symbols for an inline module is a current implementation details of WebKit.
>-    // Once the spec of this part is specified, we will recast these part.
>-    if (moduleNameValue.isSymbol())
>-        return deferred->resolve(exec, moduleNameValue);
>-
>-    if (!moduleNameValue.isString())
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Module name is not Symbol or String."));
>-
>-    String moduleName = asString(moduleNameValue)->value(exec);
>-
>-    // Now, we consider the given moduleName as the same to the `import "..."` in the module code.
>-    // We use the completed URL as the unique module key.
>-    URL completedUrl;
>-
>-    if (importerModuleKey.isSymbol())
>-        completedUrl = m_document.completeURL(moduleName);
>-    else if (importerModuleKey.isUndefined())
>-        completedUrl = m_document.completeURL(moduleName);
>-    else if (importerModuleKey.isString()) {
>-        URL importerModuleUrl(URL(), asString(importerModuleKey)->value(exec));
>-        if (!importerModuleUrl.isValid())
>-            return deferred->reject(exec, JSC::createTypeError(exec, "Importer module key is an invalid URL."));
>-        completedUrl = m_document.completeURL(moduleName, importerModuleUrl);
>-    } else
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Importer module key is not Symbol or String."));
>-
>-    if (!completedUrl.isValid())
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Module name constructs an invalid URL."));
>-
>-    return deferred->resolve(exec, jsString(exec, completedUrl.string()));
>-}
>-
>-JSC::JSInternalPromise* JSModuleLoader::fetch(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue)
>-{
>-    JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>-
>-    if (moduleKeyValue.isSymbol())
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Symbol module key should be already fulfilled with the inlined resource."));
>-
>-    if (!moduleKeyValue.isString())
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Module key is not Symbol or String."));
>-
>-    URL completedUrl(URL(), asString(moduleKeyValue)->value(exec));
>-    if (!completedUrl.isValid())
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Module key is an invalid URL."));
>-
>-    // FIXME: Implement the module fetcher.
>-
>-    return deferred->promise();
>-}
>-
>-JSC::JSValue JSModuleLoader::evaluate(JSC::JSGlobalObject*, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue, JSC::JSValue moduleRecordValue)
>-{
>-    JSC::VM& vm = exec->vm();
>-    auto scope = DECLARE_THROW_SCOPE(vm);
>-
>-    // FIXME: Currently, we only support JSModuleRecord.
>-    // Once the reflective part of the module loader is supported, we will handle arbitrary values.
>-    // https://whatwg.github.io/loader/#registry-prototype-provide
>-    JSC::JSModuleRecord* moduleRecord = JSC::jsDynamicCast<JSC::JSModuleRecord*>(moduleRecordValue);
>-    if (!moduleRecord)
>-        return JSC::jsUndefined();
>-
>-    URL sourceUrl;
>-    if (moduleKeyValue.isSymbol())
>-        sourceUrl = m_document.url();
>-    else if (moduleKeyValue.isString())
>-        sourceUrl = URL(URL(), asString(moduleKeyValue)->value(exec));
>-    else
>-        return JSC::throwTypeError(exec, scope, ASCIILiteral("Module key is not Symbol or String."));
>-
>-    if (!sourceUrl.isValid())
>-        return JSC::throwTypeError(exec, scope, ASCIILiteral("Module key is an invalid URL."));
>-
>-    // FIXME: Implement evaluating module code.
>-
>-    return JSC::jsUndefined();
>-}
>-
>-}
>diff --git a/Source/WebCore/bindings/js/JSModuleLoader.h b/Source/WebCore/bindings/js/JSModuleLoader.h
>deleted file mode 100644
>index 69a501a5ae53a56214c5cc59cecb3190076fe1fd..0000000000000000000000000000000000000000
>--- a/Source/WebCore/bindings/js/JSModuleLoader.h
>+++ /dev/null
>@@ -1,59 +0,0 @@
>-/*
>- * 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.
>- */
>-
>-#pragma once
>-
>-#include <runtime/JSCJSValue.h>
>-#include <wtf/Noncopyable.h>
>-
>-namespace JSC {
>-
>-class ExecState;
>-class JSGlobalObject;
>-class JSInternalPromise;
>-class JSModuleLoader;
>-
>-}
>-
>-namespace WebCore {
>-
>-class Document;
>-
>-class JSModuleLoader {
>-    WTF_MAKE_NONCOPYABLE(JSModuleLoader); WTF_MAKE_FAST_ALLOCATED;
>-public:
>-    explicit JSModuleLoader(Document&);
>-
>-    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);
>-
>-private:
>-    Document& m_document;
>-};
>-
>-} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/ScriptController.cpp b/Source/WebCore/bindings/js/ScriptController.cpp
>index 688397a05c78010ccea2495d2303909517c4e609..fa4fd3a0a8388166d1ac75865fa23c35a32ef71a 100644
>--- a/Source/WebCore/bindings/js/ScriptController.cpp
>+++ b/Source/WebCore/bindings/js/ScriptController.cpp
>@@ -41,6 +41,8 @@
> #include "PageConsoleClient.h"
> #include "PageGroup.h"
> #include "PluginViewBase.h"
>+#include "ScriptElement.h"
>+#include "ScriptModuleGraph.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>
> 
>@@ -61,6 +67,27 @@ using namespace JSC;
> 
> namespace WebCore {
> 
>+class ScriptModuleGraphHolder : public RefCounted<ScriptModuleGraphHolder> {
>+public:
>+    static Ref<ScriptModuleGraphHolder> create(ScriptModuleGraph& moduleGraph)
>+    {
>+        return adoptRef(*new ScriptModuleGraphHolder(moduleGraph));
>+    }
>+
>+    RefPtr<ScriptModuleGraph> releaseAndClear()
>+    {
>+        return std::exchange(m_moduleGraph, nullptr);
>+    }
>+
>+private:
>+    ScriptModuleGraphHolder(ScriptModuleGraph& moduleGraph)
>+        : m_moduleGraph(&moduleGraph)
>+    {
>+    }
>+
>+    RefPtr<ScriptModuleGraph> m_moduleGraph;
>+};
>+
> static void collectGarbageAfterWindowShellDestruction()
> {
>     // Make sure to GC Extra Soon(tm) during memory pressure conditions
>@@ -85,6 +112,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 +183,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 +207,104 @@ JSValue ScriptController::evaluate(const ScriptSourceCode& sourceCode, Exception
>     return evaluateInWorld(sourceCode, mainThreadNormalWorld(), exceptionDetails);
> }
> 
>+static void handleScriptModuleLoaderError(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(ScriptModuleGraph& moduleGraph, const String& moduleName, DOMWrapperWorld& world, Element& element)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    initScriptModuleGraph(moduleGraph, JSMainThreadExecState::loadModule(exec, moduleName, toJS(exec, shell->window(), &element)), world);
>+}
>+
>+void ScriptController::loadModule(ScriptModuleGraph& moduleGraph, const String& moduleName, Element& element)
>+{
>+    loadModuleInWorld(moduleGraph, moduleName, mainThreadNormalWorld(), element);
>+}
>+
>+void ScriptController::loadModuleInWorld(ScriptModuleGraph& moduleGraph, const ScriptSourceCode& sourceCode, DOMWrapperWorld& world, Element& element)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    initScriptModuleGraph(moduleGraph, JSMainThreadExecState::loadModule(exec, sourceCode.jsSourceCode(), toJS(exec, shell->window(), &element)), world);
>+}
>+
>+void ScriptController::loadModule(ScriptModuleGraph& moduleGraph, const ScriptSourceCode& sourceCode, Element& element)
>+{
>+    loadModuleInWorld(moduleGraph, sourceCode, mainThreadNormalWorld(), element);
>+}
>+
>+JSC::JSValue ScriptController::linkAndEvaluateModuleInWorld(ScriptModuleGraph& moduleGraph, DOMWrapperWorld& world, Element& element)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    Ref<Frame> protector(m_frame);
>+
>+    NakedPtr<Exception> evaluationException;
>+    JSValue returnValue = JSMainThreadExecState::linkAndEvaluateModule(exec, Identifier::fromUid(&exec->vm(), moduleGraph.moduleKey()), toJS(exec, shell->window(), &element), evaluationException);
>+    if (evaluationException) {
>+        reportException(exec, evaluationException, nullptr);
>+        return jsUndefined();
>+    }
>+    return returnValue;
>+}
>+
>+JSC::JSValue ScriptController::linkAndEvaluateModule(ScriptModuleGraph& moduleGraph, Element& element)
>+{
>+    return 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);
>+    InspectorInstrumentation::didEvaluateScript(cookie, m_frame);
>+
>+    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 +385,40 @@ 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::initScriptModuleGraph(ScriptModuleGraph& moduleGraph, JSInternalPromise* promise, DOMWrapperWorld& world)
>+{
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    RefPtr<ScriptModuleGraphHolder> protector = ScriptModuleGraphHolder::create(moduleGraph);
>+
>+    JSFunction* fulfillHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [protector](ExecState* exec) {
>+        if (RefPtr<ScriptModuleGraph> moduleGraph = protector->releaseAndClear()) {
>+            Identifier moduleKey = jsValueToModuleKey(exec, exec->argument(0));
>+            moduleGraph->notifyLoaded(moduleKey.impl());
>+        }
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    PrivateName moduleLoaderAlreadyReportedErrorSymbol = m_moduleLoaderAlreadyReportedErrorSymbol;
>+    JSFunction* rejectHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [moduleLoaderAlreadyReportedErrorSymbol, protector](ExecState* exec) {
>+        if (RefPtr<ScriptModuleGraph> moduleGraph = protector->releaseAndClear())
>+            moduleGraph->notifyErrored();
>+        handleScriptModuleLoaderError(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 +680,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..8bd631dd461ec6745b1d7632e2291dd9a8422209 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 ScriptModuleGraph;
> 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(ScriptModuleGraph&, const String& moduleName, DOMWrapperWorld&, Element&);
>+    void loadModule(ScriptModuleGraph&, const String& moduleName, Element&);
>+    void loadModuleInWorld(ScriptModuleGraph&, const ScriptSourceCode&, DOMWrapperWorld&, Element&);
>+    void loadModule(ScriptModuleGraph&, const ScriptSourceCode&, Element&);
>+
>+    JSC::JSValue linkAndEvaluateModuleInWorld(ScriptModuleGraph& , DOMWrapperWorld&, Element&);
>+    JSC::JSValue linkAndEvaluateModule(ScriptModuleGraph&, 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 initScriptModuleGraph(ScriptModuleGraph&, 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/bindings/js/ScriptModuleFetcher.cpp b/Source/WebCore/bindings/js/ScriptModuleFetcher.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..0c516645e417b3151aed3cd60100f3f42f378a21
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ScriptModuleFetcher.cpp
>@@ -0,0 +1,138 @@
>+/*
>+ * Copyright (C) 2015-2016 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 "ScriptModuleFetcher.h"
>+
>+#include "CachedResourceLoader.h"
>+#include "CachedScript.h"
>+#include "DOMWrapperWorld.h"
>+#include "Frame.h"
>+#include "JSDOMBinding.h"
>+#include "ResourceLoaderOptions.h"
>+#include "ScriptController.h"
>+#include "ScriptModuleLoader.h"
>+#include "ScriptSourceCode.h"
>+
>+namespace WebCore {
>+
>+ScriptModuleFetcher::ScriptModuleFetcher(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)
>+{
>+}
>+
>+ScriptModuleFetcher::~ScriptModuleFetcher()
>+{
>+    if (m_cachedScript) {
>+        m_cachedScript->removeClient(this);
>+        m_cachedScript = nullptr;
>+    }
>+}
>+
>+Ref<ScriptModuleFetcher> ScriptModuleFetcher::create(JSDOMGlobalObject* globalObject, const URL& sourceURL, JSC::JSInternalPromiseDeferred* deferred, Document& document)
>+{
>+    return adoptRef(*new ScriptModuleFetcher(globalObject, sourceURL, deferred, document));
>+}
>+
>+bool ScriptModuleFetcher::run(ScriptElement& scriptElement)
>+{
>+    m_element = &scriptElement.element();
>+    m_cachedScript = scriptElement.requestModuleScript(m_sourceURL);
>+    if (!m_cachedScript)
>+        return false;
>+
>+    // Note: If the content is already cached, this immeidately calls notifyFinished.
>+    m_cachedScript->addClient(this);
>+    return true;
>+}
>+
>+void ScriptModuleFetcher::notifyFinished(CachedResource* resource)
>+{
>+    // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
>+
>+    ASSERT_UNUSED(resource, resource == m_cachedScript);
>+    if (!m_cachedScript)
>+        return;
>+
>+    ASSERT(m_cachedScript);
>+    CachedResourceHandle<CachedScript> cachedScript = std::exchange(m_cachedScript, nullptr);
>+    RefPtr<Element> element = std::exchange(m_element, nullptr);
>+    ScriptElement* scriptElement = toScriptElementIfPossible(element.get());
>+    bool failed = false;
>+
>+    if (!scriptElement->failIfCrossOriginScriptLoadIsDenied(cachedScript.get()))
>+        failed = true;
>+    else if (cachedScript->errorOccurred())
>+        failed = true;
>+    else if (!cachedScript->mimeTypeAllowedByNosniff()) {
>+        element->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.");
>+        failed = true;
>+    }
>+
>+    Ref<Document> protector(m_document);
>+
>+    if (Frame* frame = m_document.frame()) {
>+        JSC::JSLockHolder lock(m_globalObject->vm());
>+        JSC::ExecState* exec = m_globalObject->globalExec();
>+        if (failed) {
>+            // 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()) {
>+            // FIXME: Let's wrap around ScriptSourceCode to propagate it directly through the module pipeline..
>+            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_deferred.clear();
>+    m_globalObject.clear();
>+
>+    m_document.moduleLoader()->notifyFinished(this);
>+    // After ScriptModuleLoader::notifyFinished call, |this| may be destroyed.
>+}
>+
>+}
>diff --git a/Source/WebCore/bindings/js/ScriptModuleFetcher.h b/Source/WebCore/bindings/js/ScriptModuleFetcher.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..53f27068bfc6352ba9d385520a60d9bdffec0061
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ScriptModuleFetcher.h
>@@ -0,0 +1,69 @@
>+/*
>+ * Copyright (C) 2015-2016 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.
>+ */
>+
>+#pragma once
>+
>+#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 ScriptModuleFetcher : public RefCounted<ScriptModuleFetcher>, private CachedResourceClient {
>+    WTF_MAKE_NONCOPYABLE(ScriptModuleFetcher); WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    static Ref<ScriptModuleFetcher> create(JSDOMGlobalObject*, const URL& sourceURL, JSC::JSInternalPromiseDeferred*, Document&);
>+
>+    ~ScriptModuleFetcher();
>+
>+    bool run(ScriptElement&);
>+
>+    CachedScript* cachedScript() { return m_cachedScript.get(); }
>+
>+private:
>+    ScriptModuleFetcher(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 { };
>+    RefPtr<Element> m_element;
>+};
>+
>+} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/ScriptModuleGraph.cpp b/Source/WebCore/bindings/js/ScriptModuleGraph.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..883586dec1eceb42e37eadc135e1bbc10511180b
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ScriptModuleGraph.cpp
>@@ -0,0 +1,107 @@
>+/*
>+ * Copyright (C) 2015-2016 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 "ScriptModuleGraph.h"
>+
>+#include "DOMWrapperWorld.h"
>+#include "Document.h"
>+#include "Element.h"
>+#include "ExceptionCode.h"
>+#include "Frame.h"
>+#include "ScriptController.h"
>+#include "ScriptElement.h"
>+#include "ScriptModuleLoader.h"
>+#include "ScriptRunner.h"
>+#include "ScriptSourceCode.h"
>+
>+namespace WebCore {
>+
>+ScriptModuleGraph::~ScriptModuleGraph()
>+{
>+    dataLog("~ScriptModuleGraph\n");
>+}
>+
>+void ScriptModuleGraph::notifyLoaded(UniquedStringImpl* moduleKey)
>+{
>+    m_moduleKey = moduleKey;
>+    notifyFinished();
>+}
>+
>+void ScriptModuleGraph::notifyErrored()
>+{
>+    m_errored = true;
>+    notifyFinished();
>+}
>+
>+void ScriptModuleGraph::notifyFinished()
>+{
>+    m_loaded = true;
>+
>+    RefPtr<ScriptModuleGraph> protectedThis(this);
>+
>+    Vector<ScriptModuleGraphClient*> vector;
>+    for (auto& pair : m_clients)
>+        vector.append(pair.key);
>+    for (auto& client : vector)
>+        client->notifyFinished(*this);
>+}
>+
>+void ScriptModuleGraph::evaluate(Element& element)
>+{
>+    if (m_errored)
>+        toScriptElementIfPossible(&element)->dispatchErrorEvent();
>+    else if (Frame* frame = element.document().frame())
>+        frame->script().linkAndEvaluateModule(*this, element);
>+}
>+
>+void ScriptModuleGraph::addClient(ScriptModuleGraphClient* client)
>+{
>+    if (isLoaded())
>+        client->notifyFinished(*this);
>+    else
>+        m_clients.add(client);
>+}
>+
>+void ScriptModuleGraph::removeClient(ScriptModuleGraphClient* client)
>+{
>+    m_clients.remove(client);
>+}
>+
>+Ref<ScriptModuleGraph> ScriptModuleGraph::create(Element& initiator, const URL& rootUrl)
>+{
>+    Ref<ScriptModuleGraph> moduleGraph = adoptRef(*new ScriptModuleGraph);
>+    initiator.document().frame()->script().loadModule(moduleGraph.get(), rootUrl.string(), initiator);
>+    return moduleGraph;
>+}
>+
>+Ref<ScriptModuleGraph> ScriptModuleGraph::create(Element& initiator, const ScriptSourceCode& sourceCode)
>+{
>+    Ref<ScriptModuleGraph> moduleGraph = adoptRef(*new ScriptModuleGraph);
>+    initiator.document().frame()->script().loadModule(moduleGraph.get(), sourceCode, initiator);
>+    return moduleGraph;
>+}
>+
>+}
>diff --git a/Source/WebCore/bindings/js/ScriptModuleGraph.h b/Source/WebCore/bindings/js/ScriptModuleGraph.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..b71fb997a09ee30a0d85b4cddd646812c176892a
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ScriptModuleGraph.h
>@@ -0,0 +1,73 @@
>+/*
>+ * Copyright (C) 2015-2016 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.
>+ */
>+
>+#pragma once
>+
>+#include "ScriptModuleFetcher.h"
>+#include <runtime/JSInternalPromise.h>
>+#include <wtf/Noncopyable.h>
>+#include <wtf/WeakPtr.h>
>+
>+namespace WebCore {
>+
>+class Element;
>+class ScriptSourceCode;
>+class ScriptModuleGraphClient;
>+
>+class ScriptModuleGraph : public RefCounted<ScriptModuleGraph> {
>+WTF_MAKE_NONCOPYABLE(ScriptModuleGraph); WTF_MAKE_FAST_ALLOCATED;
>+public:
>+
>+    UniquedStringImpl* moduleKey() { return m_moduleKey.get(); }
>+
>+    // FIXME
>+    ~ScriptModuleGraph();
>+
>+    void evaluate(Element&);
>+
>+    void notifyLoaded(UniquedStringImpl* moduleKey);
>+    void notifyErrored();
>+
>+    bool errorOccurred() const { return m_errored; }
>+    bool isLoaded() const { return m_loaded; }
>+
>+    void addClient(ScriptModuleGraphClient*);
>+    void removeClient(ScriptModuleGraphClient*);
>+
>+    static Ref<ScriptModuleGraph> create(Element& initiator, const URL& rootUrl);
>+    static Ref<ScriptModuleGraph> create(Element& initiator, const ScriptSourceCode&);
>+
>+private:
>+    ScriptModuleGraph() = default;
>+
>+    void notifyFinished();
>+
>+    RefPtr<UniquedStringImpl> m_moduleKey;
>+    HashCountedSet<ScriptModuleGraphClient*> m_clients;
>+    bool m_errored { false };
>+    bool m_loaded { false };
>+};
>+
>+} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/ScriptModuleGraphClient.h b/Source/WebCore/bindings/js/ScriptModuleGraphClient.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..3ea8d71aecbbb2947e0ed22e8b1ae3b7053fd455
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ScriptModuleGraphClient.h
>@@ -0,0 +1,39 @@
>+/*
>+ * Copyright (C) 2016 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. ``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
>+ * 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.
>+ */
>+
>+#pragma once
>+
>+namespace WebCore {
>+
>+class ScriptModuleGraph;
>+
>+class ScriptModuleGraphClient {
>+public:
>+    virtual ~ScriptModuleGraphClient() { }
>+
>+    virtual void notifyFinished(ScriptModuleGraph&) = 0;
>+};
>+
>+}
>diff --git a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp b/Source/WebCore/bindings/js/ScriptModuleLoader.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..ac353a4edb271fc6ca7865dda48c9c77da582f66
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ScriptModuleLoader.cpp
>@@ -0,0 +1,161 @@
>+/*
>+ * Copyright (C) 2015, 2016 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 "ScriptModuleLoader.h"
>+
>+#include "Document.h"
>+#include "ExceptionCode.h"
>+#include "Frame.h"
>+#include "JSDOMBinding.h"
>+#include "JSElement.h"
>+#include "ScriptController.h"
>+#include "ScriptModuleFetcher.h"
>+#include <runtime/JSInternalPromiseDeferred.h>
>+#include <runtime/JSModuleRecord.h>
>+#include <runtime/JSString.h>
>+#include <runtime/Symbol.h>
>+
>+namespace WebCore {
>+
>+ScriptModuleLoader::ScriptModuleLoader(Document& document)
>+    : m_document(document)
>+{
>+}
>+
>+JSC::JSInternalPromise* ScriptModuleLoader::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);
>+
>+    // We use a Symbol as a special purpose; It means this module is an inline module.
>+    // So there is no correct URL to retrieve the module source code. If the module name
>+    // value is a Symbol, it is used directly as a module key.
>+    if (moduleNameValue.isSymbol())
>+        return deferred->resolve(exec, moduleNameValue);
>+
>+    // https://html.spec.whatwg.org/multipage/webappapis.html#resolve-a-module-specifier
>+
>+    if (!moduleNameValue.isString())
>+        return deferred->reject(exec, JSC::createTypeError(exec, "Module specifier is not Symbol or String."));
>+
>+    String specifier = asString(moduleNameValue)->value(exec);
>+
>+    // 1. Apply the URL parser to specifier. If the result is not failure, return the result.
>+    URL absoluteUrl(URL(), specifier);
>+    if (absoluteUrl.isValid())
>+        return deferred->resolve(exec, jsString(exec, absoluteUrl.string()));
>+
>+    // 2. If specifier does not start with the character U+002F SOLIDUS (/), the two-character sequence U+002E FULL STOP, U+002F SOLIDUS (./),
>+    //    or the three-character sequence U+002E FULL STOP, U+002E FULL STOP, U+002F SOLIDUS (../), return failure and abort these steps.
>+    if (!specifier.startsWith('/') && !specifier.startsWith("./") && !specifier.startsWith("../"))
>+        return deferred->reject(exec, JSC::createTypeError(exec, "Module specifier does not start with \"/\", \"./\", or \"../\""));
>+
>+    // 3. Return the result of applying the URL parser to specifier with script's base URL as the base URL.
>+
>+    URL completedUrl;
>+
>+    if (importerModuleKey.isSymbol())
>+        completedUrl = m_document.completeURL(specifier);
>+    else if (importerModuleKey.isUndefined())
>+        completedUrl = m_document.completeURL(specifier);
>+    else if (importerModuleKey.isString()) {
>+        URL importerModuleUrl(URL(), asString(importerModuleKey)->value(exec));
>+        if (!importerModuleUrl.isValid())
>+            return deferred->reject(exec, JSC::createTypeError(exec, "Importer module key is an invalid URL."));
>+        completedUrl = m_document.completeURL(specifier, importerModuleUrl);
>+    } else
>+        return deferred->reject(exec, JSC::createTypeError(exec, "Importer module key is not Symbol or String."));
>+
>+    if (!completedUrl.isValid())
>+        return deferred->reject(exec, JSC::createTypeError(exec, "Module name constructs an invalid URL."));
>+
>+    return deferred->resolve(exec, jsString(exec, completedUrl.string()));
>+}
>+
>+JSC::JSInternalPromise* ScriptModuleLoader::fetch(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue, JSC::JSValue initiator)
>+{
>+    JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>+
>+    if (moduleKeyValue.isSymbol())
>+        return deferred->reject(exec, JSC::createTypeError(exec, "Symbol module key should be already fulfilled with the inlined resource."));
>+
>+    if (!moduleKeyValue.isString())
>+        return deferred->reject(exec, JSC::createTypeError(exec, "Module key is not Symbol or String."));
>+
>+    // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
>+
>+    URL completedUrl(URL(), asString(moduleKeyValue)->value(exec));
>+    if (!completedUrl.isValid())
>+        return deferred->reject(exec, JSC::createTypeError(exec, "Module key is an invalid URL."));
>+
>+    ScriptElement* scriptElement = nullptr;
>+    if (auto* element = JSC::jsDynamicCast<JSElement*>(initiator))
>+        scriptElement = toScriptElementIfPossible(&element->wrapped());
>+    ASSERT_WITH_MESSAGE(scriptElement, "Initiator should be ScriptElement.");
>+
>+    Ref<ScriptModuleFetcher> fetcher = ScriptModuleFetcher::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 ScriptModuleLoader::evaluate(JSC::JSGlobalObject*, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue, JSC::JSValue moduleRecordValue, JSC::JSValue)
>+{
>+    JSC::VM& vm = exec->vm();
>+    auto scope = DECLARE_THROW_SCOPE(vm);
>+
>+    // FIXME: Currently, we only support JSModuleRecord.
>+    // Once the reflective part of the module loader is supported, we will handle arbitrary values.
>+    // https://whatwg.github.io/loader/#registry-prototype-provide
>+    JSC::JSModuleRecord* moduleRecord = JSC::jsDynamicCast<JSC::JSModuleRecord*>(moduleRecordValue);
>+    if (!moduleRecord)
>+        return JSC::jsUndefined();
>+
>+    URL sourceUrl;
>+    if (moduleKeyValue.isSymbol())
>+        sourceUrl = m_document.url();
>+    else if (moduleKeyValue.isString())
>+        sourceUrl = URL(URL(), asString(moduleKeyValue)->value(exec));
>+    else
>+        return JSC::throwTypeError(exec, scope, ASCIILiteral("Module key is not Symbol or String."));
>+
>+    if (!sourceUrl.isValid())
>+        return JSC::throwTypeError(exec, scope, ASCIILiteral("Module key is an invalid URL."));
>+
>+    if (Frame* frame = m_document.frame())
>+        return frame->script().evaluateModule(sourceUrl, moduleRecord);
>+    return JSC::jsUndefined();
>+}
>+
>+void ScriptModuleLoader::notifyFinished(ScriptModuleFetcher* fetcher)
>+{
>+    m_fetchingSet.remove(fetcher);
>+}
>+
>+}
>diff --git a/Source/WebCore/bindings/js/ScriptModuleLoader.h b/Source/WebCore/bindings/js/ScriptModuleLoader.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..78fbd0726e18dcf0a47aea90e975a237f9da8cfd
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ScriptModuleLoader.h
>@@ -0,0 +1,64 @@
>+/*
>+ * Copyright (C) 2015-2016 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.
>+ */
>+
>+#pragma once
>+
>+#include <runtime/JSCJSValue.h>
>+#include <wtf/HashSet.h>
>+#include <wtf/Noncopyable.h>
>+
>+namespace JSC {
>+
>+class ExecState;
>+class JSGlobalObject;
>+class JSInternalPromise;
>+class JSModuleLoader;
>+
>+}
>+
>+namespace WebCore {
>+
>+class Document;
>+class ScriptModuleFetcher;
>+
>+class ScriptModuleLoader {
>+    WTF_MAKE_NONCOPYABLE(ScriptModuleLoader); WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    explicit ScriptModuleLoader(Document&);
>+
>+    Document& document() { return m_document; }
>+
>+    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(ScriptModuleFetcher*);
>+
>+private:
>+    Document& m_document;
>+    HashSet<RefPtr<ScriptModuleFetcher>> m_fetchingSet;
>+};
>+
>+} // namespace WebCore
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index 038e34ff93eae7ecf04dab059bf1fc6516343ed2..32081fe4d2de1be9bccb16e9b059b3edbeb52063 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -103,7 +103,6 @@
> #include "InspectorInstrumentation.h"
> #include "JSCustomElementInterface.h"
> #include "JSLazyEventListener.h"
>-#include "JSModuleLoader.h"
> #include "KeyboardEvent.h"
> #include "Language.h"
> #include "LoaderStrategy.h"
>@@ -153,6 +152,8 @@
> #include "SchemeRegistry.h"
> #include "ScopedEventQueue.h"
> #include "ScriptController.h"
>+#include "ScriptModuleFetcher.h"
>+#include "ScriptModuleLoader.h"
> #include "ScriptRunner.h"
> #include "ScriptSourceCode.h"
> #include "ScrollingCoordinator.h"
>@@ -480,7 +481,7 @@ Document::Document(Frame* frame, const URL& url, unsigned documentClasses, unsig
>     , m_startTime(std::chrono::steady_clock::now())
>     , m_overMinimumLayoutThreshold(false)
>     , m_scriptRunner(std::make_unique<ScriptRunner>(*this))
>-    , m_moduleLoader(std::make_unique<JSModuleLoader>(*this))
>+    , m_moduleLoader(std::make_unique<ScriptModuleLoader>(*this))
>     , m_xmlVersion(ASCIILiteral("1.0"))
>     , m_xmlStandalone(StandaloneUnspecified)
>     , m_hasXMLDeclaration(false)
>diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
>index 8c155f119e6c83f4ef89fa38c80dd8d13aed81e3..0d9f9bcb550f71085cdf83dfa3f16a9296625a89 100644
>--- a/Source/WebCore/dom/Document.h
>+++ b/Source/WebCore/dom/Document.h
>@@ -124,7 +124,7 @@ class IntPoint;
> class LayoutPoint;
> class LayoutRect;
> class LiveNodeList;
>-class JSModuleLoader;
>+class ScriptModuleLoader;
> class JSNode;
> class Locale;
> class Location;
>@@ -133,6 +133,7 @@ class MediaPlaybackTarget;
> class MediaPlaybackTargetClient;
> class MediaQueryList;
> class MediaQueryMatcher;
>+class ScriptModuleLoader;
> class MouseEventWithHitTestResults;
> class NamedFlowCollection;
> class NodeFilter;
>@@ -947,7 +948,7 @@ class Document
>     Document& topDocument() const;
>     
>     ScriptRunner* scriptRunner() { return m_scriptRunner.get(); }
>-    JSModuleLoader* moduleLoader() { return m_moduleLoader.get(); }
>+    ScriptModuleLoader* moduleLoader() { return m_moduleLoader.get(); }
> 
>     HTMLScriptElement* currentScript() const { return !m_currentScriptStack.isEmpty() ? m_currentScriptStack.last().get() : nullptr; }
>     void pushCurrentScript(HTMLScriptElement*);
>@@ -1551,7 +1552,7 @@ class Document
>     bool m_overMinimumLayoutThreshold;
>     
>     std::unique_ptr<ScriptRunner> m_scriptRunner;
>-    std::unique_ptr<JSModuleLoader> m_moduleLoader;
>+    std::unique_ptr<ScriptModuleLoader> m_moduleLoader;
> 
>     Vector<RefPtr<HTMLScriptElement>> m_currentScriptStack;
> 
>diff --git a/Source/WebCore/dom/PendingScript.cpp b/Source/WebCore/dom/PendingScript.cpp
>index 71bdb2d83ef3c68e1b5bf7931ccf7687bb98a56c..c3abb78a15c0db0d8ed266fea4d7bdea19696bce 100644
>--- a/Source/WebCore/dom/PendingScript.cpp
>+++ b/Source/WebCore/dom/PendingScript.cpp
>@@ -29,6 +29,7 @@
> #include "CachedScript.h"
> #include "Element.h"
> #include "PendingScriptClient.h"
>+#include "ScriptModuleGraph.h"
> 
> namespace WebCore {
> 
>@@ -39,6 +40,13 @@ Ref<PendingScript> PendingScript::create(Element& element, CachedScript& cachedS
>     return pendingScript;
> }
> 
>+Ref<PendingScript> PendingScript::create(Element& element, ScriptModuleGraph& moduleGraph)
>+{
>+    Ref<PendingScript> pendingScript = adoptRef(*new PendingScript(element, moduleGraph));
>+    moduleGraph.addClient(&pendingScript.get());
>+    return pendingScript;
>+}
>+
> Ref<PendingScript> PendingScript::create(Element& element, TextPosition scriptStartPosition)
> {
>     return adoptRef(*new PendingScript(element, scriptStartPosition));
>@@ -56,10 +64,18 @@ PendingScript::PendingScript(Element& element, CachedScript& cachedScript)
> {
> }
> 
>+PendingScript::PendingScript(Element& element, ScriptModuleGraph& moduleGraph)
>+    : m_element(element)
>+    , m_moduleGraph(&moduleGraph)
>+{
>+}
>+
> PendingScript::~PendingScript()
> {
>     if (m_cachedScript)
>         m_cachedScript->removeClient(this);
>+    if (m_moduleGraph)
>+        m_moduleGraph->removeClient(this);
> }
> 
> CachedScript* PendingScript::cachedScript() const
>@@ -67,6 +83,11 @@ CachedScript* PendingScript::cachedScript() const
>     return m_cachedScript.get();
> }
> 
>+ScriptModuleGraph* PendingScript::moduleGraph() const
>+{
>+    return m_moduleGraph.get();
>+}
>+
> void PendingScript::notifyClientFinished()
> {
>     Ref<PendingScript> protectedThis(*this);
>@@ -79,9 +100,27 @@ void PendingScript::notifyFinished(CachedResource*)
>     notifyClientFinished();
> }
> 
>+void PendingScript::notifyFinished(ScriptModuleGraph&)
>+{
>+    notifyClientFinished();
>+}
>+
> bool PendingScript::isLoaded() const
> {
>-    return m_cachedScript && m_cachedScript->isLoaded();
>+    if (m_cachedScript)
>+        return m_cachedScript->isLoaded();
>+    if (m_moduleGraph)
>+        return m_moduleGraph->isLoaded();
>+    return false;
>+}
>+
>+bool PendingScript::errorOccurred() const
>+{
>+    if (m_cachedScript)
>+        return m_cachedScript->errorOccurred();
>+    if (m_moduleGraph)
>+        return m_moduleGraph->errorOccurred();
>+    return false;
> }
> 
> void PendingScript::setClient(PendingScriptClient* client)
>diff --git a/Source/WebCore/dom/PendingScript.h b/Source/WebCore/dom/PendingScript.h
>index 07b2f35e653a3d3d88baed4ae05662af8d447821..d48b8c41e05df5e6abb803fdc5e71b0b773bd907 100644
>--- a/Source/WebCore/dom/PendingScript.h
>+++ b/Source/WebCore/dom/PendingScript.h
>@@ -27,6 +27,8 @@
> 
> #include "CachedResourceClient.h"
> #include "CachedResourceHandle.h"
>+#include "ScriptModuleGraph.h"
>+#include "ScriptModuleGraphClient.h"
> #include <wtf/Ref.h>
> #include <wtf/RefCounted.h>
> #include <wtf/text/TextPosition.h>
>@@ -42,9 +44,10 @@ class PendingScriptClient;
> // A CachedResourceHandle alone does not prevent the underlying CachedResource
> // from purging its data buffer. This class holds a dummy client open for its
> // lifetime in order to guarantee that the data buffer will not be purged.
>-class PendingScript final : public RefCounted<PendingScript>, public CachedResourceClient {
>+class PendingScript final : public RefCounted<PendingScript>, public CachedResourceClient, public ScriptModuleGraphClient {
> public:
>     static Ref<PendingScript> create(Element&, CachedScript&);
>+    static Ref<PendingScript> create(Element&, ScriptModuleGraph&);
>     static Ref<PendingScript> create(Element&, TextPosition scriptStartPosition);
> 
>     virtual ~PendingScript();
>@@ -58,17 +61,21 @@ class PendingScript final : public RefCounted<PendingScript>, public CachedResou
>     const Element& element() const { return m_element.get(); }
> 
>     CachedScript* cachedScript() const;
>-    bool needsLoading() const { return cachedScript(); }
>+    ScriptModuleGraph* moduleGraph() const;
>+    bool needsLoading() const { return cachedScript() || moduleGraph(); }
> 
>     bool isLoaded() const;
>+    bool errorOccurred() const;
> 
>     void notifyFinished(CachedResource*) override;
>+    void notifyFinished(ScriptModuleGraph&) override;
> 
>     void setClient(PendingScriptClient*);
>     void clearClient();
> 
> private:
>     PendingScript(Element&, CachedScript&);
>+    PendingScript(Element&, ScriptModuleGraph&);
>     PendingScript(Element&, TextPosition startingPosition);
> 
>     void notifyClientFinished();
>@@ -76,6 +83,7 @@ class PendingScript final : public RefCounted<PendingScript>, public CachedResou
>     Ref<Element> m_element;
>     TextPosition m_startingPosition; // Only used for inline script tags.
>     CachedResourceHandle<CachedScript> m_cachedScript;
>+    RefPtr<ScriptModuleGraph> m_moduleGraph;
>     PendingScriptClient* m_client { nullptr };
> };
> 
>diff --git a/Source/WebCore/dom/ScriptElement.cpp b/Source/WebCore/dom/ScriptElement.cpp
>index f1871115b328a6f12630936e85eb09ab7a1f357c..18f29b09d6184efdcbe7c1d5546adc1f89d6d466 100644
>--- a/Source/WebCore/dom/ScriptElement.cpp
>+++ b/Source/WebCore/dom/ScriptElement.cpp
>@@ -39,9 +39,11 @@
> #include "IgnoreDestructiveWriteCountIncrementer.h"
> #include "MIMETypeRegistry.h"
> #include "Page.h"
>+#include "PendingScript.h"
> #include "SVGNames.h"
> #include "SVGScriptElement.h"
> #include "ScriptController.h"
>+#include "ScriptModuleGraph.h"
> #include "ScriptRunner.h"
> #include "ScriptSourceCode.h"
> #include "ScriptableDocumentParser.h"
>@@ -69,6 +71,7 @@ ScriptElement::ScriptElement(Element& element, bool parserInserted, bool already
>     , m_forceAsync(!parserInserted)
>     , m_willExecuteInOrder(false)
>     , m_requestUsesAccessControl(false)
>+    , m_isModuleScript(false)
> {
>     if (parserInserted && m_element.document().scriptableDocumentParser() && !m_element.document().isInDocumentWrite())
>         m_startLineNumber = m_element.document().scriptableDocumentParser()->textPosition().m_line;
>@@ -165,12 +168,12 @@ Optional<ScriptElement::ScriptType> ScriptElement::determineScriptType(LegacyTyp
>         return ScriptType::Classic;
>     if (supportLegacyTypes == AllowLegacyTypeInTypeAttribute && isLegacySupportedJavaScriptLanguage(type))
>         return ScriptType::Classic;
>-#if ENABLE(ES6_MODULES)
>+// #if ENABLE(ES6_MODULES)
>     // https://html.spec.whatwg.org/multipage/scripting.html#attr-script-type
>     // Setting the attribute to an ASCII case-insensitive match for the string "module" means that the script is a module script.
>     if (equalLettersIgnoringASCIICase(type, "module"))
>         return ScriptType::Module;
>-#endif
>+// #endif
>     return Nullopt;
> }
> 
>@@ -197,8 +200,13 @@ 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 (scriptType == ScriptType::Module)
>+        m_isModuleScript = false;
> 
>     if (wasParserInserted) {
>         m_parserInserted = true;
>@@ -219,34 +227,55 @@ 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())
>+    if (!charsetAttributeValue().isEmpty() && scriptType == ScriptType::Classic)
>         m_characterEncoding = charsetAttributeValue();
>     else
>         m_characterEncoding = document.charset();
> 
>-    if (hasSourceAttribute())
>-        if (!requestScript(sourceAttributeValue()))
>+    if (scriptType == ScriptType::Module) {
>+        if (!loadModule(scriptStartPosition))
>             return false;
>+    }
>+
>+    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()) {
>+    } else if ((scriptType == ScriptType::Classic && hasSourceAttribute() && !asyncAttributeValue() && !m_forceAsync) || (scriptType == ScriptType::Module && !asyncAttributeValue() && !m_forceAsync)) {
>+        m_willExecuteInOrder = true;
>+        if (scriptType == ScriptType::Classic) {
>+            document.scriptRunner()->queueScriptForExecution(this, m_cachedScript, ScriptRunner::IN_ORDER_EXECUTION);
>+            m_cachedScript->addClient(this);
>+        } else {
>+            document.scriptRunner()->queueScriptModuleGraphForExecution(this, *m_moduleGraph, ScriptRunner::IN_ORDER_EXECUTION);
>+            m_moduleGraph->addClient(this);
>+        }
>+    } else if (hasSourceAttribute() || scriptType == ScriptType::Module) {
>+        if (scriptType == ScriptType::Classic) {
>+            m_element.document().scriptRunner()->queueScriptForExecution(this, m_cachedScript, ScriptRunner::ASYNC_EXECUTION);
>+            m_cachedScript->addClient(this);
>+        } else {
>+            document.scriptRunner()->queueScriptModuleGraphForExecution(this, *m_moduleGraph, ScriptRunner::ASYNC_EXECUTION);
>+            m_moduleGraph->addClient(this);
>+        }
>+    } else if (!hasSourceAttribute() && m_parserInserted && !document.haveStylesheetsLoaded()) {
>+        ASSERT(scriptType == ScriptType::Classic);
>         m_willBeParserExecuted = true;
>         m_readyToBeParserExecuted = true;
>-    } else if (hasSourceAttribute() && !asyncAttributeValue() && !m_forceAsync) {
>-        m_willExecuteInOrder = true;
>-        document.scriptRunner()->queueScriptForExecution(this, m_cachedScript, ScriptRunner::IN_ORDER_EXECUTION);
>-        m_cachedScript->addClient(this);
>-    } else if (hasSourceAttribute()) {
>-        m_element.document().scriptRunner()->queueScriptForExecution(this, m_cachedScript, ScriptRunner::ASYNC_EXECUTION);
>-        m_cachedScript->addClient(this);
>     } 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 +284,31 @@ bool ScriptElement::prepareScript(const TextPosition& scriptStartPosition, Legac
>     return true;
> }
> 
>-bool ScriptElement::requestScript(const String& sourceUrl)
>+CachedResourceHandle<CachedScript> ScriptElement::requestCachedScript(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(scriptCharset());
>+    request.setInitiator(&element());
>+
>+    return m_element.document().cachedResourceLoader().requestScript(request);
>+}
>+
>+bool ScriptElement::requestScript(ScriptType, const String& sourceUrl)
> {
>     Ref<Document> originalDocument(m_element.document());
>     if (!m_element.dispatchBeforeLoadEvent(sourceUrl))
>@@ -265,25 +318,7 @@ bool ScriptElement::requestScript(const String& sourceUrl)
> 
>     ASSERT(!m_cachedScript);
>     if (!stripLeadingAndTrailingHTMLSpaces(sourceUrl).isEmpty()) {
>-        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(m_element.document().completeURL(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(scriptCharset());
>-        request.setInitiator(&element());
>-
>-        m_cachedScript = m_element.document().cachedResourceLoader().requestScript(request);
>+        m_cachedScript = requestCachedScript(m_element.document().completeURL(sourceUrl));
>         m_isExternalScript = true;
>     }
> 
>@@ -296,6 +331,11 @@ bool ScriptElement::requestScript(const String& sourceUrl)
>     return false;
> }
> 
>+CachedResourceHandle<CachedScript> ScriptElement::requestModuleScript(URL sourceUrl)
>+{
>+    return requestCachedScript(sourceUrl);
>+}
>+
> void ScriptElement::executeScript(const ScriptSourceCode& sourceCode)
> {
>     ASSERT(m_alreadyStarted);
>@@ -337,19 +377,83 @@ void ScriptElement::stopLoadRequest()
>             m_cachedScript->removeClient(this);
>         m_cachedScript = nullptr;
>     }
>+    if (m_moduleGraph) {
>+        if (!m_willBeParserExecuted)
>+            m_moduleGraph->removeClient(this);
>+        m_moduleGraph = nullptr;
>+    }
> }
> 
>-void ScriptElement::execute(CachedScript* cachedScript)
>+void ScriptElement::execute(PendingScript& pendingScript)
> {
>     ASSERT(!m_willBeParserExecuted);
>-    ASSERT(cachedScript);
>-    if (cachedScript->errorOccurred())
>+    ASSERT(pendingScript.needsLoading());
>+
>+    if (auto* cachedScript = pendingScript.cachedScript()) {
>+        if (cachedScript->errorOccurred())
>+            dispatchErrorEvent();
>+        else if (!cachedScript->wasCanceled()) {
>+            executeScript(ScriptSourceCode(cachedScript));
>+            dispatchLoadEvent();
>+        }
>+        cachedScript->removeClient(this);
>+        return;
>+    }
>+
>+    auto& moduleGraph = *pendingScript.moduleGraph();
>+    if (moduleGraph.errorOccurred())
>         dispatchErrorEvent();
>-    else if (!cachedScript->wasCanceled()) {
>-        executeScript(ScriptSourceCode(cachedScript));
>+    else {
>+        moduleGraph.evaluate(element());
>         dispatchLoadEvent();
>     }
>-    cachedScript->removeClient(this);
>+    moduleGraph.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;
>+        }
>+
>+        URL moduleGraphRootUrl = m_element.document().completeURL(sourceUrl);
>+        if (!moduleGraphRootUrl.isValid()) {
>+            dispatchErrorEvent();
>+            return false;
>+        }
>+
>+        m_isExternalScript = true;
>+        m_moduleGraph = ScriptModuleGraph::create(m_element, moduleGraphRootUrl);
>+        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 false;
>+
>+    m_moduleGraph = ScriptModuleGraph::create(m_element, sourceCode);
>+    return true;
> }
> 
> void ScriptElement::notifyFinished(CachedResource* resource)
>@@ -364,10 +468,8 @@ void ScriptElement::notifyFinished(CachedResource* resource)
>     if (!m_cachedScript)
>         return;
> 
>-    if (m_requestUsesAccessControl && !m_cachedScript->passesSameOriginPolicyCheck(*m_element.document().securityOrigin())) {
>+    if (!failIfCrossOriginScriptLoadIsDenied(m_cachedScript.get())) {
>         dispatchErrorEvent();
>-        static NeverDestroyed<String> consoleMessage(ASCIILiteral("Cross-origin script load denied by Cross-Origin Resource Sharing policy."));
>-        m_element.document().addConsoleMessage(MessageSource::JS, MessageLevel::Error, consoleMessage);
>         return;
>     }
> 
>@@ -379,6 +481,25 @@ void ScriptElement::notifyFinished(CachedResource* resource)
>     m_cachedScript = nullptr;
> }
> 
>+void ScriptElement::notifyFinished(ScriptModuleGraph&)
>+{
>+    ASSERT(!m_willBeParserExecuted);
>+
>+    // ScriptModuleGraph possibly invokes this notifyFinished() more than
>+    // once because ScriptElement doesn't unsubscribe itself from
>+    // ScriptModuleGraph here and does it in execute() instead.
>+    // We use m_moduleGraph to check if this function is already called.
>+    if (!m_moduleGraph)
>+        return;
>+
>+    if (m_willExecuteInOrder)
>+        m_element.document().scriptRunner()->notifyScriptReady(this, ScriptRunner::IN_ORDER_EXECUTION);
>+    else
>+        m_element.document().scriptRunner()->notifyScriptReady(this, ScriptRunner::ASYNC_EXECUTION);
>+
>+    m_moduleGraph = nullptr;
>+}
>+
> bool ScriptElement::ignoresLoadRequest() const
> {
>     return m_alreadyStarted || m_isExternalScript || m_parserInserted || !m_element.inDocument();
>@@ -419,4 +540,14 @@ ScriptElement* toScriptElementIfPossible(Element* element)
>     return nullptr;
> }
> 
>+bool ScriptElement::failIfCrossOriginScriptLoadIsDenied(CachedScript* cachedScript)
>+{
>+    if (m_requestUsesAccessControl && !cachedScript->passesSameOriginPolicyCheck(*m_element.document().securityOrigin())) {
>+        static NeverDestroyed<String> consoleMessage(ASCIILiteral("Cross-origin script load denied by Cross-Origin Resource Sharing policy."));
>+        m_element.document().addConsoleMessage(MessageSource::JS, MessageLevel::Error, consoleMessage);
>+        return false;
>+    }
>+    return true;
>+}
>+
> }
>diff --git a/Source/WebCore/dom/ScriptElement.h b/Source/WebCore/dom/ScriptElement.h
>index 1aa4f2e83b311171246a230e6588062f9cf3d084..c5e264980240cfa056d8a50e1e07c4fda0579ae4 100644
>--- a/Source/WebCore/dom/ScriptElement.h
>+++ b/Source/WebCore/dom/ScriptElement.h
>@@ -23,7 +23,9 @@
> 
> #include "CachedResourceClient.h"
> #include "CachedResourceHandle.h"
>+#include "ScriptModuleGraphClient.h"
> #include "Timer.h"
>+#include "URL.h"
> #include <wtf/text/TextPosition.h>
> #include <wtf/text/WTFString.h>
> 
>@@ -32,10 +34,12 @@ namespace WebCore {
> class CachedScript;
> class ContainerNode;
> class Element;
>+class ScriptModuleGraph;
>+class PendingScript;
> class ScriptElement;
> class ScriptSourceCode;
> 
>-class ScriptElement : private CachedResourceClient {
>+class ScriptElement : private CachedResourceClient, private ScriptModuleGraphClient {
> public:
>     virtual ~ScriptElement();
> 
>@@ -48,7 +52,7 @@ class ScriptElement : private CachedResourceClient {
>     String scriptCharset() const { return m_characterEncoding; }
>     WEBCORE_EXPORT String scriptContent() const;
>     void executeScript(const ScriptSourceCode&);
>-    void execute(CachedScript*);
>+    void execute(PendingScript&);
> 
>     // XML parser calls these
>     virtual void dispatchLoadEvent() = 0;
>@@ -59,6 +63,19 @@ class ScriptElement : private CachedResourceClient {
>     bool readyToBeParserExecuted() const { return m_readyToBeParserExecuted; }
>     bool willExecuteWhenDocumentFinishedParsing() const { return m_willExecuteWhenDocumentFinishedParsing; }
>     CachedResourceHandle<CachedScript> cachedScript() { return m_cachedScript; }
>+    ScriptModuleGraph* 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_isModuleScript ? ScriptType::Module : ScriptType::Classic; }
>+
>+    void notifyFinished(CachedResource*) override;
>+    void notifyFinished(ScriptModuleGraph&) override;
>+
>+    bool failIfCrossOriginScriptLoadIsDenied(CachedScript*);
> 
> protected:
>     ScriptElement(Element&, bool createdByParser, bool isEvaluated);
>@@ -76,16 +93,16 @@ 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& scriptStartPosition);
>+
>+    bool requestScript(ScriptType, const String& sourceUrl);
>     void stopLoadRequest();
> 
>-    void notifyFinished(CachedResource*) override;
>+    CachedResourceHandle<CachedScript> requestCachedScript(URL);
> 
>     virtual String sourceAttributeValue() const = 0;
>     virtual String charsetAttributeValue() const = 0;
>@@ -110,8 +127,10 @@ class ScriptElement : private CachedResourceClient {
>     bool m_forceAsync : 1;
>     bool m_willExecuteInOrder : 1;
>     bool m_requestUsesAccessControl : 1;
>+    bool m_isModuleScript : 1;
>     String m_characterEncoding;
>     String m_fallbackCharacterEncoding;
>+    RefPtr<ScriptModuleGraph> m_moduleGraph;
> };
> 
> // FIXME: replace with downcast<ScriptElement>.
>diff --git a/Source/WebCore/dom/ScriptRunner.cpp b/Source/WebCore/dom/ScriptRunner.cpp
>index a558fae6114774cf776718dc203c0eade07ae48f..129aec1ecc57e597c94ae5ad5d2f283938c26f96 100644
>--- a/Source/WebCore/dom/ScriptRunner.cpp
>+++ b/Source/WebCore/dom/ScriptRunner.cpp
>@@ -30,6 +30,7 @@
> #include "Element.h"
> #include "PendingScript.h"
> #include "ScriptElement.h"
>+#include "ScriptModuleGraph.h"
> 
> namespace WebCore {
> 
>@@ -70,6 +71,26 @@ void ScriptRunner::queueScriptForExecution(ScriptElement* scriptElement, CachedR
>     }
> }
> 
>+void ScriptRunner::queueScriptModuleGraphForExecution(ScriptElement* scriptElement, ScriptModuleGraph& moduleGraph, ExecutionType executionType)
>+{
>+    ASSERT(scriptElement);
>+
>+    Element& element = scriptElement->element();
>+    ASSERT(element.inDocument());
>+
>+    m_document.incrementLoadEventDelayCount();
>+
>+    switch (executionType) {
>+    case ASYNC_EXECUTION:
>+        m_pendingAsyncScripts.add(scriptElement, PendingScript::create(element, moduleGraph));
>+        break;
>+
>+    case IN_ORDER_EXECUTION:
>+        m_scriptsToExecuteInOrder.append(PendingScript::create(element, moduleGraph));
>+        break;
>+    }
>+}
>+
> void ScriptRunner::suspend()
> {
>     m_timer.stop();
>@@ -115,9 +136,8 @@ void ScriptRunner::timerFired()
>         // Paper over https://bugs.webkit.org/show_bug.cgi?id=144050
>         if (!script)
>             continue;
>-        auto* scriptElement = toScriptElementIfPossible(&script->element());
>-        ASSERT(scriptElement);
>-        scriptElement->execute(script->cachedScript());
>+        auto& scriptElement = *toScriptElementIfPossible(&script->element());
>+        scriptElement.execute(*script);
>         m_document.decrementLoadEventDelayCount();
>     }
> }
>diff --git a/Source/WebCore/dom/ScriptRunner.h b/Source/WebCore/dom/ScriptRunner.h
>index ba419fa907ac8ed5a3373948395eaed183d6bc3c..4c9a4d8adb662228ec84632c5c38cbe51e5e02d9 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 ScriptModuleGraph;
> class PendingScript;
> class ScriptElement;
> 
>@@ -47,6 +50,7 @@ class ScriptRunner {
> 
>     enum ExecutionType { ASYNC_EXECUTION, IN_ORDER_EXECUTION };
>     void queueScriptForExecution(ScriptElement*, CachedResourceHandle<CachedScript>, ExecutionType);
>+    void queueScriptModuleGraphForExecution(ScriptElement*, ScriptModuleGraph&, ExecutionType);
>     bool hasPendingScripts() const { return !m_scriptsToExecuteSoon.isEmpty() || !m_scriptsToExecuteInOrder.isEmpty() || !m_pendingAsyncScripts.isEmpty(); }
>     void suspend();
>     void resume();
>diff --git a/Source/WebCore/html/parser/HTMLPreloadScanner.cpp b/Source/WebCore/html/parser/HTMLPreloadScanner.cpp
>index ea15de04e4d1ee5cb931e5468cf081c1ff73e9a0..9a9fbb0065f0758e73edb57f63de48b77d6721ae 100644
>--- a/Source/WebCore/html/parser/HTMLPreloadScanner.cpp
>+++ b/Source/WebCore/html/parser/HTMLPreloadScanner.cpp
>@@ -101,6 +101,7 @@ class TokenPreloadScanner::StartTagScanner {
>         , m_linkIsStyleSheet(false)
>         , m_metaIsViewport(false)
>         , m_inputIsImage(false)
>+        , m_inputIsModuleScript(false)
>         , m_deviceScaleFactor(deviceScaleFactor)
>     {
>     }
>@@ -144,7 +145,11 @@ class TokenPreloadScanner::StartTagScanner {
> 
>         auto request = std::make_unique<PreloadRequest>(initiatorFor(m_tagId), m_urlToLoad, predictedBaseURL, resourceType(), m_mediaAttribute);
>         request->setCrossOriginMode(m_crossOriginMode);
>-        request->setCharset(charset());
>+
>+        // https://html.spec.whatwg.org/multipage/scripting.html#prepare-a-script
>+        // NOTE: If the script's type is "module", this encoding will be ignored.
>+        if (!m_inputIsModuleScript)
>+            request->setCharset(charset());
>         return request;
>     }
> 
>@@ -203,7 +208,10 @@ class TokenPreloadScanner::StartTagScanner {
>             }
>             break;
>         case TagId::Script:
>-            processImageAndScriptAttribute(attributeName, attributeValue);
>+            if (match(attributeName, typeAttr) && equalLettersIgnoringASCIICase(attributeValue, "module"))
>+                m_inputIsModuleScript = true;
>+            else
>+                processImageAndScriptAttribute(attributeName, attributeValue);
>             break;
>         case TagId::Link:
>             if (match(attributeName, hrefAttr))
>@@ -315,6 +323,7 @@ class TokenPreloadScanner::StartTagScanner {
>     String m_metaContent;
>     bool m_metaIsViewport;
>     bool m_inputIsImage;
>+    bool m_inputIsModuleScript;
>     float m_deviceScaleFactor;
> };
> 
>diff --git a/Source/WebCore/html/parser/HTMLScriptRunner.cpp b/Source/WebCore/html/parser/HTMLScriptRunner.cpp
>index eb7788417048192cf5eb050c6c52787f6a04980e..25444fcf922badc7f3c5000b88653ebb712e5ae6 100644
>--- a/Source/WebCore/html/parser/HTMLScriptRunner.cpp
>+++ b/Source/WebCore/html/parser/HTMLScriptRunner.cpp
>@@ -41,6 +41,7 @@
> #include "NestingLevelIncrementer.h"
> #include "NotImplemented.h"
> #include "ScriptElement.h"
>+#include "ScriptModuleGraph.h"
> #include "ScriptSourceCode.h"
> 
> namespace WebCore {
>@@ -75,6 +76,11 @@ void HTMLScriptRunner::detach()
>     m_document = 0;
> }
> 
>+inline Ref<Event> createScriptLoadEvent()
>+{
>+    return Event::create(eventNames().loadEvent, false, false);
>+}
>+
> static URL documentURLForScriptExecution(Document* document)
> {
>     if (!document || !document->frame())
>@@ -84,22 +90,6 @@ static URL documentURLForScriptExecution(Document* document)
>     return document->frame()->document()->url();
> }
> 
>-inline Ref<Event> createScriptLoadEvent()
>-{
>-    return Event::create(eventNames().loadEvent, false, false);
>-}
>-
>-ScriptSourceCode HTMLScriptRunner::sourceFromPendingScript(const PendingScript& script, bool& errorOccurred) const
>-{
>-    if (script.cachedScript()) {
>-        errorOccurred = script.cachedScript()->errorOccurred();
>-        ASSERT(script.cachedScript()->isLoaded());
>-        return ScriptSourceCode(script.cachedScript());
>-    }
>-    errorOccurred = false;
>-    return ScriptSourceCode(script.element().textContent(), documentURLForScriptExecution(m_document), script.startingPosition());
>-}
>-
> bool HTMLScriptRunner::isPendingScriptReady(const PendingScript& script)
> {
>     if (!m_document)
>@@ -123,10 +113,19 @@ void HTMLScriptRunner::executeParsingBlockingScript()
>     executePendingScriptAndDispatchEvent(WTFMove(m_parserBlockingScript));
> }
> 
>+static void executePendingScript(ScriptElement& scriptElement, Document* document, PendingScript& pendingScript)
>+{
>+    if (auto* cachedScript = pendingScript.cachedScript())
>+        scriptElement.executeScript(ScriptSourceCode(cachedScript));
>+    else if (auto* moduleGraph = pendingScript.moduleGraph())
>+        moduleGraph->evaluate(pendingScript.element());
>+    else
>+        scriptElement.executeScript(ScriptSourceCode(pendingScript.element().textContent(), documentURLForScriptExecution(document), pendingScript.startingPosition()));
>+}
>+
> void HTMLScriptRunner::executePendingScriptAndDispatchEvent(RefPtr<PendingScript> pendingScript)
> {
>-    bool errorOccurred = false;
>-    ScriptSourceCode sourceCode = sourceFromPendingScript(*pendingScript, errorOccurred);
>+    bool errorOccurred = pendingScript->errorOccurred();
> 
>     // Stop watching loads before executeScript to prevent recursion if the script reloads itself.
>     if (pendingScript->watchingForLoad())
>@@ -142,7 +141,7 @@ void HTMLScriptRunner::executePendingScriptAndDispatchEvent(RefPtr<PendingScript
>             scriptElement->dispatchErrorEvent();
>         else {
>             ASSERT(isExecutingScript());
>-            scriptElement->executeScript(sourceCode);
>+            executePendingScript(*scriptElement, m_document, *pendingScript);
>             pendingScript->element().dispatchEvent(createScriptLoadEvent());
>         }
>     }
>@@ -236,8 +235,12 @@ static Ref<PendingScript> requestPendingScript(Element* script)
> {
>     auto& scriptElement = *toScriptElementIfPossible(script);
>     ASSERT(scriptElement.willBeParserExecuted());
>-    ASSERT(scriptElement.cachedScript());
>-    return PendingScript::create(*script, *scriptElement.cachedScript());
>+    ASSERT(scriptElement.cachedScript() || scriptElement.moduleGraph());
>+
>+    auto* cachedScript = scriptElement.cachedScript().get();
>+    if (cachedScript)
>+        return PendingScript::create(*script, *cachedScript);
>+    return PendingScript::create(*script, *scriptElement.moduleGraph());
> }
> 
> void HTMLScriptRunner::requestParsingBlockingScript(Element* element)
>diff --git a/Source/WebCore/html/parser/HTMLScriptRunner.h b/Source/WebCore/html/parser/HTMLScriptRunner.h
>index e6b5ed526859280511132707ce0129576f71c494..d3e77008ce55f52c7ba7c066573fea25a30c01e9 100644
>--- a/Source/WebCore/html/parser/HTMLScriptRunner.h
>+++ b/Source/WebCore/html/parser/HTMLScriptRunner.h
>@@ -23,11 +23,11 @@
>  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
>  */
> 
>-#ifndef HTMLScriptRunner_h
>-#define HTMLScriptRunner_h
>+#pragma once
> 
> #include "PendingScript.h"
> #include <wtf/Deque.h>
>+#include <wtf/Optional.h>
> #include <wtf/text/TextPosition.h>
> 
> namespace WebCore {
>@@ -75,7 +75,8 @@ class HTMLScriptRunner {
>     void watchForLoad(PendingScript&);
>     void stopWatchingForLoad(PendingScript&);
>     bool isPendingScriptReady(const PendingScript&);
>-    ScriptSourceCode sourceFromPendingScript(const PendingScript&, bool& errorOccurred) const;
>+
>+    void executeScript(PendingScript&);
> 
>     Document* m_document;
>     HTMLScriptRunnerHost& m_host;
>@@ -91,5 +92,3 @@ class HTMLScriptRunner {
> };
> 
> }
>-
>-#endif
>diff --git a/Source/WebCore/loader/cache/CachedScript.cpp b/Source/WebCore/loader/cache/CachedScript.cpp
>index 74584c9e6468543c81771d901eab2f7ef8ef6435..9d3f4c4bb2bf11924b529c2eee9600131fa1f5e1 100644
>--- a/Source/WebCore/loader/cache/CachedScript.cpp
>+++ b/Source/WebCore/loader/cache/CachedScript.cpp
>@@ -123,12 +123,10 @@ void CachedScript::destroyDecodedData()
>     setDecodedSize(0);
> }
> 
>-#if ENABLE(NOSNIFF)
> bool CachedScript::mimeTypeAllowedByNosniff() const
> {
>     return parseContentTypeOptionsHeader(m_response.httpHeaderField(HTTPHeaderName::XContentTypeOptions)) != ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType());
> }
>-#endif
> 
> bool CachedScript::shouldIgnoreHTTPStatusCodeErrors() const
> {
>diff --git a/Source/WebCore/loader/cache/CachedScript.h b/Source/WebCore/loader/cache/CachedScript.h
>index dbf1d1416c520f914771db9305f25837bf4cb1ef..adec9db0a61d9273f6f2f1d7a2b5eaeb94813cb9 100644
>--- a/Source/WebCore/loader/cache/CachedScript.h
>+++ b/Source/WebCore/loader/cache/CachedScript.h
>@@ -42,9 +42,7 @@ class CachedScript final : public CachedResource {
> 
>     String mimeType() const;
> 
>-#if ENABLE(NOSNIFF)
>     bool mimeTypeAllowedByNosniff() const;
>-#endif
> 
> private:
>     bool mayTryReplaceEncodedData() const override { return true; }
>diff --git a/Source/WebCore/platform/network/HTTPParsers.cpp b/Source/WebCore/platform/network/HTTPParsers.cpp
>index 0c8ea46df7735cc388ba771b1538ac5c68aced95..e9bbe31c6313fb967bebdb4f0b40247fa4215aca 100644
>--- a/Source/WebCore/platform/network/HTTPParsers.cpp
>+++ b/Source/WebCore/platform/network/HTTPParsers.cpp
>@@ -464,14 +464,12 @@ XSSProtectionDisposition parseXSSProtectionHeader(const String& header, String&
>     }
> }
> 
>-#if ENABLE(NOSNIFF)
> ContentTypeOptionsDisposition parseContentTypeOptionsHeader(const String& header)
> {
>     if (equalLettersIgnoringASCIICase(header.stripWhiteSpace(), "nosniff"))
>         return ContentTypeOptionsNosniff;
>     return ContentTypeOptionsNone;
> }
>-#endif
> 
> AtomicString extractReasonPhraseFromHTTPStatusLine(const String& statusLine)
> {
>diff --git a/Source/WebCore/platform/network/HTTPParsers.h b/Source/WebCore/platform/network/HTTPParsers.h
>index 6252db231b4d7002143f9c449a647a54af92f629..96ace32ef8862834801f8978207435693c9df645 100644
>--- a/Source/WebCore/platform/network/HTTPParsers.h
>+++ b/Source/WebCore/platform/network/HTTPParsers.h
>@@ -58,12 +58,10 @@ enum ContentDispositionType {
>     ContentDispositionOther
> };
> 
>-#if ENABLE(NOSNIFF)
> enum ContentTypeOptionsDisposition {
>     ContentTypeOptionsNone,
>     ContentTypeOptionsNosniff
> };
>-#endif
> 
> enum XFrameOptionsDisposition {
>     XFrameOptionsNone,
>@@ -91,9 +89,7 @@ XFrameOptionsDisposition parseXFrameOptionsHeader(const String&);
> // -1 could be set to one of the return parameters to indicate the value is not specified.
> bool parseRange(const String&, long long& rangeOffset, long long& rangeEnd, long long& rangeSuffixLength);
> 
>-#if ENABLE(NOSNIFF)
> ContentTypeOptionsDisposition parseContentTypeOptionsHeader(const String& header);
>-#endif
> 
> // Parsing Complete HTTP Messages.
> enum HTTPVersion { Unknown, HTTP_1_0, HTTP_1_1 };
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 9b49ee2f4daea5e8274f3dcb12ca5cc355bd1b6c..a918123f2acd40ffc5d8754c60bc302a9962e233 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,73 @@
>+2016-08-31  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-incorrect-relative-specifier-expected.txt: Added.
>+        * js/dom/module-incorrect-relative-specifier.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-type-case-insensitive-expected.txt: Added.
>+        * js/dom/module-type-case-insensitive.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-30  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         Unreviewed, update iOS simulator WK1 flaky tests.
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index e7aac6686168b49eaccd03af5481170bf4ef55cb..98535031a9feebccd5a8705cb7dfb6abdfcb5621 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -1239,3 +1239,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..b7682e2fef040dd8185c4893f4913eea799c42d7
>--- /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-incorrect-relative-specifier-expected.txt b/LayoutTests/js/dom/module-incorrect-relative-specifier-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..ff713e0439751aad16234e797adf04a6bc2347f7
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-incorrect-relative-specifier-expected.txt
>@@ -0,0 +1,15 @@
>+CONSOLE MESSAGE: TypeError: Module specifier does not start with "/", "./", or "../"
>+CONSOLE MESSAGE: TypeError: Module specifier does not start with "/", "./", or "../"
>+Test window.onerror will be fired when the incorrect relative specifier is specified.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+0
>+1
>+2
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-incorrect-relative-specifier.html b/LayoutTests/js/dom/module-incorrect-relative-specifier.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..019875eb04f3a80ec3ac8340a60351d64c83168d
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-incorrect-relative-specifier.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 window.onerror will be fired when the incorrect relative specifier is specified.');
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+debug('Module is not executed yet.');
>+var count = 0;
>+window.onerror = function () {
>+    var current = count++;
>+    debug(`${current}`);
>+    if (count === 3)
>+        finishJSTest();
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+
>+<script type="module">
>+import Incorrect from "incorrect"
>+</script>
>+
>+<script type="module">
>+import Incorrect from "$hello"
>+</script>
>+
>+<script type="module">
>+import Incorrect from ".../test"
>+</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..8dd4da67630d2485c0b2fd2b303255e4422955fa
>--- /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..1c53a71173d44142831a0a61d77a8fc6d85223b7
>--- /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..92792d8fcd22500ed460604e582eebcd0082fbdf
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-not-found-error-event-expected.txt
>@@ -0,0 +1,10 @@
>+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..17b81470feec0aae94e5220d90cbbf35809ef189
>--- /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 "./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-type-case-insensitive-expected.txt b/LayoutTests/js/dom/module-type-case-insensitive-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..77680193d3e25f8303c1d026710a88e9e9c7e9aa
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-type-case-insensitive-expected.txt
>@@ -0,0 +1,11 @@
>+Test that type="module" should be case-insensitive.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Module is loaded.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-type-case-insensitive.html b/LayoutTests/js/dom/module-type-case-insensitive.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..eef146b1746bf121fccefe8b7097a7324a41bc95
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-type-case-insensitive.html
>@@ -0,0 +1,39 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test that type="module" should be case-insensitive.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+
>+Promise.all([
>+    new Promise(function (resolve) {
>+        window.resolve1 = resolve;
>+    }),
>+    new Promise(function (resolve) {
>+        window.resolve2 = resolve;
>+    }),
>+]).then(function () {
>+    debug('Module is loaded.');
>+    finishJSTest();
>+});
>+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";
>+window.resolve1();
>+</script>
>+
>+<script type="MODULE">
>+import Cocoa from "./script-tests/module-inline-simple.js";
>+window.resolve2();
>+</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..bff4d9508b1d490a3ba26f731b862a8494d7b146
>--- /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..d481afd7abfd8b0793e622153ccacec2c526f618
>--- /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..081f67e6aaa28225f33a14435c3ead70efb94b55
>--- /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..f98d7b482cb43206ab389da2404c92d704fb5069
>--- /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