Attachment 292487 Details for Bug 148897 – Patch

[patch] Patch

bug-148897-20161022004751.patch (text/plain), 161.49 KB, created by Yusuke Suzuki on 2016-10-22 00:51:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2016-10-22 00:51:31 PDT

Size: 161.49 KB

patch

obsolete

>Subversion Revision: 207709
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6da67ec04ef7c50a84e04d1ddc4156d184282f89..1401158b8e1d11ec49bcfea7a96d2abfc954c986 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,214 @@
>+2016-10-22  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!).
>+
>+        This patch introduces ES6 Modules into WebCore. We integrate JSC's JSModuleLoader into WebCore.
>+        JSC constructs the module loader pipeline by the chains of the promises. To handle this,
>+        the following components are added.
>+
>+            1. ScriptModuleGraph
>+
>+                ScriptModuleGraph wraps the promise based JSModuleLoader pipeline and offers
>+                similar APIs to CachedScript. ScriptElement and PendingScript interact with
>+                ScriptModuleGraph when the script tag is the module tag instead of CachedScript.
>+                ScriptElement and PendingScript will receive the notification from
>+                ScriptModuleGraph by implementing ScriptModuleGraphClient.
>+
>+            2. ScriptModuleLoader
>+
>+                This is the module loader instantiated per document. It manages fetching and
>+                offers the callbacks for the JSC's JSModuleLoader implementation. ScriptModuleLoader
>+                will fetch the resource by creating CachedModuleScriptLoader per resource. ScriptModuleLoader
>+                will receive the notification by implementing CachedModuleScriptLoaderClient. When the
>+                resource is fetched, the module loader will drive the promise resolve/reject chain.
>+
>+            3. CachedModuleScriptLoader
>+
>+                This fetches the resource by using CachedScript. Using CachedScript means that it
>+                automatically reports the resource to the inspector. CachedModuleScriptLoader notify to
>+                ScriptModuleLoader when the resource is fetched.
>+
>+        One tricky point is that the fetch requests issued from one module-graph should share the same
>+        nonce, crossorigin attributes etc.
>+
>+            Here, we wrote the module graph like `A -> B (A depends on B)`.
>+
>+            <script tag> -> A -> B -> C -> D
>+
>+        When fetching A, B, C, and D modules, we need to set the same nonce, crossorigin etc. configuration
>+        derived from the original script tag. So per module-graph information should be shared throughout
>+        the module loader pipeline. To do so, JSC's module loader implementation can take the value called
>+        `initiator`. Since the loader will propagate & share this `initiator` throughout the pipeline,
>+        we can transfer and share some metadata. Currently, we pass the JSWrapper of the script tag as the
>+        initiator. Each fetch request is created by using this initiator script element.
>+
>+        More integration into the inspector should be done in the subsequent patch.
>+
>+        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/CachedModuleScriptLoader.cpp: Added. CachedModuleScriptLoader is responsible to fetching the resource
>+        for the module script. It uses propagated `initiator` to create the request. This initiator is the JS wrapper
>+        of the script element issuing this fetching request. The name `initiator` is derived from the request.setInitiator().
>+        Once the resource is fetched, the fetcher will notify to the client. Currently, ScriptModuleLoader implements
>+        this client interface.
>+        (WebCore::CachedModuleScriptLoader::create):
>+        (WebCore::CachedModuleScriptLoader::CachedModuleScriptLoader):
>+        (WebCore::CachedModuleScriptLoader::~CachedModuleScriptLoader):
>+        (WebCore::CachedModuleScriptLoader::load): Create the request. We call ScriptElement::requestCachedScript to initiate
>+        a new fetching request. At that time, nonce and crossorigin (and charset) attributes of this element are applied
>+        to the new request.
>+        (WebCore::CachedModuleScriptLoader::notifyFinished):
>+        * bindings/js/CachedModuleScriptLoader.h: Copied from Source/WebCore/bindings/js/ScriptModuleLoader.h.
>+        * bindings/js/CachedModuleScriptLoaderClient.h: Added.
>+        (WebCore::CachedModuleScriptLoaderClient::~CachedModuleScriptLoaderClient):
>+        * bindings/js/JSBindingsAllInOne.cpp:
>+        * bindings/js/JSDOMBinding.cpp:
>+        (WebCore::retrieveErrorMessage):
>+        (WebCore::reportException):
>+        * bindings/js/JSDOMBinding.h:
>+        * bindings/js/ScriptController.cpp:
>+        (WebCore::ScriptController::ScriptController):
>+        (WebCore::ScriptController::evaluateInWorld):
>+        (WebCore::ScriptController::loadModuleGraphInWorld):
>+        (WebCore::ScriptController::loadModuleGraph): This just performs loading and not executing
>+        the module graph. Once the module graph is loaded, it is notified to the given ScriptModuleGraph.
>+        (WebCore::ScriptController::linkAndEvaluateModuleGraphInWorld):
>+        (WebCore::ScriptController::linkAndEvaluateModuleGraph): This executes the linking and evaluation
>+        of the already instantiated module graph. After loading the module graph, we call this function
>+        for the module to evaluate it. This is called from ScriptElement::executeModuleGraph.
>+        (WebCore::ScriptController::evaluateModule): Every time we evaluate the module, the
>+        ScriptModuleLoader::evaluate hook is called. So the loader calls this function to actually evaluate
>+        the module.
>+        (WebCore::jsValueToModuleKey):
>+        (WebCore::ScriptController::setupModuleGraphHandlers): The JSC's module loader is driven by the chain
>+        of the promise. So here, we convert this to ScriptModuleGraph / ScriptModuleGraphClient style and
>+        encapsulate the details. This encapsulation makes ScriptModuleGraph similar to CachedScript and
>+        it makes things simple in the rest of WebCore.
>+        If the propagated error is already reported to the inspector, we receive moduleLoaderAlreadyReportedErrorSymbol
>+        as the error value. So at that case, we don't report it twice.
>+        If the rejection is caused due to the canceled fetching, moduleLoaderFetchingIsCanceledSymbol appears as the
>+        error value. In that case, we will call ScriptModuleGraph::notifyCanceled.
>+        (WebCore::ScriptController::executeScript):
>+        * bindings/js/ScriptController.h:
>+        (WebCore::ScriptController::moduleLoaderAlreadyReportedErrorSymbol):
>+        (WebCore::ScriptController::moduleLoaderFetchingIsCanceledSymbol):
>+        * bindings/js/ScriptModuleGraph.cpp: Added. ScriptModuleGraph offers similar interface to CachedScript
>+        to make ScriptElement things easier. It encapsulates the detail of the JSC JSModuleLoader that this module loader
>+        is driven by the chain of the promises. ScriptModuleGraph's callbacks are called from the promise's handlers
>+        configured in ScriptController::loadModuleGraph.
>+        (WebCore::ScriptModuleGraph::create):
>+        (WebCore::ScriptModuleGraph::ScriptModuleGraph):
>+        (WebCore::ScriptModuleGraph::load):
>+        (WebCore::ScriptModuleGraph::notifyLoaded):
>+        (WebCore::ScriptModuleGraph::notifyErrored):
>+        (WebCore::ScriptModuleGraph::notifyCanceled):
>+        (WebCore::ScriptModuleGraph::notifyClientFinished):
>+        (WebCore::ScriptModuleGraph::addClient):
>+        (WebCore::ScriptModuleGraph::removeClient):
>+        * bindings/js/ScriptModuleGraph.h: Copied from Source/WebCore/bindings/js/ScriptModuleLoader.h.
>+        (WebCore::ScriptModuleGraph::moduleKey):
>+        (WebCore::ScriptModuleGraph::wasErrored):
>+        (WebCore::ScriptModuleGraph::wasCanceled):
>+        (WebCore::ScriptModuleGraph::isLoaded):
>+        (WebCore::ScriptModuleGraph::nonce):
>+        (WebCore::ScriptModuleGraph::crossOriginMode): Save nonce and crossorigin attributes
>+        when we start ScriptElement::prepareScript.
>+        * bindings/js/ScriptModuleGraphClient.h: Added.
>+        (WebCore::ScriptModuleGraphClient::~ScriptModuleGraphClient):
>+        * bindings/js/ScriptModuleLoader.cpp: We use DeferredWrapper to resolve promises used
>+        for the module pipeline. Thus, once the active DOM objects are suspended, the module loader
>+        propagation stops.
>+        (WebCore::ScriptModuleLoader::~ScriptModuleLoader): Clear the clients of the fetchers issued
>+        from this loader.
>+        (WebCore::ScriptModuleLoader::resolve): Resolve the module specifier (that is written
>+        in `import from "XXX"`) to the unique module key. We use URL string as module key.
>+        The edge case is that the module is inlined one. In that case, we don't have any URL for that.
>+        Instead of URL, we use symbol at that time.
>+        (WebCore::ScriptModuleLoader::fetch): Start fetching for the requested module. It returns
>+        the promise that is resolved when the fetching is done. The loader creates the fetcher, and the
>+        fetcher start loading the resource. Once the fetcher loads the resource, it notify to the loader
>+        through CachedModuleScriptLoaderClient interface. Since we pass the original script element as the
>+        `initiator` here, the fetcher can use this initiator to create the request.
>+        While the result of CachedResource has 3 variations (loaded, canceled, error occurred), Promise
>+        only tells us whether it is resolved or rejected. When ScriptModuleGraph gets the result from the
>+        promise chain, it needs to know which the result is. To transfer the canceled information, we
>+        reject the promise with the special symbol `moduleLoaderAlreadyReportedErrorSymbol`. This offers
>+        the way to distinguish the canceled error from the other errors.
>+        (WebCore::ScriptModuleLoader::evaluate): This is the hook function that is called when JSC's
>+        JSModuleLoader attempts to execute each module.
>+        (WebCore::ScriptModuleLoader::notifyFinished): This function is called when the fetcher completes.
>+        We will resolve the promise with the result of the fetching. One tricky thing is networking error.
>+        This is already reported to the inspector by the CachedResource loader. So we don't want to report
>+        it to the inspector twice. To distinguish the usual errors (that can be raised by the module loader
>+        pipeline) from the already reported networking error, we take the same way to
>+        `moduleLoaderAlreadyReportedErrorSymbol` described in ScriptModuleLoader::fetchPromise section. We
>+        use `moduleLoaderAlreadyReportedErrorSymbol` for this purpose.
>+        Currently, since the module loader hook is not exposed to users, the usual errors won't occur.
>+        And mime type checking is done here since the module script always require this check.
>+        * bindings/js/ScriptModuleLoader.h:
>+        * dom/CurrentScriptIncrementer.h:
>+        (WebCore::CurrentScriptIncrementer::CurrentScriptIncrementer): Add the ability to take nullptr.
>+        * dom/Document.cpp:
>+        (WebCore::Document::pushCurrentScript): document.currentScript should return `null` when
>+        executing the module script.
>+        * dom/Document.h:
>+        * dom/LoadableScriptModuleGraph.cpp: Added. from Source/WebCore/dom/ScriptRunner.h. This is the derived
>+        class from LoadableScript. It is used for the script module graphs.
>+        (WebCore::LoadableScriptModuleGraph::create):
>+        (WebCore::LoadableScriptModuleGraph::LoadableScriptModuleGraph):
>+        (WebCore::LoadableScriptModuleGraph::~LoadableScriptModuleGraph):
>+        (WebCore::LoadableScriptModuleGraph::isLoaded):
>+        (WebCore::LoadableScriptModuleGraph::wasErrored):
>+        (WebCore::LoadableScriptModuleGraph::wasCanceled):
>+        (WebCore::LoadableScriptModuleGraph::notifyFinished):
>+        (WebCore::LoadableScriptModuleGraph::execute):
>+        * dom/LoadableScriptModuleGraph.h: Added.
>+        (isType):
>+        * dom/ScriptElement.cpp:
>+        (WebCore::ScriptElement::ScriptElement):
>+        (WebCore::ScriptElement::determineScriptType):
>+        (WebCore::ScriptElement::prepareScript): prepareScript is aligned to whatwg spec: the last
>+        sequence to setup flags has one-on-one correspondence to the spec now. And prepareScript
>+        recognizes the type="module" case and call the requestModuleScript to setup the ScriptModuleGraph.
>+        (WebCore::ScriptElement::requestClassicScript):
>+        (WebCore::ScriptElement::requestModuleGraph): We use the nonce and crossorigin attributes
>+        at the time of preparing the script tag. To do so, we store the above values in ScriptModuleGraph.
>+        (WebCore::ScriptElement::requestScriptWithCacheForModuleGraph): The module loader will construct the
>+        fetching request by calling this function. This should be here since we would like to set
>+        this Element to the initiator of the request. And nonce and crossorigin attributes of this
>+        script tag will be used.
>+        (WebCore::ScriptElement::requestScriptWithCache):
>+        (WebCore::ScriptElement::executeModuleGraph): The entry point to execute the module graph.
>+        Since the module graph is beyond the multiple CachedScript code, we have the different
>+        entry point from ScriptElement::executeScript.
>+        * dom/ScriptElement.h:
>+        (WebCore::ScriptElement::scriptType):
>+        * html/parser/HTMLPreloadScanner.cpp:
>+        (WebCore::TokenPreloadScanner::StartTagScanner::createPreloadRequest): According to the spec,
>+        the module tag ignores the "charset" attribute as the same to the worker's importScript.
>+        But WebKit supports the "charset" for importScript intentionally. So to be consistent, even for
>+        the module tags, we handle the "charset" attribute. We explicitly note about it in the preloader.
>+
> 2016-10-21  David Kilzer  <ddkilzer@apple.com>
> 
>         Bug 163762: IntSize::area() should used checked arithmetic
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index b6a70feeabd71c53bcc2ae7301b1d247a454b68d..f785fd85dd6e9b8d36900a269d4d286c5672a89c 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1063,6 +1063,7 @@ set(WebCore_SOURCES
>     bindings/generic/RuntimeEnabledFeatures.cpp
> 
>     bindings/js/ArrayValue.cpp
>+    bindings/js/CachedModuleScriptLoader.cpp
>     bindings/js/CallbackFunction.cpp
>     bindings/js/DOMWrapperWorld.cpp
>     bindings/js/Dictionary.cpp
>@@ -1209,6 +1210,7 @@ set(WebCore_SOURCES
>     bindings/js/ScriptCachedFrameData.cpp
>     bindings/js/ScriptController.cpp
>     bindings/js/ScriptGlobalObject.cpp
>+    bindings/js/ScriptModuleGraph.cpp
>     bindings/js/ScriptModuleLoader.cpp
>     bindings/js/ScriptState.cpp
>     bindings/js/StructuredClone.cpp
>@@ -1462,6 +1464,7 @@ set(WebCore_SOURCES
>     dom/LiveNodeList.cpp
>     dom/LoadableClassicScript.cpp
>     dom/LoadableScript.cpp
>+    dom/LoadableScriptModuleGraph.cpp
>     dom/MessageChannel.cpp
>     dom/MessageEvent.cpp
>     dom/MessagePort.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index c875ad02dd324c116ddd8bb946184708f48984d2..79ef68cf6ef9e851df695435b66cfdda9b8c418d 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -6167,6 +6167,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 */; };
>+		E307DECC1D81E4B300141CAF /* ScriptModuleGraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E307DEC91D81E46E00141CAF /* ScriptModuleGraph.cpp */; };
>+		E307DECD1D81E4B600141CAF /* ScriptModuleGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DECA1D81E46E00141CAF /* ScriptModuleGraph.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		E307DECE1D81E4BA00141CAF /* ScriptModuleGraphClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DECB1D81E49500141CAF /* ScriptModuleGraphClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		E307DECF1D81E4C300141CAF /* CachedModuleScriptLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E307DEC61D81E44800141CAF /* CachedModuleScriptLoader.cpp */; };
>+		E307DED01D81E4C700141CAF /* CachedModuleScriptLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DEC71D81E44800141CAF /* CachedModuleScriptLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		E307DED11D81E4CB00141CAF /* CachedModuleScriptLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DEC81D81E44800141CAF /* CachedModuleScriptLoaderClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		E307DED41D81E4F000141CAF /* LoadableScriptModuleGraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E307DED21D81E4ED00141CAF /* LoadableScriptModuleGraph.cpp */; };
>+		E307DED51D81E4F200141CAF /* LoadableScriptModuleGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DED31D81E4ED00141CAF /* LoadableScriptModuleGraph.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		E3150EA61DA7219000194012 /* JSNodeDOMJIT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3AFA9641DA6E908002861BD /* JSNodeDOMJIT.cpp */; };
> 		E3150EA71DA7219300194012 /* DOMJITHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = E3150EA51DA7218D00194012 /* DOMJITHelpers.h */; };
> 		E377FE4D1DADE16500CDD025 /* NodeConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = E3D049931DADC04500718F3C /* NodeConstants.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -13950,6 +13958,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>"; };
>+		E307DEC61D81E44800141CAF /* CachedModuleScriptLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedModuleScriptLoader.cpp; sourceTree = "<group>"; };
>+		E307DEC71D81E44800141CAF /* CachedModuleScriptLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedModuleScriptLoader.h; sourceTree = "<group>"; };
>+		E307DEC81D81E44800141CAF /* CachedModuleScriptLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedModuleScriptLoaderClient.h; sourceTree = "<group>"; };
>+		E307DEC91D81E46E00141CAF /* ScriptModuleGraph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptModuleGraph.cpp; sourceTree = "<group>"; };
>+		E307DECA1D81E46E00141CAF /* ScriptModuleGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptModuleGraph.h; sourceTree = "<group>"; };
>+		E307DECB1D81E49500141CAF /* ScriptModuleGraphClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptModuleGraphClient.h; sourceTree = "<group>"; };
>+		E307DED21D81E4ED00141CAF /* LoadableScriptModuleGraph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoadableScriptModuleGraph.cpp; sourceTree = "<group>"; };
>+		E307DED31D81E4ED00141CAF /* LoadableScriptModuleGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoadableScriptModuleGraph.h; sourceTree = "<group>"; };
> 		E3150EA51DA7218D00194012 /* DOMJITHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMJITHelpers.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>"; };
>@@ -21453,6 +21469,9 @@
> 				49B3760A15C6C6840059131D /* ArrayValue.cpp */,
> 				49B3760B15C6C6840059131D /* ArrayValue.h */,
> 				2DFA488E1DB541C200362B99 /* BufferSource.h */,
>+				E307DEC61D81E44800141CAF /* CachedModuleScriptLoader.cpp */,
>+				E307DEC71D81E44800141CAF /* CachedModuleScriptLoader.h */,
>+				E307DEC81D81E44800141CAF /* CachedModuleScriptLoaderClient.h */,
> 				BCD533630ED6848900887468 /* CachedScriptSourceProvider.h */,
> 				93F8B3060A300FEA00F61AB8 /* CodeGeneratorJS.pm */,
> 				312D67B01535691F00563D0D /* Dictionary.cpp */,
>@@ -21529,6 +21548,9 @@
> 				41F066E20F64BCF600A07EAC /* ScriptGlobalObject.h */,
> 				E38838941BAD145F00D62EE3 /* ScriptModuleLoader.cpp */,
> 				E38838951BAD145F00D62EE3 /* ScriptModuleLoader.h */,
>+				E307DEC91D81E46E00141CAF /* ScriptModuleGraph.cpp */,
>+				E307DECA1D81E46E00141CAF /* ScriptModuleGraph.h */,
>+				E307DECB1D81E49500141CAF /* ScriptModuleGraphClient.h */,
> 				934CC1090EDB223900A658F2 /* ScriptSourceCode.h */,
> 				4127D5360F8AAB1D00E424F5 /* ScriptState.cpp */,
> 				41C760B00EDE03D300C1655F /* ScriptState.h */,
>@@ -23588,6 +23610,8 @@
> 				E3B2F0E41D7F35EC00B0C9D1 /* LoadableClassicScript.h */,
> 				E3B2F0E91D7F3D3C00B0C9D1 /* LoadableScript.cpp */,
> 				E3B2F0E71D7F35EC00B0C9D1 /* LoadableScript.h */,
>+				E307DED21D81E4ED00141CAF /* LoadableScriptModuleGraph.cpp */,
>+				E307DED31D81E4ED00141CAF /* LoadableScriptModuleGraph.h */,
> 				E3B2F0E81D7F35EC00B0C9D1 /* LoadableScriptClient.h */,
> 				BC9A6144146859D9006057FD /* make_dom_exceptions.pl */,
> 				BC9A6145146859D9006057FD /* make_event_factory.pl */,
>@@ -24492,6 +24516,7 @@
> 				BCC065810F3CE1B700CD2D87 /* ClientRectList.h in Headers */,
> 				7C3A91E61C963B8800D1A7E3 /* ClipboardAccessPolicy.h in Headers */,
> 				85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */,
>+				E307DED01D81E4C700141CAF /* CachedModuleScriptLoader.h in Headers */,
> 				FB92DF4B15FED08700994433 /* ClipPathOperation.h in Headers */,
> 				580371621A66F00A00BAF519 /* ClipRect.h in Headers */,
> 				97AABD1314FA09D5007457AE /* CloseEvent.h in Headers */,
>@@ -25298,6 +25323,7 @@
> 				514129991C6976900059E714 /* IDBRequestCompletionEvent.h in Headers */,
> 				510A58FA1BACC7F200C19282 /* IDBRequestData.h in Headers */,
> 				5145B10A1BC48E2E00E86219 /* IDBResourceIdentifier.h in Headers */,
>+				E307DED11D81E4CB00141CAF /* CachedModuleScriptLoaderClient.h in Headers */,
> 				51D7236D1BB6174900478CA3 /* IDBResultData.h in Headers */,
> 				511EC1281C50AACA0032F983 /* IDBSerialization.h in Headers */,
> 				5185FCBB1BB4CBF80012898F /* IDBServer.h in Headers */,
>@@ -25542,6 +25568,7 @@
> 				2E37E00612DBC5A400A6B233 /* JSDOMURL.h in Headers */,
> 				BC6932740D7E293900AE44D1 /* JSDOMWindowBase.h in Headers */,
> 				07ABEF6E1D8A1C7600F21972 /* MediaDevicesEnumerationRequest.h in Headers */,
>+				E307DECE1D81E4BA00141CAF /* ScriptModuleGraphClient.h in Headers */,
> 				652FBBBC0DE27CB60001D386 /* JSDOMWindowCustom.h in Headers */,
> 				460CBF361D4BCD0E0092E88E /* JSDOMWindowProperties.h in Headers */,
> 				BCBFB53D0DCD29CF0019B3E5 /* JSDOMWindowShell.h in Headers */,
>@@ -26394,6 +26421,7 @@
> 				A5F8CD121D18F32E00AC0E53 /* PageHeapAgent.h in Headers */,
> 				2D5C9D0019C7B52E00B3C5C1 /* PageOverlay.h in Headers */,
> 				2D5C9D0219C7B52E00B3C5C1 /* PageOverlayController.h in Headers */,
>+				E307DED51D81E4F200141CAF /* LoadableScriptModuleGraph.h in Headers */,
> 				FBDB61A116D6037E00BB3394 /* PageRuleCollector.h in Headers */,
> 				F3820895147D35F90010BC06 /* PageRuntimeAgent.h in Headers */,
> 				A5F36D3B18F758720054C024 /* PageScriptDebugServer.h in Headers */,
>@@ -27034,6 +27062,7 @@
> 				A80E6DFC0A199067007FB8C5 /* StyleProperties.h in Headers */,
> 				E1B25107152A0BB00069B779 /* StylePropertyShorthand.h in Headers */,
> 				83C05A5B1A686212007E5DEA /* StylePropertyShorthandFunctions.h in Headers */,
>+				E307DECD1D81E4B600141CAF /* ScriptModuleGraph.h in Headers */,
> 				BC2272E40E82EE9B00E7F975 /* StyleRareInheritedData.h in Headers */,
> 				BC2272BD0E82EAAE00E7F975 /* StyleRareNonInheritedData.h in Headers */,
> 				BC2272870E82E70700E7F975 /* StyleReflection.h in Headers */,
>@@ -28473,6 +28502,7 @@
> 				BC1790BD1BBB36A80006D13E /* CSSVariableDependentValue.cpp in Sources */,
> 				9444CBD91D88483A0073A074 /* CSSVariableParser.cpp in Sources */,
> 				9444CBE91D8861CA0073A074 /* CSSVariableReferenceValue.cpp in Sources */,
>+				E307DECF1D81E4C300141CAF /* CachedModuleScriptLoader.cpp in Sources */,
> 				BC1790C01BBF2C430006D13E /* CSSVariableValue.cpp in Sources */,
> 				E11AF15111B9A1A300805103 /* Cursor.cpp in Sources */,
> 				265541521489B233000DFC5D /* CursorIOS.cpp in Sources */,
>@@ -28971,6 +29001,7 @@
> 				5160712E1BD8307800DBC4F2 /* IDBObjectStoreInfo.cpp in Sources */,
> 				5185FCA31BB4C4E80012898F /* IDBOpenDBRequest.cpp in Sources */,
> 				5185FCA81BB4C4E80012898F /* IDBRequest.cpp in Sources */,
>+				E307DECC1D81E4B300141CAF /* ScriptModuleGraph.cpp in Sources */,
> 				514129981C6976900059E714 /* IDBRequestCompletionEvent.cpp in Sources */,
> 				510A58F91BACC7F200C19282 /* IDBRequestData.cpp in Sources */,
> 				5145B1091BC48E2E00E86219 /* IDBResourceIdentifier.cpp in Sources */,
>@@ -29586,6 +29617,7 @@
> 				B222F69C0AB771B80022EFAD /* JSSVGElement.cpp in Sources */,
> 				8542A79A0AE5C94400DF58DF /* JSSVGElementWrapperFactory.cpp in Sources */,
> 				B2FA3D680AB75A6F000E5AC4 /* JSSVGEllipseElement.cpp in Sources */,
>+				E307DED41D81E4F000141CAF /* LoadableScriptModuleGraph.cpp in Sources */,
> 				B266CD4D0C3AEC6500EB08D2 /* JSSVGException.cpp in Sources */,
> 				B2FA3D6A0AB75A6F000E5AC4 /* JSSVGFEBlendElement.cpp in Sources */,
> 				B2FA3D6C0AB75A6F000E5AC4 /* JSSVGFEColorMatrixElement.cpp in Sources */,
>diff --git a/Source/WebCore/bindings/js/CachedModuleScriptLoader.cpp b/Source/WebCore/bindings/js/CachedModuleScriptLoader.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..e157d1ec5545c3a3c947304e1e0f2f76f5c36465
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/CachedModuleScriptLoader.cpp
>@@ -0,0 +1,92 @@
>+/*
>+ * 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 "CachedModuleScriptLoader.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 {
>+
>+Ref<CachedModuleScriptLoader> CachedModuleScriptLoader::create(CachedModuleScriptLoaderClient& client, DeferredPromise& promise)
>+{
>+    return adoptRef(*new CachedModuleScriptLoader(client, promise));
>+}
>+
>+CachedModuleScriptLoader::CachedModuleScriptLoader(CachedModuleScriptLoaderClient& client, DeferredPromise& promise)
>+    : m_client(&client)
>+    , m_promise(&promise)
>+{
>+}
>+
>+CachedModuleScriptLoader::~CachedModuleScriptLoader()
>+{
>+    if (m_cachedScript) {
>+        m_cachedScript->removeClient(*this);
>+        m_cachedScript = nullptr;
>+    }
>+}
>+
>+bool CachedModuleScriptLoader::load(ScriptElement& scriptElement, const URL& sourceURL)
>+{
>+    ASSERT(!m_cachedScript);
>+    m_cachedScript = scriptElement.requestScriptWithCacheForModuleGraph(sourceURL);
>+    if (!m_cachedScript)
>+        return false;
>+
>+    // Note: If the content is already cached, this immeidately calls notifyFinished.
>+    m_cachedScript->addClient(*this);
>+    return true;
>+}
>+
>+void CachedModuleScriptLoader::notifyFinished(CachedResource& resource)
>+{
>+    if (!m_promise)
>+        return;
>+
>+    ASSERT_UNUSED(resource, &resource == m_cachedScript);
>+    ASSERT(m_cachedScript);
>+    ASSERT(m_promise);
>+
>+    Ref<CachedModuleScriptLoader> protectedThis(*this);
>+    if (m_client)
>+        m_client->notifyFinished(*this, WTFMove(m_promise));
>+
>+    // 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.
>+    m_cachedScript->removeClient(*this);
>+    m_cachedScript = nullptr;
>+}
>+
>+}
>diff --git a/Source/WebCore/bindings/js/CachedModuleScriptLoader.h b/Source/WebCore/bindings/js/CachedModuleScriptLoader.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..88477df9e5aad7ff1e0529e11a5b1c314d7c7f30
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/CachedModuleScriptLoader.h
>@@ -0,0 +1,71 @@
>+/*
>+ * 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 "JSDOMPromise.h"
>+#include "ScriptElement.h"
>+#include "URL.h"
>+#include <runtime/JSInternalPromiseDeferred.h>
>+#include <wtf/Noncopyable.h>
>+#include <wtf/Ref.h>
>+
>+namespace WebCore {
>+
>+class Document;
>+class JSDOMGlobalObject;
>+class ScriptElement;
>+class CachedModuleScriptLoaderClient;
>+
>+class CachedModuleScriptLoader final : public RefCounted<CachedModuleScriptLoader>, private CachedResourceClient {
>+public:
>+    static Ref<CachedModuleScriptLoader> create(CachedModuleScriptLoaderClient&, DeferredPromise&);
>+
>+    ~CachedModuleScriptLoader();
>+
>+    bool load(ScriptElement&, const URL& sourceURL);
>+
>+    CachedScript* cachedScript() { return m_cachedScript.get(); }
>+
>+    void clearClient()
>+    {
>+        ASSERT(m_client);
>+        m_client = nullptr;
>+    }
>+
>+private:
>+    CachedModuleScriptLoader(CachedModuleScriptLoaderClient&, DeferredPromise&);
>+
>+    // For CachedResourceClient.
>+    void notifyFinished(CachedResource&) override;
>+
>+    CachedModuleScriptLoaderClient* m_client { nullptr };
>+    RefPtr<DeferredPromise> m_promise;
>+    CachedResourceHandle<CachedScript> m_cachedScript { };
>+};
>+
>+} // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/CachedModuleScriptLoaderClient.h b/Source/WebCore/bindings/js/CachedModuleScriptLoaderClient.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..6ccdbccca77a9edd6ccd1ce0fb33a07c0169420c
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/CachedModuleScriptLoaderClient.h
>@@ -0,0 +1,41 @@
>+/*
>+ * 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
>+
>+#include "JSDOMPromise.h"
>+
>+namespace WebCore {
>+
>+class CachedModuleScriptLoader;
>+
>+class CachedModuleScriptLoaderClient {
>+public:
>+    virtual ~CachedModuleScriptLoaderClient() { }
>+
>+    virtual void notifyFinished(CachedModuleScriptLoader&, RefPtr<DeferredPromise>) = 0;
>+};
>+
>+}
>diff --git a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>index 821ad27068f9db919ec7b05d2ffa0cf0377072f4..4bb0cbfc2403cc39cb61ce070fb82b514f887b90 100644
>--- a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>+++ b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
>@@ -26,6 +26,7 @@
> // This all-in-one cpp file cuts down on template bloat to allow us to build our Windows release build.
> 
> #include "ArrayValue.cpp"
>+#include "CachedModuleScriptLoader.cpp"
> #include "CallbackFunction.cpp"
> #include "DOMWrapperWorld.cpp"
> #include "Dictionary.cpp"
>@@ -142,6 +143,7 @@
> #include "ScriptCachedFrameData.cpp"
> #include "ScriptController.cpp"
> #include "ScriptGlobalObject.cpp"
>+#include "ScriptModuleGraph.cpp"
> #include "ScriptModuleLoader.cpp"
> #include "ScriptState.cpp"
> #include "SerializedScriptValue.cpp"
>diff --git a/Source/WebCore/bindings/js/JSDOMBinding.cpp b/Source/WebCore/bindings/js/JSDOMBinding.cpp
>index 0f525da83b394f52ee563ec5b3ab2af527415bac..1102634a7c15316453e85eb0fb4503f16e200d9b 100644
>--- a/Source/WebCore/bindings/js/JSDOMBinding.cpp
>+++ b/Source/WebCore/bindings/js/JSDOMBinding.cpp
>@@ -202,6 +202,28 @@ void reportException(ExecState* exec, JSValue exceptionValue, CachedScript* cach
>     reportException(exec, exception, cachedScript);
> }
> 
>+String retrieveErrorMessage(ExecState* exec, JSValue exceptionValue)
>+{
>+    if (ExceptionBase* exceptionBase = toExceptionBase(exceptionValue))
>+        return exceptionBase->toString();
>+
>+    // FIXME: <http://webkit.org/b/115087> Web Inspector: WebCore::reportException should not evaluate JavaScript handling exceptions
>+    // If this is a custom exception object, call toString on it to try and get a nice string representation for the exception.
>+    VM& vm = exec->vm();
>+    auto scope = DECLARE_CATCH_SCOPE(vm);
>+    String errorMessage;
>+    if (ErrorInstance* error = jsDynamicCast<ErrorInstance*>(exceptionValue))
>+        errorMessage = error->sanitizedToString(exec);
>+    else
>+        errorMessage = exceptionValue.toString(exec)->value(exec);
>+
>+    // We need to clear any new exception that may be thrown in the toString() call above.
>+    // reportException() is not supposed to be making new exceptions.
>+    scope.clearException();
>+    vm.clearLastException();
>+    return errorMessage;
>+}
>+
> void reportException(ExecState* exec, JSC::Exception* exception, CachedScript* cachedScript, ExceptionDetails* exceptionDetails)
> {
>     VM& vm = exec->vm();
>@@ -232,24 +254,7 @@ void reportException(ExecState* exec, JSC::Exception* exception, CachedScript* c
>         exceptionSourceURL = callFrame->sourceURL();
>     }
> 
>-    String errorMessage;
>-    JSValue exceptionValue = exception->value();
>-    if (ExceptionBase* exceptionBase = toExceptionBase(exceptionValue))
>-        errorMessage = exceptionBase->toString();
>-    else {
>-        // FIXME: <http://webkit.org/b/115087> Web Inspector: WebCore::reportException should not evaluate JavaScript handling exceptions
>-        // If this is a custom exception object, call toString on it to try and get a nice string representation for the exception.
>-        if (ErrorInstance* error = jsDynamicCast<ErrorInstance*>(exceptionValue))
>-            errorMessage = error->sanitizedToString(exec);
>-        else
>-            errorMessage = exceptionValue.toString(exec)->value(exec);
>-
>-        // We need to clear any new exception that may be thrown in the toString() call above.
>-        // reportException() is not supposed to be making new exceptions.
>-        scope.clearException();
>-        vm.clearLastException();
>-    }
>-
>+    String errorMessage = retrieveErrorMessage(exec, exception->value());
>     ScriptExecutionContext* scriptExecutionContext = globalObject->scriptExecutionContext();
>     scriptExecutionContext->reportException(errorMessage, lineNumber, columnNumber, exceptionSourceURL, exception, callStack->size() ? callStack : nullptr, cachedScript);
> 
>diff --git a/Source/WebCore/bindings/js/JSDOMBinding.h b/Source/WebCore/bindings/js/JSDOMBinding.h
>index fc3f6ad1cd4fd2f7c1eef147d158ae368ff959da..636090a5e0d2a7ae45d43b9e2d251e75411e59ee 100644
>--- a/Source/WebCore/bindings/js/JSDOMBinding.h
>+++ b/Source/WebCore/bindings/js/JSDOMBinding.h
>@@ -180,6 +180,7 @@ void addImpureProperty(const AtomicString&);
> 
> const JSC::HashTable& getHashTableForGlobalData(JSC::VM&, const JSC::HashTable& staticTable);
> 
>+String retrieveErrorMessage(JSC::ExecState*, JSC::JSValue exceptionValue);
> WEBCORE_EXPORT void reportException(JSC::ExecState*, JSC::JSValue exception, CachedScript* = nullptr);
> WEBCORE_EXPORT void reportException(JSC::ExecState*, JSC::Exception*, CachedScript* = nullptr, ExceptionDetails* = nullptr);
> void reportCurrentException(JSC::ExecState*);
>diff --git a/Source/WebCore/bindings/js/ScriptController.cpp b/Source/WebCore/bindings/js/ScriptController.cpp
>index 9a2003053bfc06cb316d0d23a4cd3277a756176f..f976018cc11e251a249f130a86d888c567ce3344 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>
> 
>@@ -85,6 +91,8 @@ ScriptController::ScriptController(Frame& frame)
>     : m_frame(frame)
>     , m_sourceURL(0)
>     , m_paused(false)
>+    , m_moduleLoaderAlreadyReportedErrorSymbol()
>+    , m_moduleLoaderFetchingIsCanceledSymbol()
> #if ENABLE(NETSCAPE_PLUGIN_API)
>     , m_windowScriptNPObject(0)
> #endif
>@@ -155,7 +163,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 +187,87 @@ JSValue ScriptController::evaluate(const ScriptSourceCode& sourceCode, Exception
>     return evaluateInWorld(sourceCode, mainThreadNormalWorld(), exceptionDetails);
> }
> 
>+void ScriptController::loadModuleGraphInWorld(ScriptModuleGraph& moduleGraph, const String& moduleName, DOMWrapperWorld& world, Element& element)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    setupModuleGraphHandlers(moduleGraph, JSMainThreadExecState::loadModule(exec, moduleName, toJS(exec, shell->window(), &element)), world);
>+}
>+
>+void ScriptController::loadModuleGraph(ScriptModuleGraph& moduleGraph, const String& moduleName, Element& element)
>+{
>+    loadModuleGraphInWorld(moduleGraph, moduleName, mainThreadNormalWorld(), element);
>+}
>+
>+void ScriptController::loadModuleGraphInWorld(ScriptModuleGraph& moduleGraph, const ScriptSourceCode& sourceCode, DOMWrapperWorld& world, Element& element)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    setupModuleGraphHandlers(moduleGraph, JSMainThreadExecState::loadModule(exec, sourceCode.jsSourceCode(), toJS(exec, shell->window(), &element)), world);
>+}
>+
>+void ScriptController::loadModuleGraph(ScriptModuleGraph& moduleGraph, const ScriptSourceCode& sourceCode, Element& element)
>+{
>+    loadModuleGraphInWorld(moduleGraph, sourceCode, mainThreadNormalWorld(), element);
>+}
>+
>+JSC::JSValue ScriptController::linkAndEvaluateModuleGraphInWorld(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<JSC::Exception> evaluationException;
>+    JSValue returnValue = JSMainThreadExecState::linkAndEvaluateModule(exec, Identifier::fromUid(&exec->vm(), moduleGraph.moduleKey()), toJS(exec, shell->window(), &element), evaluationException);
>+    if (evaluationException) {
>+        // FIXME: Give a chance to dump the stack trace if the "corssorigin" attribute allows.
>+        reportException(exec, evaluationException, nullptr);
>+        return jsUndefined();
>+    }
>+    return returnValue;
>+}
>+
>+JSC::JSValue ScriptController::linkAndEvaluateModuleGraph(ScriptModuleGraph& moduleGraph, Element& element)
>+{
>+    return linkAndEvaluateModuleGraphInWorld(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 +348,74 @@ 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));
>+}
>+
>+enum class ErrorStatus {
>+    AlreadyReported,
>+    FetchingCanceled,
>+    ErrorThrown,
>+};
>+
>+void ScriptController::setupModuleGraphHandlers(ScriptModuleGraph& moduleGraph, JSInternalPromise* promise, DOMWrapperWorld& world)
>+{
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    // NOTE: It is not guaranteed that either fulfillHandler or rejectHandler is eventually called.
>+    // For example, if the page load is canceled, the DeferredPromise used in the module loader pipeline will stop executing JS code.
>+    // Thus the promise returned from this function could remain unresolved.
>+
>+    RefPtr<ScriptModuleGraph> protector(&moduleGraph);
>+    PrivateName moduleLoaderAlreadyReportedErrorSymbol = m_moduleLoaderAlreadyReportedErrorSymbol;
>+    PrivateName moduleLoaderFetchingIsCanceledSymbol = m_moduleLoaderFetchingIsCanceledSymbol;
>+
>+    JSFunction* fulfillHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [protector](ExecState* exec) {
>+        Identifier moduleKey = jsValueToModuleKey(exec, exec->argument(0));
>+        protector->notifyLoaded(moduleKey.impl());
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    JSFunction* rejectHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [protector, moduleLoaderAlreadyReportedErrorSymbol, moduleLoaderFetchingIsCanceledSymbol](ExecState* exec) {
>+        ErrorStatus errorStatus = ErrorStatus::ErrorThrown;
>+        JSValue error = exec->argument(0);
>+        if (Symbol* symbol = jsDynamicCast<Symbol*>(error)) {
>+            if (symbol->privateName() == moduleLoaderAlreadyReportedErrorSymbol)
>+                errorStatus = ErrorStatus::AlreadyReported;
>+            else if (symbol->privateName() == moduleLoaderFetchingIsCanceledSymbol)
>+                errorStatus = ErrorStatus::FetchingCanceled;
>+        }
>+
>+        if (errorStatus == ErrorStatus::FetchingCanceled)
>+            protector->notifyCanceled();
>+        else if (errorStatus == ErrorStatus::AlreadyReported) {
>+            protector->notifyErrored(LoadableScript::Error {
>+                LoadableScript::ErrorType::CachedScript,
>+                Nullopt
>+            });
>+        } else {
>+            ASSERT(errorStatus == ErrorStatus::ErrorThrown);
>+            protector->notifyErrored(LoadableScript::Error {
>+                LoadableScript::ErrorType::CachedScript,
>+                LoadableScript::ConsoleMessage {
>+                    MessageSource::JS,
>+                    MessageLevel::Error,
>+                    retrieveErrorMessage(exec, error),
>+                }
>+            });
>+        }
>+
>+        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 +677,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..48ec4a72fccd8033b9aa9d14b783446f6bd61fae 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 loadModuleGraphInWorld(ScriptModuleGraph&, const String& moduleName, DOMWrapperWorld&, Element&);
>+    void loadModuleGraph(ScriptModuleGraph&, const String& moduleName, Element&);
>+    void loadModuleGraphInWorld(ScriptModuleGraph&, const ScriptSourceCode&, DOMWrapperWorld&, Element&);
>+    void loadModuleGraph(ScriptModuleGraph&, const ScriptSourceCode&, Element&);
>+
>+    JSC::JSValue linkAndEvaluateModuleGraphInWorld(ScriptModuleGraph& , DOMWrapperWorld&, Element&);
>+    JSC::JSValue linkAndEvaluateModuleGraph(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,9 @@ 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; }
>+    const JSC::PrivateName& moduleLoaderFetchingIsCanceledSymbol() const { return m_moduleLoaderFetchingIsCanceledSymbol; }
>+
>     void clearWindowShell(DOMWindow* newDOMWindow, bool goingIntoPageCache);
>     void updateDocument();
> 
>@@ -167,6 +184,7 @@ class ScriptController {
> 
> private:
>     WEBCORE_EXPORT JSDOMWindowShell* initScript(DOMWrapperWorld&);
>+    void setupModuleGraphHandlers(ScriptModuleGraph&, JSC::JSInternalPromise*, DOMWrapperWorld&);
> 
>     void disconnectPlatformScriptObjects();
> 
>@@ -175,6 +193,8 @@ class ScriptController {
>     const String* m_sourceURL;
> 
>     bool m_paused;
>+    JSC::PrivateName m_moduleLoaderAlreadyReportedErrorSymbol;
>+    JSC::PrivateName m_moduleLoaderFetchingIsCanceledSymbol;
> 
>     // 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/ScriptModuleGraph.cpp b/Source/WebCore/bindings/js/ScriptModuleGraph.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..d608f2abbe13ebf2f86108b98fbec7ab39bec7e2
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ScriptModuleGraph.cpp
>@@ -0,0 +1,114 @@
>+/*
>+ * 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 "ScriptModuleGraphClient.h"
>+#include "ScriptModuleLoader.h"
>+#include "ScriptRunner.h"
>+#include "ScriptSourceCode.h"
>+
>+namespace WebCore {
>+
>+Ref<ScriptModuleGraph> ScriptModuleGraph::create(const String& nonce, const String& crossOriginMode)
>+{
>+    return adoptRef(*new ScriptModuleGraph(nonce, crossOriginMode));
>+}
>+
>+ScriptModuleGraph::ScriptModuleGraph(const String& nonce, const String& crossOriginMode)
>+    : m_nonce(nonce)
>+    , m_crossOriginMode(crossOriginMode)
>+{
>+}
>+
>+void ScriptModuleGraph::load(Element& initiator, const URL& rootURL)
>+{
>+    Ref<Document> document(initiator.document());
>+    if (Frame* frame = document->frame())
>+        frame->script().loadModuleGraph(*this, rootURL.string(), initiator);
>+}
>+
>+void ScriptModuleGraph::load(Element& initiator, const ScriptSourceCode& sourceCode)
>+{
>+    Ref<Document> document(initiator.document());
>+    if (Frame* frame = document->frame())
>+        frame->script().loadModuleGraph(*this, sourceCode, initiator);
>+}
>+
>+void ScriptModuleGraph::notifyLoaded(UniquedStringImpl* moduleKey)
>+{
>+    m_moduleKey = moduleKey;
>+    notifyClientFinished();
>+}
>+
>+void ScriptModuleGraph::notifyErrored(LoadableScript::Error&& error)
>+{
>+    if (!m_error)
>+        m_error = WTFMove(error);
>+    notifyClientFinished();
>+}
>+
>+void ScriptModuleGraph::notifyCanceled()
>+{
>+    m_canceled = true;
>+    notifyClientFinished();
>+}
>+
>+void ScriptModuleGraph::notifyClientFinished()
>+{
>+    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::addClient(ScriptModuleGraphClient& client)
>+{
>+    m_clients.add(&client);
>+    if (isLoaded()) {
>+        Ref<ScriptModuleGraph> protectedThis(*this);
>+        client.notifyFinished(*this);
>+    }
>+}
>+
>+void ScriptModuleGraph::removeClient(ScriptModuleGraphClient& client)
>+{
>+    m_clients.remove(&client);
>+}
>+
>+}
>diff --git a/Source/WebCore/bindings/js/ScriptModuleGraph.h b/Source/WebCore/bindings/js/ScriptModuleGraph.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..a42179aa4f637b05a18d8dd0352031c6408edb5e
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ScriptModuleGraph.h
>@@ -0,0 +1,79 @@
>+/*
>+ * 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 "CachedModuleScriptLoader.h"
>+#include "LoadableScript.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> {
>+public:
>+    UniquedStringImpl* moduleKey() { return m_moduleKey.get(); }
>+
>+    void evaluate(Element&);
>+
>+    void notifyLoaded(UniquedStringImpl* moduleKey);
>+    void notifyErrored(LoadableScript::Error&&);
>+    void notifyCanceled();
>+
>+    Optional<LoadableScript::Error> wasErrored() const { return m_error; }
>+    bool wasCanceled() const { return m_canceled; }
>+    bool isLoaded() const { return m_loaded; }
>+
>+    void addClient(ScriptModuleGraphClient&);
>+    void removeClient(ScriptModuleGraphClient&);
>+
>+    static Ref<ScriptModuleGraph> create(const String& nonce, const String& crossOriginMode);
>+
>+    void load(Element& initiator, const URL& rootURL);
>+    void load(Element& initiator, const ScriptSourceCode&);
>+
>+    const String& nonce() const { return m_nonce; }
>+    const String& crossOriginMode() const { return m_crossOriginMode; }
>+
>+private:
>+    ScriptModuleGraph(const String& nonce, const String& crossOriginMode);
>+
>+    void notifyClientFinished();
>+
>+    RefPtr<UniquedStringImpl> m_moduleKey;
>+    HashCountedSet<ScriptModuleGraphClient*> m_clients;
>+    String m_nonce;
>+    String m_crossOriginMode;
>+    Optional<LoadableScript::Error> m_error;
>+    bool m_canceled { 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
>index db7cf865f077f63544bb0a16871551215b5041aa..4628f3432e0245ce35051c89fa500febf267ecca 100644
>--- a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp
>+++ b/Source/WebCore/bindings/js/ScriptModuleLoader.cpp
>@@ -26,10 +26,18 @@
> #include "config.h"
> #include "ScriptModuleLoader.h"
> 
>+#include "CachedModuleScriptLoader.h"
>+#include "CachedScript.h"
> #include "Document.h"
> #include "ExceptionCode.h"
> #include "Frame.h"
> #include "JSDOMBinding.h"
>+#include "JSElement.h"
>+#include "LoadableScriptModuleGraph.h"
>+#include "MIMETypeRegistry.h"
>+#include "ScriptController.h"
>+#include "ScriptSourceCode.h"
>+#include <runtime/JSInternalPromise.h>
> #include <runtime/JSInternalPromiseDeferred.h>
> #include <runtime/JSModuleRecord.h>
> #include <runtime/JSString.h>
>@@ -42,63 +50,124 @@ ScriptModuleLoader::ScriptModuleLoader(Document& document)
> {
> }
> 
>-JSC::JSInternalPromise* ScriptModuleLoader::resolve(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleNameValue, JSC::JSValue importerModuleKey, JSC::JSValue)
>+ScriptModuleLoader::~ScriptModuleLoader()
> {
>-    JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>+    for (auto& loader : m_loaders)
>+        loader->clearClient();
>+}
>+
>+JSC::JSInternalPromise* ScriptModuleLoader::resolve(JSC::JSGlobalObject* jsGlobalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleNameValue, JSC::JSValue importerModuleKey, JSC::JSValue)
>+{
>+    JSDOMGlobalObject& globalObject = *JSC::jsCast<JSDOMGlobalObject*>(jsGlobalObject);
>+    auto& jsPromise = *JSC::JSInternalPromiseDeferred::create(exec, &globalObject);
>+    Ref<DeferredPromise> promise = DeferredPromise::create(globalObject, jsPromise);
> 
>     // 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.isSymbol()) {
>+        promise->resolve(asSymbol(moduleNameValue)->privateName());
>+        return jsPromise.promise();
>+    }
>+
>+    // https://html.spec.whatwg.org/multipage/webappapis.html#resolve-a-module-specifier
>+
>+    if (!moduleNameValue.isString()) {
>+        promise->reject(TypeError, "Module specifier is not Symbol or String.");
>+        return jsPromise.promise();
>+    }
>+
>+    String specifier = asString(moduleNameValue)->value(exec);
> 
>-    if (!moduleNameValue.isString())
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Module name is not Symbol or String."));
>+    // 1. Apply the URL parser to specifier. If the result is not failure, return the result.
>+    URL absoluteURL(URL(), specifier);
>+    if (absoluteURL.isValid()) {
>+        promise->resolve(absoluteURL.string());
>+        return jsPromise.promise();
>+    }
> 
>-    String moduleName = asString(moduleNameValue)->value(exec);
>+    // 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("../")) {
>+        promise->reject(TypeError, "Module specifier does not start with \"/\", \"./\", or \"../\".");
>+        return jsPromise.promise();
>+    }
> 
>-    // 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;
>+    // 3. Return the result of applying the URL parser to specifier with script's base URL as the base URL.
> 
>-    if (importerModuleKey.isSymbol())
>-        completedUrl = m_document.completeURL(moduleName);
>-    else if (importerModuleKey.isUndefined())
>-        completedUrl = m_document.completeURL(moduleName);
>+    URL completedURL;
>+
>+    bool isRootModule = importerModuleKey.isSymbol() || importerModuleKey.isUndefined();
>+    if (isRootModule)
>+        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(moduleName, importerModuleUrl);
>-    } else
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Importer module key is not Symbol or String."));
>+        URL importerModuleRequestURL(URL(), asString(importerModuleKey)->value(exec));
>+        if (!importerModuleRequestURL.isValid()) {
>+            promise->reject(TypeError, "Importer module key is an invalid URL.");
>+            return jsPromise.promise();
>+        }
>+
>+        URL importerModuleResponseURL = m_requestURLToResponseURLMap.get(importerModuleRequestURL);
>+        if (!importerModuleResponseURL.isValid()) {
>+            promise->reject(TypeError, "Importer module has an invalid response URL.");
>+            return jsPromise.promise();
>+        }
>+
>+        completedURL = m_document.completeURL(specifier, importerModuleResponseURL);
>+    } else {
>+        promise->reject(TypeError, "Importer module key is not Symbol or String.");
>+        return jsPromise.promise();
>+    }
> 
>-    if (!completedUrl.isValid())
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Module name constructs an invalid URL."));
>+    if (!completedURL.isValid()) {
>+        promise->reject(TypeError, "Module name constructs an invalid URL.");
>+        return jsPromise.promise();
>+    }
> 
>-    return deferred->resolve(exec, jsString(exec, completedUrl.string()));
>+    promise->resolve(completedURL.string());
>+    return jsPromise.promise();
> }
> 
>-JSC::JSInternalPromise* ScriptModuleLoader::fetch(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue, JSC::JSValue)
>+JSC::JSInternalPromise* ScriptModuleLoader::fetch(JSC::JSGlobalObject* jsGlobalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue, JSC::JSValue initiator)
> {
>-    JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>+    JSDOMGlobalObject& globalObject = *JSC::jsCast<JSDOMGlobalObject*>(jsGlobalObject);
>+    auto& jsPromise = *JSC::JSInternalPromiseDeferred::create(exec, &globalObject);
>+    Ref<DeferredPromise> deferred = DeferredPromise::create(globalObject, jsPromise);
>+    if (moduleKeyValue.isSymbol()) {
>+        deferred->reject(TypeError, "Symbol module key should be already fulfilled with the inlined resource.");
>+        return jsPromise.promise();
>+    }
> 
>-    if (moduleKeyValue.isSymbol())
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Symbol module key should be already fulfilled with the inlined resource."));
>+    if (!moduleKeyValue.isString()) {
>+        deferred->reject(TypeError, "Module key is not Symbol or String.");
>+        return jsPromise.promise();
>+    }
>+
>+    // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
> 
>-    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()) {
>+        deferred->reject(TypeError, "Module key is an invalid URL.");
>+        return jsPromise.promise();
>+    }
> 
>-    URL completedUrl(URL(), asString(moduleKeyValue)->value(exec));
>-    if (!completedUrl.isValid())
>-        return deferred->reject(exec, JSC::createTypeError(exec, "Module key is an invalid URL."));
>+    ASSERT_WITH_MESSAGE(JSC::jsDynamicCast<JSElement*>(initiator), "Initiator should be an JSElement");
>+    auto* scriptElement = toScriptElementIfPossible(&JSC::jsCast<JSElement*>(initiator)->wrapped());
>+    ASSERT_WITH_MESSAGE(scriptElement, "Initiator should be ScriptElement.");
> 
>-    // FIXME: Implement the module fetcher.
>+    if (Frame* frame = m_document.frame()) {
>+        RefPtr<CachedModuleScriptLoader> loader = CachedModuleScriptLoader::create(*this, deferred.get());
>+        m_loaders.add(loader);
>+        if (!loader->load(*scriptElement, completedURL)) {
>+            loader->clearClient();
>+            m_loaders.remove(loader);
> 
>-    return deferred->promise();
>+            deferred->reject(frame->script().moduleLoaderAlreadyReportedErrorSymbol());
>+            return jsPromise.promise();
>+        }
>+    }
>+
>+    return jsPromise.promise();
> }
> 
> JSC::JSValue ScriptModuleLoader::evaluate(JSC::JSGlobalObject*, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleKeyValue, JSC::JSValue moduleRecordValue, JSC::JSValue)
>@@ -113,20 +182,78 @@ JSC::JSValue ScriptModuleLoader::evaluate(JSC::JSGlobalObject*, JSC::ExecState*
>     if (!moduleRecord)
>         return JSC::jsUndefined();
> 
>-    URL sourceUrl;
>+    URL sourceURL;
>     if (moduleKeyValue.isSymbol())
>-        sourceUrl = m_document.url();
>+        sourceURL = m_document.url();
>     else if (moduleKeyValue.isString())
>-        sourceUrl = URL(URL(), asString(moduleKeyValue)->value(exec));
>+        sourceURL = URL(URL(), asString(moduleKeyValue)->value(exec));
>     else
>         return JSC::throwTypeError(exec, scope, ASCIILiteral("Module key is not Symbol or String."));
> 
>-    if (!sourceUrl.isValid())
>+    if (!sourceURL.isValid())
>         return JSC::throwTypeError(exec, scope, ASCIILiteral("Module key is an invalid URL."));
> 
>-    // FIXME: Implement evaluating module code.
>-
>+    if (Frame* frame = m_document.frame())
>+        return frame->script().evaluateModule(sourceURL, moduleRecord);
>     return JSC::jsUndefined();
> }
> 
>+void ScriptModuleLoader::notifyFinished(CachedModuleScriptLoader& loader, RefPtr<DeferredPromise> promise)
>+{
>+    // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
>+
>+    if (!m_loaders.remove(&loader))
>+        return;
>+    loader.clearClient();
>+
>+    CachedScript* cachedScript = loader.cachedScript();
>+
>+    bool failed = false;
>+
>+    if (cachedScript->resourceError().isAccessControl()) {
>+        promise->reject(TypeError, ASCIILiteral("Cross-origin script load denied by Cross-Origin Resource Sharing policy."));
>+        return;
>+    }
>+
>+    if (cachedScript->errorOccurred())
>+        failed = true;
>+    else if (!MIMETypeRegistry::isSupportedJavaScriptMIMEType(cachedScript->response().mimeType())) {
>+        // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
>+        // The result of extracting a MIME type from response's header list (ignoring parameters) is not a JavaScript MIME type.
>+        // NOTE: For historical reasons, fetching a classic script does not include MIME type checking. In contrast, module scripts will fail to load if they are not of a correct MIME type.
>+        promise->reject(TypeError, makeString(
>+            "Refused to execute module script from '", cachedScript->url().stringCenterEllipsizedToLength(),
>+            "' because its MIME type ('", cachedScript->response().mimeType(), "') is not executable."));
>+        return;
>+    }
>+
>+    if (Frame* frame = m_document.frame()) {
>+        if (failed) {
>+            // The module loader pipeline is constructed as a chain of promises.
>+            // Rejecting a promise when 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 to propagate this error to the script element.
>+            //
>+            // At that time, we don't want to report the same 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 checking syntax of a module script from errors reported already.
>+            // In the reject handler of the promise, we only report a error that is not this symbol.
>+            promise->reject(frame->script().moduleLoaderAlreadyReportedErrorSymbol());
>+        } else if (cachedScript->wasCanceled())
>+            promise->reject(frame->script().moduleLoaderFetchingIsCanceledSymbol());
>+        else {
>+            m_requestURLToResponseURLMap.add(cachedScript->url(), cachedScript->response().url());
>+            // FIXME: Let's wrap around ScriptSourceCode to propagate it directly through the module pipeline.
>+            promise->resolve(ScriptSourceCode(cachedScript).source().toString());
>+        }
>+    }
>+}
>+
> }
>diff --git a/Source/WebCore/bindings/js/ScriptModuleLoader.h b/Source/WebCore/bindings/js/ScriptModuleLoader.h
>index a5dc8a655c5eefe4c5c94b496b8eb558d17edc1f..be2e131c711bc8d35033cec3f979b68cd1d7927c 100644
>--- a/Source/WebCore/bindings/js/ScriptModuleLoader.h
>+++ b/Source/WebCore/bindings/js/ScriptModuleLoader.h
>@@ -25,6 +25,10 @@
> 
> #pragma once
> 
>+#include "CachedModuleScriptLoader.h"
>+#include "CachedModuleScriptLoaderClient.h"
>+#include "URL.h"
>+#include "URLHash.h"
> #include <runtime/JSCJSValue.h>
> #include <wtf/Noncopyable.h>
> 
>@@ -40,11 +44,13 @@ class JSModuleLoader;
> namespace WebCore {
> 
> class Document;
>+class JSDOMGlobalObject;
> 
>-class ScriptModuleLoader {
>-    WTF_MAKE_NONCOPYABLE(ScriptModuleLoader); WTF_MAKE_FAST_ALLOCATED;
>+class ScriptModuleLoader : private CachedModuleScriptLoaderClient {
>+WTF_MAKE_NONCOPYABLE(ScriptModuleLoader); WTF_MAKE_FAST_ALLOCATED;
> public:
>     explicit ScriptModuleLoader(Document&);
>+    ~ScriptModuleLoader();
> 
>     Document& document() { return m_document; }
> 
>@@ -53,7 +59,11 @@ class ScriptModuleLoader {
>     JSC::JSValue evaluate(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue moduleKey, JSC::JSValue moduleRecord, JSC::JSValue initiator);
> 
> private:
>+    void notifyFinished(CachedModuleScriptLoader&, RefPtr<DeferredPromise>) override;
>+
>     Document& m_document;
>+    HashMap<URL, URL> m_requestURLToResponseURLMap;
>+    HashSet<RefPtr<CachedModuleScriptLoader>> m_loaders;
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/dom/CurrentScriptIncrementer.h b/Source/WebCore/dom/CurrentScriptIncrementer.h
>index e70c2d1f3287e5a46df48d7ee8f2fce2518948af..06eda40d0e05b2b1b0a2fa8c30eb0789efbe92ba 100644
>--- a/Source/WebCore/dom/CurrentScriptIncrementer.h
>+++ b/Source/WebCore/dom/CurrentScriptIncrementer.h
>@@ -45,6 +45,13 @@ class CurrentScriptIncrementer {
>             m_document.pushCurrentScript(&downcast<HTMLScriptElement>(element));
>     }
> 
>+    CurrentScriptIncrementer(Document& document, std::nullptr_t)
>+        : m_document(document)
>+        , m_isHTMLScriptElementOutsideShadowTree(true)
>+    {
>+        m_document.pushCurrentScript(nullptr);
>+    }
>+
>     ~CurrentScriptIncrementer()
>     {
>         if (m_isHTMLScriptElementOutsideShadowTree)
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index 110e6479118f91ac45fd014b58730e7402d7df89..22e123f11645bf1084d1f10993a9ca745fb54123 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -4849,7 +4849,7 @@ String Document::queryCommandValue(const String& commandName)
> 
> void Document::pushCurrentScript(HTMLScriptElement* newCurrentScript)
> {
>-    ASSERT(newCurrentScript);
>+    // HTMLScriptElement may be nullptr.
>     m_currentScriptStack.append(newCurrentScript);
> }
> 
>diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
>index c732298d94e2c53ae3721b3540a79bbe0050337f..17c1535b02289f251e4ad445178516505b669acf 100644
>--- a/Source/WebCore/dom/Document.h
>+++ b/Source/WebCore/dom/Document.h
>@@ -124,7 +124,6 @@ class IntPoint;
> class LayoutPoint;
> class LayoutRect;
> class LiveNodeList;
>-class ScriptModuleLoader;
> class JSNode;
> class Locale;
> class Location;
>diff --git a/Source/WebCore/dom/LoadableScriptModuleGraph.cpp b/Source/WebCore/dom/LoadableScriptModuleGraph.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..c2a2b7b15cec2c8be4d979ff7cc12a177a426373
>--- /dev/null
>+++ b/Source/WebCore/dom/LoadableScriptModuleGraph.cpp
>@@ -0,0 +1,75 @@
>+/*
>+ * 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.
>+ */
>+
>+#include "config.h"
>+#include "LoadableScriptModuleGraph.h"
>+
>+#include "Element.h"
>+
>+namespace WebCore {
>+
>+Ref<LoadableScriptModuleGraph> LoadableScriptModuleGraph::create(ScriptModuleGraph& moduleGraph)
>+{
>+    auto script = adoptRef(*new LoadableScriptModuleGraph(moduleGraph));
>+    moduleGraph.addClient(script.get());
>+    return script;
>+}
>+
>+LoadableScriptModuleGraph::LoadableScriptModuleGraph(ScriptModuleGraph& moduleGraph)
>+    : m_moduleGraph(moduleGraph)
>+{
>+}
>+
>+LoadableScriptModuleGraph::~LoadableScriptModuleGraph()
>+{
>+    m_moduleGraph->removeClient(*this);
>+}
>+
>+bool LoadableScriptModuleGraph::isLoaded() const
>+{
>+    return m_moduleGraph->isLoaded();
>+}
>+
>+Optional<LoadableScript::Error> LoadableScriptModuleGraph::wasErrored() const
>+{
>+    return m_moduleGraph->wasErrored();
>+}
>+
>+bool LoadableScriptModuleGraph::wasCanceled() const
>+{
>+    return m_moduleGraph->wasCanceled();
>+}
>+
>+void LoadableScriptModuleGraph::notifyFinished(ScriptModuleGraph&)
>+{
>+    notifyClientFinished();
>+}
>+
>+void LoadableScriptModuleGraph::execute(ScriptElement& scriptElement)
>+{
>+    scriptElement.executeModuleGraph(m_moduleGraph.get());
>+}
>+
>+}
>diff --git a/Source/WebCore/dom/LoadableScriptModuleGraph.h b/Source/WebCore/dom/LoadableScriptModuleGraph.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..3a19be9519a0977d5842c248da48209140a04cd0
>--- /dev/null
>+++ b/Source/WebCore/dom/LoadableScriptModuleGraph.h
>@@ -0,0 +1,64 @@
>+/*
>+ * 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
>+
>+#include "LoadableScript.h"
>+#include "ScriptModuleGraph.h"
>+#include "ScriptModuleGraphClient.h"
>+#include <wtf/TypeCasts.h>
>+
>+namespace WebCore {
>+
>+class LoadableScriptModuleGraph final : public LoadableScript, private ScriptModuleGraphClient {
>+public:
>+    ~LoadableScriptModuleGraph();
>+
>+    static Ref<LoadableScriptModuleGraph> create(ScriptModuleGraph&);
>+
>+    bool isLoaded() const override;
>+    Optional<Error> wasErrored() const override;
>+    bool wasCanceled() const override;
>+
>+    ScriptModuleGraph& moduleGraph() { return m_moduleGraph.get(); }
>+    bool isModuleGraph() const final { return true; }
>+
>+    void execute(ScriptElement&) override;
>+
>+    void setError(Error&&);
>+
>+private:
>+    LoadableScriptModuleGraph(ScriptModuleGraph&);
>+
>+    void notifyFinished(ScriptModuleGraph&) override;
>+
>+    Ref<ScriptModuleGraph> m_moduleGraph;
>+};
>+
>+}
>+
>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::LoadableScriptModuleGraph)
>+    static bool isType(const WebCore::LoadableScript& script) { return script.isModuleGraph(); }
>+SPECIALIZE_TYPE_TRAITS_END()
>diff --git a/Source/WebCore/dom/ScriptElement.cpp b/Source/WebCore/dom/ScriptElement.cpp
>index 22cf8524677d8d5d813094d529a3ad6c79f238c9..11fb2ac50da8374eab15fba3a49ef89e5b003bf0 100644
>--- a/Source/WebCore/dom/ScriptElement.cpp
>+++ b/Source/WebCore/dom/ScriptElement.cpp
>@@ -38,12 +38,14 @@
> #include "HTMLParserIdioms.h"
> #include "IgnoreDestructiveWriteCountIncrementer.h"
> #include "LoadableClassicScript.h"
>+#include "LoadableScriptModuleGraph.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"
>@@ -70,6 +72,7 @@ ScriptElement::ScriptElement(Element& element, bool parserInserted, bool already
>     , m_willExecuteWhenDocumentFinishedParsing(false)
>     , m_forceAsync(!parserInserted)
>     , m_willExecuteInOrder(false)
>+    , m_isModuleScript(false)
> {
>     if (parserInserted && m_element.document().scriptableDocumentParser() && !m_element.document().isInDocumentWrite())
>         m_startLineNumber = m_element.document().scriptableDocumentParser()->textPosition().m_line;
>@@ -161,12 +164,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;
> }
> 
>@@ -193,8 +196,12 @@ 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;
>+    m_isModuleScript = scriptType == ScriptType::Module;
> 
>     if (wasParserInserted) {
>         m_parserInserted = true;
>@@ -215,36 +222,45 @@ bool ScriptElement::prepareScript(const TextPosition& scriptStartPosition, Legac
>     if (!document.frame()->script().canExecuteScripts(AboutToExecuteScript))
>         return false;
> 
>-    if (!isScriptForEventSupported())
>+    if (scriptType == ScriptType::Classic && !isScriptForEventSupported())
>         return false;
> 
>+    // We intentionally use the charset attribute even if the script is the module script.
>     if (!charsetAttributeValue().isEmpty())
>         m_characterEncoding = charsetAttributeValue();
>     else
>         m_characterEncoding = document.charset();
> 
>-    if (hasSourceAttribute()) {
>-        if (!requestClassicScript(sourceAttributeValue()))
>+    if (scriptType == ScriptType::Classic) {
>+        if (hasSourceAttribute()) {
>+            if (!requestClassicScript(sourceAttributeValue()))
>+                return false;
>+        }
>+    } else {
>+        ASSERT(scriptType == ScriptType::Module);
>+        if (!requestModuleGraph(scriptStartPosition))
>             return false;
>     }
> 
>-    if (hasSourceAttribute() && deferAttributeValue() && m_parserInserted && !asyncAttributeValue()) {
>+    if ((scriptType == ScriptType::Classic && hasSourceAttribute() && deferAttributeValue() && m_parserInserted && !asyncAttributeValue()) || (scriptType == ScriptType::Module && m_parserInserted && !asyncAttributeValue())) {
>         m_willExecuteWhenDocumentFinishedParsing = true;
>         m_willBeParserExecuted = true;
>-    } else if (hasSourceAttribute() && m_parserInserted && !asyncAttributeValue())
>+    } else if (scriptType == ScriptType::Classic && hasSourceAttribute() && m_parserInserted && !asyncAttributeValue()) {
>+        ASSERT(scriptType == ScriptType::Classic);
>         m_willBeParserExecuted = true;
>-    else if (!hasSourceAttribute() && m_parserInserted && !document.haveStylesheetsLoaded()) {
>-        m_willBeParserExecuted = true;
>-        m_readyToBeParserExecuted = true;
>-    } else if (hasSourceAttribute() && !asyncAttributeValue() && !m_forceAsync) {
>-        ASSERT(m_loadableScript);
>+    } else if ((scriptType == ScriptType::Classic && hasSourceAttribute() && !asyncAttributeValue() && !m_forceAsync) || (scriptType == ScriptType::Module && !asyncAttributeValue() && !m_forceAsync)) {
>         m_willExecuteInOrder = true;
>+        ASSERT(m_loadableScript);
>         document.scriptRunner()->queueScriptForExecution(this, *m_loadableScript, ScriptRunner::IN_ORDER_EXECUTION);
>-    } else if (hasSourceAttribute()) {
>+    } else if (hasSourceAttribute() || scriptType == ScriptType::Module) {
>         ASSERT(m_loadableScript);
>-        m_element.document().scriptRunner()->queueScriptForExecution(this, *m_loadableScript, ScriptRunner::ASYNC_EXECUTION);
>+        document.scriptRunner()->queueScriptForExecution(this, *m_loadableScript, ScriptRunner::ASYNC_EXECUTION);
>+    } else if (!hasSourceAttribute() && m_parserInserted && !document.haveStylesheetsLoaded()) {
>+        ASSERT(scriptType == ScriptType::Classic);
>+        m_willBeParserExecuted = true;
>+        m_readyToBeParserExecuted = true;
>     } else {
>-        // Reset line numbering for nested writes.
>+        ASSERT(scriptType == ScriptType::Classic);
>         TextPosition position = document.isInDocumentWrite() ? TextPosition() : scriptStartPosition;
>         executeScript(ScriptSourceCode(scriptContent(), document.url(), position));
>     }
>@@ -263,7 +279,9 @@ bool ScriptElement::requestClassicScript(const String& sourceURL)
> 
>     ASSERT(!m_loadableScript);
>     if (!stripLeadingAndTrailingHTMLSpaces(sourceURL).isEmpty()) {
>-        auto request = requestScriptWithCache(m_element.document().completeURL(sourceURL), m_element.attributeWithoutSynchronization(HTMLNames::nonceAttr));
>+        String nonceAttribute = m_element.attributeWithoutSynchronization(HTMLNames::nonceAttr);
>+        String crossOriginMode = m_element.attributeWithoutSynchronization(HTMLNames::crossoriginAttr);
>+        auto request = requestScriptWithCache(m_element.document().completeURL(sourceURL), ScriptType::Classic, nonceAttribute, crossOriginMode);
>         if (request) {
>             m_loadableScript = LoadableClassicScript::create(WTFMove(request));
>             m_isExternalScript = true;
>@@ -279,7 +297,62 @@ bool ScriptElement::requestClassicScript(const String& sourceURL)
>     return false;
> }
> 
>-CachedResourceHandle<CachedScript> ScriptElement::requestScriptWithCache(const URL& sourceURL, const String& nonceAttribute)
>+bool ScriptElement::requestModuleGraph(const TextPosition& scriptStartPosition)
>+{
>+    String nonce = m_element.attributeWithoutSynchronization(HTMLNames::nonceAttr);
>+    String crossOriginMode = m_element.attributeWithoutSynchronization(HTMLNames::crossoriginAttr);
>+
>+    if (hasSourceAttribute()) {
>+        String sourceURL = sourceAttributeValue();
>+        Ref<Document> originalDocument(m_element.document());
>+        if (!m_element.dispatchBeforeLoadEvent(sourceURL))
>+            return false;
>+
>+        bool didEventListenerDisconnectThisElement = !m_element.inDocument() || &m_element.document() != originalDocument.ptr();
>+        if (didEventListenerDisconnectThisElement)
>+            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;
>+        auto moduleGraph = ScriptModuleGraph::create(nonce, crossOriginMode);
>+        m_loadableScript = LoadableScriptModuleGraph::create(moduleGraph.get());
>+        moduleGraph->load(m_element, moduleGraphRootURL);
>+    } else {
>+        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(nonce, m_element.isInUserAgentShadowTree());
>+        if (!contentSecurityPolicy.allowInlineScript(m_element.document().url(), m_startLineNumber, sourceCode.source().toStringWithoutCopying(), hasKnownNonce))
>+            return false;
>+
>+        auto moduleGraph = ScriptModuleGraph::create(nonce, crossOriginMode);
>+        m_loadableScript = LoadableScriptModuleGraph::create(moduleGraph.get());
>+        moduleGraph->load(m_element, sourceCode);
>+    }
>+    return true;
>+}
>+
>+CachedResourceHandle<CachedScript> ScriptElement::requestScriptWithCacheForModuleGraph(const URL& sourceURL)
>+{
>+    ASSERT(m_loadableScript);
>+    ASSERT(is<LoadableScriptModuleGraph>(*m_loadableScript));
>+    auto& moduleGraph = downcast<LoadableScriptModuleGraph>(*m_loadableScript);
>+    return requestScriptWithCache(sourceURL, ScriptType::Module, moduleGraph.moduleGraph().nonce(), moduleGraph.moduleGraph().crossOriginMode());
>+}
>+
>+CachedResourceHandle<CachedScript> ScriptElement::requestScriptWithCache(const URL& sourceURL, ScriptType scriptType, const String& nonceAttribute, const String& crossOriginMode)
> {
>     Document& document = m_element.document();
>     auto* settings = document.settings();
>@@ -291,8 +364,24 @@ CachedResourceHandle<CachedScript> ScriptElement::requestScriptWithCache(const U
>     ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
>     options.contentSecurityPolicyImposition = hasKnownNonce ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
> 
>+    if (scriptType == ScriptType::Module) {
>+        // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
>+        // Let request be a new request whose url is url, destination is destination, type is "script", mode is "cors",
>+        // credentials mode is credentials mode, cryptographic nonce metadata is cryptographic nonce, parser metadata is parser state,
>+        // referrer is referrer, and client is fetch client settings object.
>+        options.mode = FetchOptions::Mode::Cors;
>+
>+        // https://html.spec.whatwg.org/multipage/scripting.html#prepare-a-script
>+        if (crossOriginMode.isNull())
>+            options.credentials = FetchOptions::Credentials::Omit;
>+        else if (equalLettersIgnoringASCIICase(crossOriginMode, "use-credentials"))
>+            options.credentials = FetchOptions::Credentials::Include;
>+        else
>+            options.credentials = FetchOptions::Credentials::SameOrigin;
>+    }
>+
>     CachedResourceRequest request(ResourceRequest(sourceURL), options);
>-    request.setAsPotentiallyCrossOrigin(m_element.attributeWithoutSynchronization(HTMLNames::crossoriginAttr), document);
>+    request.setAsPotentiallyCrossOrigin(crossOriginMode, document);
>     request.upgradeInsecureRequestIfNeeded(document);
> 
>     request.setCharset(scriptCharset());
>@@ -328,6 +417,25 @@ void ScriptElement::executeScript(const ScriptSourceCode& sourceCode)
>     }
> }
> 
>+void ScriptElement::executeModuleGraph(ScriptModuleGraph& moduleGraph)
>+{
>+    // https://html.spec.whatwg.org/multipage/scripting.html#execute-the-script-block
>+
>+    ASSERT(!moduleGraph.wasErrored());
>+
>+    Ref<Document> document(m_element.document());
>+    if (Frame* frame = document->frame()) {
>+        // If the script is from an external file, or the script's type is "module",
>+        // then increment the ignore-destructive-writes counter of the script element's node document. Let neutralized doc be that Document.
>+        IgnoreDestructiveWriteCountIncrementer ignoreDesctructiveWriteCountIncrementer(document.ptr());
>+
>+        // Set the script element's node document's currentScript attribute to null.
>+        CurrentScriptIncrementer currentScriptIncrementer(document, nullptr);
>+
>+        frame->script().linkAndEvaluateModuleGraph(moduleGraph, element());
>+    }
>+}
>+
> void ScriptElement::executeScriptAndDispatchEvent(LoadableScript& loadableScript)
> {
>     if (Optional<LoadableScript::Error> error = loadableScript.wasErrored()) {
>diff --git a/Source/WebCore/dom/ScriptElement.h b/Source/WebCore/dom/ScriptElement.h
>index 18e33b54ea750f059c1cd0ffeda2393aaaa28cac..d6d2cbff99313c5f23dab61ba45d4c8bfececf4e 100644
>--- a/Source/WebCore/dom/ScriptElement.h
>+++ b/Source/WebCore/dom/ScriptElement.h
>@@ -37,6 +37,7 @@ class Element;
> class PendingScript;
> class ScriptElement;
> class ScriptSourceCode;
>+class ScriptModuleGraph;
> 
> class ScriptElement {
> public:
>@@ -51,6 +52,7 @@ class ScriptElement {
>     String scriptCharset() const { return m_characterEncoding; }
>     WEBCORE_EXPORT String scriptContent() const;
>     void executeScript(const ScriptSourceCode&);
>+    void executeModuleGraph(ScriptModuleGraph&);
> 
>     void executeScriptForScriptRunner(PendingScript&);
> 
>@@ -65,6 +67,8 @@ class ScriptElement {
>     bool willExecuteInOrder() const { return m_willExecuteInOrder; }
>     LoadableScript* loadableScript() { return m_loadableScript.get(); }
> 
>+    CachedResourceHandle<CachedScript> requestScriptWithCacheForModuleGraph(const URL&);
>+
> protected:
>     ScriptElement(Element&, bool createdByParser, bool isEvaluated);
> 
>@@ -85,13 +89,15 @@ class ScriptElement {
> 
>     // 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; }
>     Optional<ScriptType> determineScriptType(LegacyTypeSupport) const;
>     bool ignoresLoadRequest() const;
>     bool isScriptForEventSupported() const;
> 
>-    CachedResourceHandle<CachedScript> requestScriptWithCache(const URL&, const String&);
>+    CachedResourceHandle<CachedScript> requestScriptWithCache(const URL&, ScriptType, const String& nonceAttribute, const String& crossoriginAttribute);
> 
>     bool requestClassicScript(const String& sourceURL);
>+    bool requestModuleGraph(const TextPosition& scriptStartPosition);
> 
>     virtual String sourceAttributeValue() const = 0;
>     virtual String charsetAttributeValue() const = 0;
>@@ -114,6 +120,7 @@ class ScriptElement {
>     bool m_willExecuteWhenDocumentFinishedParsing : 1;
>     bool m_forceAsync : 1;
>     bool m_willExecuteInOrder : 1;
>+    bool m_isModuleScript : 1;
>     String m_characterEncoding;
>     String m_fallbackCharacterEncoding;
>     RefPtr<LoadableScript> m_loadableScript;
>diff --git a/Source/WebCore/html/parser/HTMLPreloadScanner.cpp b/Source/WebCore/html/parser/HTMLPreloadScanner.cpp
>index 1a1b405a02de87399b38dfba67469e0f3bec1e1b..b6ffc97dbdb56f1f2968ed2deaf13582d1cee344 100644
>--- a/Source/WebCore/html/parser/HTMLPreloadScanner.cpp
>+++ b/Source/WebCore/html/parser/HTMLPreloadScanner.cpp
>@@ -146,6 +146,8 @@ class TokenPreloadScanner::StartTagScanner {
> 
>         auto request = std::make_unique<PreloadRequest>(initiatorFor(m_tagId), m_urlToLoad, predictedBaseURL, resourceType(), m_mediaAttribute);
>         request->setCrossOriginMode(m_crossOriginMode);
>+
>+        // We intentionally use the character attribute even if the given script tag loads the module script.
>         request->setCharset(charset());
>         return request;
>     }
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 40059a9315d12a559523c0b8bb5e322e8e7efae0..39d447ee0738ccdb18d4c8c0264d9feba0d0d355 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,88 @@
>+2016-10-22  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:
>+        * http/tests/misc/module-script-async-expected.txt: Added.
>+        * http/tests/misc/module-script-async.html: Added.
>+        * http/tests/security/module-correct-mime-types-expected.txt: Added.
>+        * http/tests/security/module-correct-mime-types.html: Added.
>+        * http/tests/security/module-incorrect-mime-types-expected.txt: Added.
>+        * http/tests/security/module-incorrect-mime-types.html: Added.
>+        * http/tests/security/module-no-mime-type-expected.txt: Added.
>+        * http/tests/security/module-no-mime-type.html: Added.
>+        * http/tests/security/module-requires-javascript-mime-types-expected.txt: Added.
>+        * http/tests/security/module-requires-javascript-mime-types.html: Added.
>+        * 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-current-script-expected.txt: Added.
>+        * js/dom/module-inline-current-script.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-current-script-expected.txt: Added.
>+        * js/dom/module-src-current-script.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-current-script.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-10-21  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Update custom elements tests
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 18a300861814da1143af3dee4a1c7b2e267c6532..e2374629da5024311e218f8d9261116e91601f14 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -993,3 +993,21 @@ imported/blink/http/tests/security/shape-image-cors-disallow-origin.html [ Image
> imported/blink/http/tests/security/shape-image-cors-port.html [ ImageOnlyFailure ]
> 
> webkit.org/b/163636 media/modern-media-controls/media-controller/media-controller-resize.html [ Pass Timeout ]
>+
>+# 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/http/tests/misc/module-script-async-expected.txt b/LayoutTests/http/tests/misc/module-script-async-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..07ddedef660eddb289f6829d65dab695e9ff6d43
>--- /dev/null
>+++ b/LayoutTests/http/tests/misc/module-script-async-expected.txt
>@@ -0,0 +1,2 @@
>+This tests for proper execution order of module scripts with the async attribute.
>+PASS
>diff --git a/LayoutTests/http/tests/misc/module-script-async.html b/LayoutTests/http/tests/misc/module-script-async.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..d18988a134d49d3637f1950866f55c04e9a92ae6
>--- /dev/null
>+++ b/LayoutTests/http/tests/misc/module-script-async.html
>@@ -0,0 +1,48 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<meta charset="UTF-8">
>+<script src="../../js-test-resources/js-test-pre.js"></script>
>+</head>
>+<body onload="test()">
>+This tests for proper execution order of module scripts with the async attribute.<hr>
>+<div id="console"></div>
>+<script type="text/javascript">
>+var jsTestIsAsync = true;
>+
>+function debug(msg)
>+{
>+    if (!window.status_)
>+        window.status_ = '';
>+    window.status_ += ' ' + msg + ' ';
>+}
>+
>+document.addEventListener("DOMContentLoaded", function() {
>+    debug('DOMContentLoaded');
>+}, false);
>+
>+function test()
>+{
>+    var expectedA = " async  external  inline  DOMContentLoaded  slowAsync ";
>+    var expectedB = " external  async  inline  DOMContentLoaded  slowAsync ";
>+    var expectedC = " external  inline  async  DOMContentLoaded  slowAsync ";
>+    var expectedD = " external  inline  DOMContentLoaded  async  slowAsync ";
>+    var results = "PASS";
>+    if (window.status_ != expectedA && window.status_ != expectedB && window.status_ != expectedC && window.status_ != expectedD)
>+        results = "FAIL: Expected one of '" + expectedA + "' || '" + expectedB + "' || '" + expectedC + "' || '" + expectedD + "', Actual='" + window.status_ + "'";
>+    document.getElementById("console").innerHTML = results;
>+    finishJSTest();
>+}
>+
>+</script>
>+<script type="module" src="http://127.0.0.1:8000/misc/resources/slow-async-script.cgi" async="ASYNC"></script>
>+<script type="module" src="http://127.0.0.1:8000/misc/resources/async-script.js" async="ASYNC"></script>
>+<script src="http://127.0.0.1:8000/misc/resources/external-script.js"></script>
>+<script>
>+debug("inline");
>+</script>
>+<script src="../../js-test-resources/js-test-post.js"></script>
>+</body>
>+</html>
>+
>+
>diff --git a/LayoutTests/http/tests/security/module-correct-mime-types-expected.txt b/LayoutTests/http/tests/security/module-correct-mime-types-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..301ccfb65356281ce3020a53783ae94f22bea76b
>--- /dev/null
>+++ b/LayoutTests/http/tests/security/module-correct-mime-types-expected.txt
>@@ -0,0 +1,27 @@
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'application/ecmascript'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'application/javascript'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'application/x-ecmascript'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'application/x-javascript'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/ecmascript'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/javascript'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/javascript1.0'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/javascript1.1'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/javascript1.2'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/javascript1.3'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/javascript1.4'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/javascript1.5'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/jscript'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/livescript'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/x-ecmascript'.
>+CONSOLE MESSAGE: line 1: Executed script with MIME type: 'text/x-javascript'.
>+Test module rejects scripts with correct mime types.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Module rejects scripts with correct mime types.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/http/tests/security/module-correct-mime-types.html b/LayoutTests/http/tests/security/module-correct-mime-types.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..85dd8b6b92c490c1e077272e632c5478d3c71b77
>--- /dev/null
>+++ b/LayoutTests/http/tests/security/module-correct-mime-types.html
>@@ -0,0 +1,58 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test module rejects scripts with correct mime types.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+</script>
>+<script>
>+let unscriptyMimeTypes = [
>+    'application/ecmascript',
>+    'application/javascript',
>+    'application/x-ecmascript',
>+    'application/x-javascript',
>+    'text/ecmascript',
>+    'text/javascript',
>+    'text/javascript1.0',
>+    'text/javascript1.1',
>+    'text/javascript1.2',
>+    'text/javascript1.3',
>+    'text/javascript1.4',
>+    'text/javascript1.5',
>+    'text/jscript',
>+    'text/livescript',
>+    'text/x-ecmascript',
>+    'text/x-javascript',
>+];
>+
>+debug('Module is not executed yet.');
>+
>+let current = Promise.resolve();
>+for (let mimeType of unscriptyMimeTypes) {
>+    current = current.then(() => {
>+        return new Promise((resolve, reject) => {
>+            let script = document.createElement('script');
>+            script.addEventListener('load', (ev) => resolve(ev), false);
>+            script.type = 'module'
>+            script.src = `./contentTypeOptions/resources/script-with-header.pl?mime=${mimeType}`;
>+            document.body.appendChild(script);
>+        });
>+    });
>+}
>+
>+current.then(done);
>+
>+function done()
>+{
>+    debug('Module rejects scripts with correct mime types.');
>+    finishJSTest();
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/http/tests/security/module-incorrect-mime-types-expected.txt b/LayoutTests/http/tests/security/module-incorrect-mime-types-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..4152301b9abd06ae7cd305b99253c8f0d0b1eff4
>--- /dev/null
>+++ b/LayoutTests/http/tests/security/module-incorrect-mime-types-expected.txt
>@@ -0,0 +1,20 @@
>+CONSOLE MESSAGE: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl?mime=application/json' because its MIME type ('application/json') is not executable.
>+CONSOLE MESSAGE: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl?mime=application/octet-stream' because its MIME type ('application/octet-stream') is not executable.
>+CONSOLE MESSAGE: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl?mime=application/xml' because its MIME type ('application/xml') is not executable.
>+CONSOLE MESSAGE: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl?mime=image/png' because its MIME type ('image/png') is not executable.
>+CONSOLE MESSAGE: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl?mime=text/html' because its MIME type ('text/html') is not executable.
>+CONSOLE MESSAGE: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl?mime=text/plain' because its MIME type ('text/plain') is not executable.
>+CONSOLE MESSAGE: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl?mime=text/vbs' because its MIME type ('text/vbs') is not executable.
>+CONSOLE MESSAGE: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl?mime=text/vbscript' because its MIME type ('text/vbscript') is not executable.
>+CONSOLE MESSAGE: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl?mime=text/xml' because its MIME type ('text/xml') is not executable.
>+Test module rejects scripts with incorrect mime types.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Module rejects scripts with incorrect mime types.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/http/tests/security/module-incorrect-mime-types.html b/LayoutTests/http/tests/security/module-incorrect-mime-types.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..237c37a27dc36d3e50fd4703afe2e49bde2fcaa7
>--- /dev/null
>+++ b/LayoutTests/http/tests/security/module-incorrect-mime-types.html
>@@ -0,0 +1,51 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test module rejects scripts with incorrect mime types.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+</script>
>+<script>
>+let unscriptyMimeTypes = [
>+    'application/json',
>+    'application/octet-stream',
>+    'application/xml',
>+    'image/png',
>+    'text/html',
>+    'text/plain',
>+    'text/vbs',
>+    'text/vbscript',
>+    'text/xml',
>+];
>+
>+debug('Module is not executed yet.');
>+
>+let current = Promise.resolve();
>+for (let mimeType of unscriptyMimeTypes) {
>+    current = current.then(() => {
>+        return new Promise((resolve, reject) => {
>+            let script = document.createElement('script');
>+            script.addEventListener('error', (ev) => resolve(ev), false);
>+            script.type = 'module'
>+            script.src = `./contentTypeOptions/resources/script-with-header.pl?mime=${mimeType}`;
>+            document.body.appendChild(script);
>+        });
>+    });
>+}
>+
>+current.then(done);
>+
>+function done()
>+{
>+    debug('Module rejects scripts with incorrect mime types.');
>+    finishJSTest();
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/http/tests/security/module-no-mime-type-expected.txt b/LayoutTests/http/tests/security/module-no-mime-type-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..30c853ccead92ba03d372b9e18ffa4ecb44b84fb
>--- /dev/null
>+++ b/LayoutTests/http/tests/security/module-no-mime-type-expected.txt
>@@ -0,0 +1,12 @@
>+CONSOLE MESSAGE: line 1: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl' because its MIME type ('application/octet-stream') is not executable.
>+Test module rejects scripts with no mime type.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Module rejects a script with no mime type.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/http/tests/security/module-no-mime-type.html b/LayoutTests/http/tests/security/module-no-mime-type.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..b0f454b1e21a682d99e34990fbf12133236e854e
>--- /dev/null
>+++ b/LayoutTests/http/tests/security/module-no-mime-type.html
>@@ -0,0 +1,24 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test module rejects scripts with no mime type.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+</script>
>+<script>
>+debug('Module is not executed yet.');
>+function done()
>+{
>+    debug('Module rejects a script with no mime type.');
>+    finishJSTest();
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module" src="./contentTypeOptions/resources/script-with-header.pl" onerror="done()"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/http/tests/security/module-requires-javascript-mime-types-expected.txt b/LayoutTests/http/tests/security/module-requires-javascript-mime-types-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..997023dead36bdf21d8a5d3d156ac96da91320ac
>--- /dev/null
>+++ b/LayoutTests/http/tests/security/module-requires-javascript-mime-types-expected.txt
>@@ -0,0 +1,12 @@
>+CONSOLE MESSAGE: line 1: TypeError: Refused to execute module script from 'http://127.0.0.1:8000/security/contentTypeOptions/resources/script-with-header.pl' because its MIME type ('application/octet-stream') is not executable.
>+Test module rejects scripts with no mime type.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Module rejects a script with no mime type
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/http/tests/security/module-requires-javascript-mime-types.html b/LayoutTests/http/tests/security/module-requires-javascript-mime-types.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..1525e95cc4203048aa8a7422b7e8f96c7b4e4e35
>--- /dev/null
>+++ b/LayoutTests/http/tests/security/module-requires-javascript-mime-types.html
>@@ -0,0 +1,24 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test module rejects scripts with no mime type.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+</script>
>+<script>
>+debug('Module is not executed yet.');
>+function done()
>+{
>+    debug('Module rejects a script with no mime type');
>+    finishJSTest();
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+<script type="module" src="./contentTypeOptions/resources/script-with-header.pl" onerror="done()"></script>
>+</body>
>+</html>
>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..d0907f783c08d9acb7f2fe86e4773410b7606772
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html
>@@ -0,0 +1,22 @@
>+<!DOCTYPE HTML>
>+<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..4aec303f8f9d38273353eb8979167d39dc591c9a
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-error-should-be-propagated-to-onerror.html
>@@ -0,0 +1,22 @@
>+<!DOCTYPE HTML>
>+<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..5855c16d0a8151c60d36e6010c316703116d6e5c
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-order-inline.html
>@@ -0,0 +1,27 @@
>+<!DOCTYPE HTML>
>+<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..d894c52a7518776e437bd74d8ccddb65c57d68df
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-execution-order-mixed.html
>@@ -0,0 +1,27 @@
>+<!DOCTYPE HTML>
>+<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..aaf06468af7a5572963f8b66bfe2061a1835dcd0
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-incorrect-relative-specifier-expected.txt
>@@ -0,0 +1,16 @@
>+CONSOLE MESSAGE: line 1: TypeError: Module specifier does not start with "/", "./", or "../".
>+CONSOLE MESSAGE: line 1: TypeError: Module specifier does not start with "/", "./", or "../".
>+CONSOLE MESSAGE: line 1: TypeError: Module specifier does not start with "/", "./", or "../".
>+Test script.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..44c161e75f6aaf7eb8395fac65e33d777432cde9
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-incorrect-relative-specifier.html
>@@ -0,0 +1,35 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test script.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;
>+function errorHandler() {
>+    var current = count++;
>+    debug(`${current}`);
>+    if (count === 3)
>+        finishJSTest();
>+}
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+
>+<script type="module" onerror="errorHandler()">
>+import Incorrect from "incorrect"
>+</script>
>+
>+<script type="module" onerror="errorHandler()">
>+import Incorrect from "$hello"
>+</script>
>+
>+<script type="module" onerror="errorHandler()">
>+import Incorrect from ".../test"
>+</script>
>+
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-inline-current-script-expected.txt b/LayoutTests/js/dom/module-inline-current-script-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..7cfe446f4dc0bd87967f9b9b425731d7b5c5149d
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-inline-current-script-expected.txt
>@@ -0,0 +1,12 @@
>+Test document.currentScript should be null when executing the 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 document.currentScript is null
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-inline-current-script.html b/LayoutTests/js/dom/module-inline-current-script.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..a5f23171db88885e2ed94ddd0fd063305235e3b8
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-inline-current-script.html
>@@ -0,0 +1,25 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test document.currentScript should be null when executing the 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">
>+
>+debug("Module execution is confined in the module environment.");
>+shouldBe("document.currentScript", "null");
>+
>+finishJSTest();
>+</script>
>+</body>
>+</html>
>diff --git a/LayoutTests/js/dom/module-inline-dynamic-expected.txt b/LayoutTests/js/dom/module-inline-dynamic-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..6c939aaf0a5015f479386cd3195aa59dd1690975
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-inline-dynamic-expected.txt
>@@ -0,0 +1,14 @@
>+Test inlined module.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+Module is not executed yet.
>+Module execution is confined in the module environment.
>+PASS typeof cocoa is "undefined"
>+PASS typeof exportedCocoa is "object"
>+PASS exportedCocoa.taste() is "awesome"
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-inline-dynamic.html b/LayoutTests/js/dom/module-inline-dynamic.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..fd836d8edf7e2820e32253db53da55e0f8851e7e
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-inline-dynamic.html
>@@ -0,0 +1,35 @@
>+<!DOCTYPE HTML>
>+<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..a3ddd53227eff831599e2537627665aa35cbb854
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-inline-simple.html
>@@ -0,0 +1,30 @@
>+<!DOCTYPE HTML>
>+<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..783a237458b320c993b7283471fbc261f7900e5e
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-event-with-src.html
>@@ -0,0 +1,16 @@
>+<!DOCTYPE HTML>
>+<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..764d4acbd44a7761a200223af810558cdef053d5
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-event.html
>@@ -0,0 +1,18 @@
>+<!DOCTYPE HTML>
>+<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..a46611c0102c2195000be334290efa350a9464b4
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-same-module-from-different-entry-point-dynamic.html
>@@ -0,0 +1,25 @@
>+<!DOCTYPE HTML>
>+<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..ac46c9482b767bb319418211f6c24d8e58d42c12
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-load-same-module-from-different-entry-point.html
>@@ -0,0 +1,24 @@
>+<!DOCTYPE HTML>
>+<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..58266f7f79be5c69a162a098472ae54e87d529fc
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-not-found-error-event-with-src-and-import.html
>@@ -0,0 +1,21 @@
>+<!DOCTYPE HTML>
>+<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..22d1ec8b87aa67fbb2e75371faa216947e63ceaa
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-not-found-error-event-with-src.html
>@@ -0,0 +1,21 @@
>+<!DOCTYPE HTML>
>+<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..01f42458673d71883a222e129ab0ccfaa4e8a2c7
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-not-found-error-event.html
>@@ -0,0 +1,24 @@
>+<!DOCTYPE HTML>
>+<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-current-script-expected.txt b/LayoutTests/js/dom/module-src-current-script-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..3136777c2ebdbc830fb4ec89ab69f203fdc111cf
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-src-current-script-expected.txt
>@@ -0,0 +1,12 @@
>+Test document.currentScript should be null when executing the module with the 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 document.currentScript is null
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/js/dom/module-src-current-script.html b/LayoutTests/js/dom/module-src-current-script.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..dadc6d2383ce2dfacd69b2d7eca27e935116cb18
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-src-current-script.html
>@@ -0,0 +1,19 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test document.currentScript should be null when executing the module with the 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-current-script.js"></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..cc559afb7aa081e0c1b435a06a0fb078f1cf8029
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-src-dynamic.html
>@@ -0,0 +1,24 @@
>+<!DOCTYPE HTML>
>+<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..406f24e435bb66b487d9bbe3a5c1cba4796cd13c
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-src-simple.html
>@@ -0,0 +1,19 @@
>+<!DOCTYPE HTML>
>+<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..dffbacbd6dac85926726156c41ad904e7ea4ce18
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-type-case-insensitive.html
>@@ -0,0 +1,39 @@
>+<!DOCTYPE HTML>
>+<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..d6a80e8d491e102dce9281c947e00726f47d43fd
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-will-fire-beforeload.html
>@@ -0,0 +1,16 @@
>+<!DOCTYPE HTML>
>+<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-current-script.js b/LayoutTests/js/dom/script-tests/module-src-current-script.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..ac3073f59b5e5ce90ef1563d71da6a23b09cb044
>--- /dev/null
>+++ b/LayoutTests/js/dom/script-tests/module-src-current-script.js
>@@ -0,0 +1,3 @@
>+debug("Module execution is confined in the module environment.");
>+shouldBe("document.currentScript", "null");
>+finishJSTest();
>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