Attachment 261841 Details for Bug 148897 – Patch

[patch] Patch

bug-148897-20150923141837.patch (text/plain), 86.18 KB, created by Yusuke Suzuki on 2015-09-23 14:18:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2015-09-23 14:18:55 PDT

Size: 86.18 KB

patch

obsolete

>Subversion Revision: 190007
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 5138c564210852f1051e1a8b474d2d2ddcaf1ea5..9b5a9d17f2c548956c78e1fc35704f0bf3cc7504 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2015-09-23  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!).
>+
>+        * runtime/Symbol.h:
>+
> 2015-09-18  Sukolsak Sakshuwong  <sukolsak@gmail.com>
> 
>         Remove duplicate code in the WebAssembly parser
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 23a0622760cb4409bf6125d55a50ad097f9b5ec0..275c906c164798e5b819ad4257a2be80b2628685 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,100 @@
>+2015-09-23  Yusuke Suzuki  <utatane.tea@gmail.com>
>+
>+        [ES6] Integrate ES6 Modules into WebCore
>+        https://bugs.webkit.org/show_bug.cgi?id=148897
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Tests: js/dom/module-inline-simple.html
>+               js/dom/module-src-simple.html
>+
>+        * CMakeLists.txt:
>+        * ForwardingHeaders/runtime/JSInternalPromise.h: Added.
>+        * ForwardingHeaders/runtime/JSInternalPromiseDeferred.h: Added.
>+        * ForwardingHeaders/runtime/JSModuleRecord.h: Added.
>+        * ForwardingHeaders/runtime/Symbol.h: Added.
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * bindings/js/JSDOMWindowBase.cpp:
>+        (WebCore::JSDOMWindowBase::moduleLoaderResolve):
>+        (WebCore::JSDOMWindowBase::moduleLoaderFetch):
>+        (WebCore::JSDOMWindowBase::moduleLoaderEvaluate):
>+        * bindings/js/JSDOMWindowBase.h:
>+        * bindings/js/JSMainThreadExecState.h:
>+        (WebCore::JSMainThreadExecState::loadModule):
>+        (WebCore::JSMainThreadExecState::linkAndEvaluateModule):
>+        * bindings/js/ModuleFetcher.cpp: Added.
>+        (WebCore::ModuleFetcher::ModuleFetcher):
>+        (WebCore::ModuleFetcher::~ModuleFetcher):
>+        (WebCore::ModuleFetcher::create):
>+        (WebCore::ModuleFetcher::run):
>+        (WebCore::ModuleFetcher::notifyFinished):
>+        * bindings/js/ModuleFetcher.h: Added.
>+        (WebCore::ModuleFetcher::cachedScript):
>+        * bindings/js/ModuleLoader.cpp: Added.
>+        (WebCore::ModuleLoader::ModuleLoader):
>+        (WebCore::ModuleLoader::resolve):
>+        (WebCore::ModuleLoader::fetch):
>+        (WebCore::ModuleLoader::evaluate):
>+        (WebCore::ModuleLoader::notifyFinished):
>+        * bindings/js/ModuleLoader.h: Added.
>+        (WebCore::ModuleLoader::document):
>+        * bindings/js/ScriptController.cpp:
>+        (WebCore::ScriptController::ScriptController):
>+        (WebCore::ScriptController::evaluate):
>+        (WebCore::handleModuleLoaderError):
>+        (WebCore::ScriptController::loadModuleInWorld):
>+        (WebCore::ScriptController::loadModule):
>+        (WebCore::ScriptController::linkAndEvaluateModuleInWorld):
>+        (WebCore::ScriptController::linkAndEvaluateModule):
>+        (WebCore::ScriptController::evaluateModule):
>+        (WebCore::jsValueToModuleKey):
>+        (WebCore::ScriptController::initModuleGraph):
>+        * bindings/js/ScriptController.h:
>+        (WebCore::ScriptController::moduleLoaderAlreadyReportedErrorSymbol):
>+        * dom/Document.cpp:
>+        (WebCore::Document::Document):
>+        (WebCore::Document::~Document):
>+        * dom/Document.h:
>+        (WebCore::Document::moduleLoader):
>+        * dom/ModuleGraph.cpp: Added.
>+        (WebCore::ModuleGraph::ModuleGraph):
>+        (WebCore::ModuleGraph::notifyLoaded):
>+        (WebCore::ModuleGraph::notifyErrored):
>+        (WebCore::ModuleGraph::evaluate):
>+        (WebCore::ModuleGraph::notifyEvaluated):
>+        (WebCore::ModuleGraph::load):
>+        * dom/ModuleGraph.h: Added.
>+        (WebCore::ModuleGraph::element):
>+        (WebCore::ModuleGraph::moduleKey):
>+        (WebCore::ModuleGraph::weakElementPtr):
>+        (WebCore::ModuleGraph::errorOccurred):
>+        (WebCore::ModuleGraph::isLoaded):
>+        * dom/PendingModuleGraph.cpp: Added.
>+        (WebCore::PendingModuleGraph::PendingModuleGraph):
>+        (WebCore::PendingModuleGraph::~PendingModuleGraph):
>+        (WebCore::PendingModuleGraph::releaseElementAndClear):
>+        * dom/PendingModuleGraph.h: Added.
>+        * dom/ScriptElement.cpp:
>+        (WebCore::ScriptElement::isScriptTypeSupported):
>+        (WebCore::ScriptElement::prepareScript):
>+        (WebCore::ScriptElement::stopLoadRequest):
>+        (WebCore::ScriptElement::loadModule):
>+        * dom/ScriptElement.h:
>+        (WebCore::ScriptElement::moduleGraph):
>+        * dom/ScriptRunner.cpp:
>+        (WebCore::ScriptRunner::~ScriptRunner):
>+        (WebCore::ScriptRunner::queueModuleGraphForExecution):
>+        (WebCore::ScriptRunner::notifyModuleGraphReady):
>+        (WebCore::ScriptRunner::timerFired):
>+        * dom/ScriptRunner.h:
>+        (WebCore::ScriptRunner::hasPendingScripts):
>+        * html/HTMLScriptElement.cpp:
>+        (WebCore::HTMLScriptElement::isModuleType):
>+        * html/HTMLScriptElement.h:
>+        * svg/SVGScriptElement.cpp:
>+        (WebCore::SVGScriptElement::isModuleType):
>+        * svg/SVGScriptElement.h:
>+
> 2015-09-18  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         REGRESSION(r150187): updateIdForTreeScope may not be called inside shadow trees
>diff --git a/Source/JavaScriptCore/runtime/Symbol.h b/Source/JavaScriptCore/runtime/Symbol.h
>index 83f5de24852bc378ee0a77039f4631825fdddbbe..ddb68ccb3654459910cd3f23f66874d00588a958 100644
>--- a/Source/JavaScriptCore/runtime/Symbol.h
>+++ b/Source/JavaScriptCore/runtime/Symbol.h
>@@ -86,7 +86,7 @@ class Symbol final : public JSCell {
> 
>     Symbol(VM&);
>     Symbol(VM&, const String&);
>-    Symbol(VM&, SymbolImpl& uid);
>+    JS_EXPORT_PRIVATE Symbol(VM&, SymbolImpl& uid);
> 
>     void finishCreation(VM& vm)
>     {
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index ca1de4d156948bf7e10d0eeb466ccfc5e366b11a..dd6adbfca99ca35563ad99dd56029d57e5c8d32d 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1223,6 +1223,8 @@ set(WebCore_SOURCES
>     bindings/js/JSXMLHttpRequestCustom.cpp
>     bindings/js/JSXPathResultCustom.cpp
>     bindings/js/JSXSLTProcessorCustom.cpp
>+    bindings/js/ModuleFetcher.cpp
>+    bindings/js/ModuleLoader.cpp
>     bindings/js/ReadableJSStream.cpp
>     bindings/js/ScheduledAction.cpp
>     bindings/js/ScriptCachedFrameData.cpp
>@@ -1447,6 +1449,7 @@ set(WebCore_SOURCES
>     dom/MessagePort.cpp
>     dom/MessagePortChannel.cpp
>     dom/MicroTask.cpp
>+    dom/ModuleGraph.cpp
>     dom/MouseEvent.cpp
>     dom/MouseRelatedEvent.cpp
>     dom/MutationEvent.cpp
>diff --git a/Source/WebCore/ForwardingHeaders/runtime/JSInternalPromise.h b/Source/WebCore/ForwardingHeaders/runtime/JSInternalPromise.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..7f557a2f21ecf6b2aecad67e353e1966e4794e80
>--- /dev/null
>+++ b/Source/WebCore/ForwardingHeaders/runtime/JSInternalPromise.h
>@@ -0,0 +1,4 @@
>+#ifndef WebCore_FWD_JSInternalPromise_h
>+#define WebCore_FWD_JSInternalPromise_h
>+#include <JavaScriptCore/JSInternalPromise.h>
>+#endif
>diff --git a/Source/WebCore/ForwardingHeaders/runtime/JSInternalPromiseDeferred.h b/Source/WebCore/ForwardingHeaders/runtime/JSInternalPromiseDeferred.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..c6c086dd39aff9e104bd5a6ff7ae792546386955
>--- /dev/null
>+++ b/Source/WebCore/ForwardingHeaders/runtime/JSInternalPromiseDeferred.h
>@@ -0,0 +1,4 @@
>+#ifndef WebCore_FWD_JSInternalPromiseDeferred_h
>+#define WebCore_FWD_JSInternalPromiseDeferred_h
>+#include <JavaScriptCore/JSInternalPromiseDeferred.h>
>+#endif
>diff --git a/Source/WebCore/ForwardingHeaders/runtime/JSModuleRecord.h b/Source/WebCore/ForwardingHeaders/runtime/JSModuleRecord.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..63e9ecffbcf57c2a9c795ccb1d80340f914d7d4f
>--- /dev/null
>+++ b/Source/WebCore/ForwardingHeaders/runtime/JSModuleRecord.h
>@@ -0,0 +1,4 @@
>+#ifndef WebCore_FWD_JSModuleRecord_h
>+#define WebCore_FWD_JSModuleRecord_h
>+#include <JavaScriptCore/JSModuleRecord.h>
>+#endif
>diff --git a/Source/WebCore/ForwardingHeaders/runtime/Symbol.h b/Source/WebCore/ForwardingHeaders/runtime/Symbol.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..750427f091a9ecacfbfa099ae0d030e0e9bc5eb3
>--- /dev/null
>+++ b/Source/WebCore/ForwardingHeaders/runtime/Symbol.h
>@@ -0,0 +1,4 @@
>+#ifndef WebCore_FWD_Symbol_h
>+#define WebCore_FWD_Symbol_h
>+#include <JavaScriptCore/Symbol.h>
>+#endif
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 588a7fc88630cd885561ec5d05152f0d64ac05f8..82047ed37b7dfad531ffaf552f45dc7374a66ba6 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -6317,6 +6317,14 @@
> 		E1FF8F681807460800132674 /* JSSubtleCryptoCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F661807460800132674 /* JSSubtleCryptoCustom.cpp */; };
> 		E1FF8F6C180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F6A180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp */; };
> 		E1FF8F6D180DB5BE00132674 /* CryptoAlgorithmRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF8F6B180DB5BE00132674 /* CryptoAlgorithmRegistry.h */; };
>+		E339A5231BA6BD4600A3A7AE /* ModuleGraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E339A5211BA6BD4600A3A7AE /* ModuleGraph.cpp */; };
>+		E339A5241BA6BD4600A3A7AE /* ModuleGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = E339A5221BA6BD4600A3A7AE /* ModuleGraph.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		E38838961BAD145F00D62EE3 /* ModuleFetcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38838921BAD145F00D62EE3 /* ModuleFetcher.cpp */; settings = {ASSET_TAGS = (); }; };
>+		E38838971BAD145F00D62EE3 /* ModuleFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E38838931BAD145F00D62EE3 /* ModuleFetcher.h */; settings = {ASSET_TAGS = (); }; };
>+		E38838981BAD145F00D62EE3 /* ModuleLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38838941BAD145F00D62EE3 /* ModuleLoader.cpp */; settings = {ASSET_TAGS = (); }; };
>+		E38838991BAD145F00D62EE3 /* ModuleLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E38838951BAD145F00D62EE3 /* ModuleLoader.h */; settings = {ASSET_TAGS = (); }; };
>+		E388389C1BB07D2500D62EE3 /* PendingModuleGraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E388389A1BB07D2500D62EE3 /* PendingModuleGraph.cpp */; settings = {ASSET_TAGS = (); }; };
>+		E388389D1BB07D2500D62EE3 /* PendingModuleGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = E388389B1BB07D2500D62EE3 /* PendingModuleGraph.h */; settings = {ASSET_TAGS = (); }; };
> 		E401C27517CE53EC00C41A35 /* ElementIteratorAssertions.h in Headers */ = {isa = PBXBuildFile; fileRef = E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		E424A39E1330DF0100CF6DC9 /* LegacyTileGridTile.h in Headers */ = {isa = PBXBuildFile; fileRef = E424A39D1330DF0100CF6DC9 /* LegacyTileGridTile.h */; };
> 		E424A3A01330DF1E00CF6DC9 /* LegacyTileGridTile.mm in Sources */ = {isa = PBXBuildFile; fileRef = E424A39F1330DF1E00CF6DC9 /* LegacyTileGridTile.mm */; };
>@@ -14066,6 +14074,14 @@
> 		E1FF8F661807460800132674 /* JSSubtleCryptoCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSubtleCryptoCustom.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>"; };
>+		E339A5211BA6BD4600A3A7AE /* ModuleGraph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleGraph.cpp; sourceTree = "<group>"; };
>+		E339A5221BA6BD4600A3A7AE /* ModuleGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleGraph.h; sourceTree = "<group>"; };
>+		E38838921BAD145F00D62EE3 /* ModuleFetcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleFetcher.cpp; sourceTree = "<group>"; };
>+		E38838931BAD145F00D62EE3 /* ModuleFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleFetcher.h; sourceTree = "<group>"; };
>+		E38838941BAD145F00D62EE3 /* ModuleLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleLoader.cpp; sourceTree = "<group>"; };
>+		E38838951BAD145F00D62EE3 /* ModuleLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleLoader.h; sourceTree = "<group>"; };
>+		E388389A1BB07D2500D62EE3 /* PendingModuleGraph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PendingModuleGraph.cpp; sourceTree = "<group>"; };
>+		E388389B1BB07D2500D62EE3 /* PendingModuleGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PendingModuleGraph.h; sourceTree = "<group>"; };
> 		E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementIteratorAssertions.h; sourceTree = "<group>"; };
> 		E406F3FB1198307D009D59D6 /* ColorData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorData.cpp; sourceTree = "<group>"; };
> 		E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSPropertyNames.cpp; sourceTree = "<group>"; };
>@@ -21506,6 +21522,10 @@
> 				41189EF81AD8233C00B90A0D /* JSReadableStreamControllerCustom.cpp */,
> 				E1C36D320EB0A094007410BC /* JSWorkerGlobalScopeBase.cpp */,
> 				E1C36D330EB0A094007410BC /* JSWorkerGlobalScopeBase.h */,
>+				E38838921BAD145F00D62EE3 /* ModuleFetcher.cpp */,
>+				E38838931BAD145F00D62EE3 /* ModuleFetcher.h */,
>+				E38838941BAD145F00D62EE3 /* ModuleLoader.cpp */,
>+				E38838951BAD145F00D62EE3 /* ModuleLoader.h */,
> 				4198BDEE1A81123600B22FB5 /* ReadableJSStream.cpp */,
> 				4198BDEF1A81123600B22FB5 /* ReadableJSStream.h */,
> 				BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */,
>@@ -23472,6 +23492,8 @@
> 				41BF700A0FE86F49005E8DEC /* MessagePortChannel.h */,
> 				CB8CF0151A934B43000D510B /* MicroTask.cpp */,
> 				53B895AD19DC7C37009CAA93 /* MicroTask.h */,
>+				E339A5211BA6BD4600A3A7AE /* ModuleGraph.cpp */,
>+				E339A5221BA6BD4600A3A7AE /* ModuleGraph.h */,
> 				85031B2F0A44EFC700F992E0 /* MouseEvent.cpp */,
> 				85031B300A44EFC700F992E0 /* MouseEvent.h */,
> 				141B94E509EC4223000E9413 /* MouseEvent.idl */,
>@@ -23531,6 +23553,8 @@
> 				E1284AE010447D4500EAEB52 /* PageTransitionEvent.h */,
> 				E1284AD910447AEB00EAEB52 /* PageTransitionEvent.idl */,
> 				83D26D3D1AFDCC50001B3873 /* ParentNode.idl */,
>+				E388389A1BB07D2500D62EE3 /* PendingModuleGraph.cpp */,
>+				E388389B1BB07D2500D62EE3 /* PendingModuleGraph.h */,
> 				8A7CC96F12076F8A001D4588 /* PendingScript.cpp */,
> 				8A7CC96A12076D73001D4588 /* PendingScript.h */,
> 				41BF700D0FE86F61005E8DEC /* PlatformMessagePortChannel.cpp */,
>@@ -24586,6 +24610,7 @@
> 				316023F01532C40C00D50FF4 /* Dictionary.h in Headers */,
> 				937FF3D51A1012D6008EBA31 /* DictionaryLookup.h in Headers */,
> 				FDAF19991513D131008DB0C3 /* DirectConvolver.h in Headers */,
>+				E339A5241BA6BD4600A3A7AE /* ModuleGraph.h in Headers */,
> 				7EDAAFC919A2CCDC0034DFD1 /* DiskCacheMonitorCocoa.h in Headers */,
> 				49AF2D6914435D050016A784 /* DisplayRefreshMonitor.h in Headers */,
> 				2D29ECC6192ECC8300984B78 /* DisplayRefreshMonitorClient.h in Headers */,
>@@ -26161,6 +26186,7 @@
> 				CE1252411A16B1B600864480 /* MediaPlayerSPI.h in Headers */,
> 				52E2CAFC19FF0207001EEB4F /* MediaProducer.h in Headers */,
> 				4E19592A0A39DACC00220FE5 /* MediaQuery.h in Headers */,
>+				E38838991BAD145F00D62EE3 /* ModuleLoader.h in Headers */,
> 				4E19592C0A39DACC00220FE5 /* MediaQueryEvaluator.h in Headers */,
> 				4E19592E0A39DACC00220FE5 /* MediaQueryExp.h in Headers */,
> 				D3A94A39122DABAC00A37BBC /* MediaQueryList.h in Headers */,
>@@ -26783,6 +26809,7 @@
> 				0FB8890F167D30160010CDA5 /* ScrollingStateStickyNode.h in Headers */,
> 				931CBD11161A44E900E4C874 /* ScrollingStateTree.h in Headers */,
> 				1AF62F2614DAFEA10041556C /* ScrollingThread.h in Headers */,
>+				E388389D1BB07D2500D62EE3 /* PendingModuleGraph.h in Headers */,
> 				1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */,
> 				93C38C03164473DD00091EB2 /* ScrollingTreeFixedNode.h in Headers */,
> 				0FEA3E88191B3BD7000F1B55 /* ScrollingTreeFrameScrollingNode.h in Headers */,
>@@ -27205,6 +27232,7 @@
> 				080E49281255F3BD00EFCA27 /* SVGTextLayoutEngineSpacing.h in Headers */,
> 				08F0BFC61255C53C00075185 /* SVGTextMetrics.h in Headers */,
> 				7117445914BC34EC00EE5FC8 /* SVGTextMetricsBuilder.h in Headers */,
>+				E38838971BAD145F00D62EE3 /* ModuleFetcher.h in Headers */,
> 				B2227ACE0D00BF220071B782 /* SVGTextPathElement.h in Headers */,
> 				B2227AD10D00BF220071B782 /* SVGTextPositioningElement.h in Headers */,
> 				0854B0251255E4E600B9CDD0 /* SVGTextQuery.h in Headers */,
>@@ -27972,6 +28000,7 @@
> 				CD0EEE0E14743F39003EAFA2 /* AudioDestinationIOS.cpp in Sources */,
> 				FD3160BC12B0272A00C1A359 /* AudioDestinationMac.cpp in Sources */,
> 				FD31600712B0267600C1A359 /* AudioDestinationNode.cpp in Sources */,
>+				E339A5231BA6BD4600A3A7AE /* ModuleGraph.cpp in Sources */,
> 				FD31608112B026F700C1A359 /* AudioDSPKernelProcessor.cpp in Sources */,
> 				CD5596911475B678001D0BD0 /* AudioFileReaderIOS.cpp in Sources */,
> 				FD3160BE12B0272A00C1A359 /* AudioFileReaderMac.cpp in Sources */,
>@@ -28535,6 +28564,7 @@
> 				E4A007851B820ED3002C5A6E /* DataURLDecoder.cpp in Sources */,
> 				498391510F1E76B400C23782 /* DOMWebKitCSSMatrix.mm in Sources */,
> 				8AD0A59714C88358000D83C5 /* DOMWebKitCSSRegionRule.mm in Sources */,
>+				E38838981BAD145F00D62EE3 /* ModuleLoader.cpp in Sources */,
> 				31611E620E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm in Sources */,
> 				3F2B33EC165AF15600E3987C /* DOMWebKitCSSViewportRule.mm in Sources */,
> 				7C91A38F1B498ABE003F9EFA /* JSNodeOrString.cpp in Sources */,
>@@ -28588,6 +28618,7 @@
> 				9766504F144FBFFE00F6BB51 /* EventFactory.cpp in Sources */,
> 				93C09A810B064F00005ABD4D /* EventHandler.cpp in Sources */,
> 				FE6938B61045D67E008EABB6 /* EventHandlerIOS.mm in Sources */,
>+				E388389C1BB07D2500D62EE3 /* PendingModuleGraph.cpp in Sources */,
> 				93C09A7F0B064EEF005ABD4D /* EventHandlerMac.mm in Sources */,
> 				AD4495F3141FC08900541EDF /* EventListenerMap.cpp in Sources */,
> 				C400D10918F1C8F60090D863 /* EventLoopInput.cpp in Sources */,
>@@ -28862,6 +28893,7 @@
> 				A871DB2E0A150BD600B12A68 /* HTMLTableCellElement.cpp in Sources */,
> 				A871DB290A150BD600B12A68 /* HTMLTableColElement.cpp in Sources */,
> 				A871DB280A150BD600B12A68 /* HTMLTableElement.cpp in Sources */,
>+				E38838961BAD145F00D62EE3 /* ModuleFetcher.cpp in Sources */,
> 				A871DB2D0A150BD600B12A68 /* HTMLTablePartElement.cpp in Sources */,
> 				A871DB300A150BD600B12A68 /* HTMLTableRowElement.cpp in Sources */,
> 				93442CA00D2B336000338FF9 /* HTMLTableRowsCollection.cpp in Sources */,
>diff --git a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp b/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>index 79b740be5e1a2600c41d73212515f8ff112be966..32a05b6c8029ec2686c8f8b9d78fe52821050a6f 100644
>--- a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>+++ b/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
>@@ -31,11 +31,13 @@
> #include "JSDOMWindowCustom.h"
> #include "JSNode.h"
> #include "Logging.h"
>+#include "ModuleLoader.h"
> #include "Page.h"
> #include "ScriptController.h"
> #include "SecurityOrigin.h"
> #include "Settings.h"
> #include "WebCoreJSClientData.h"
>+#include <runtime/JSInternalPromiseDeferred.h>
> #include <runtime/Microtask.h>
> #include <wtf/MainThread.h>
> 
>@@ -56,7 +58,7 @@ static bool shouldAllowAccessFrom(const JSGlobalObject* thisObject, ExecState* e
> 
> const ClassInfo JSDOMWindowBase::s_info = { "Window", &JSDOMGlobalObject::s_info, 0, CREATE_METHOD_TABLE(JSDOMWindowBase) };
> 
>-const GlobalObjectMethodTable JSDOMWindowBase::s_globalObjectMethodTable = { &shouldAllowAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, nullptr, nullptr, nullptr, nullptr, nullptr };
>+const GlobalObjectMethodTable JSDOMWindowBase::s_globalObjectMethodTable = { &shouldAllowAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptRuntimeFlags, &queueTaskToEventLoop, &shouldInterruptScriptBeforeTimeout, &moduleLoaderResolve, &moduleLoaderFetch, nullptr, nullptr, &moduleLoaderEvaluate };
> 
> JSDOMWindowBase::JSDOMWindowBase(VM& vm, Structure* structure, PassRefPtr<DOMWindow> window, JSDOMWindowShell* shell)
>     : JSDOMGlobalObject(vm, structure, &shell->world(), &s_globalObjectMethodTable)
>@@ -279,4 +281,31 @@ void JSDOMWindowBase::fireFrameClearedWatchpointsForWindow(DOMWindow* window)
>     }
> }
> 
>+
>+JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderResolve(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSValue moduleName, JSC::JSValue referrer)
>+{
>+    JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
>+    if (Document* document = thisObject->impl().document())
>+        return document->moduleLoader()->resolve(globalObject, exec, moduleName, referrer);
>+    JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>+    return deferred->reject(exec, jsUndefined());
>+}
>+
>+JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderFetch(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSValue moduleKey)
>+{
>+    JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
>+    if (Document* document = thisObject->impl().document())
>+        return document->moduleLoader()->fetch(globalObject, exec, moduleKey);
>+    JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>+    return deferred->reject(exec, jsUndefined());
>+}
>+
>+JSC::JSValue JSDOMWindowBase::moduleLoaderEvaluate(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSValue moduleKey, JSC::JSValue moduleRecord)
>+{
>+    JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
>+    if (Document* document = thisObject->impl().document())
>+        return document->moduleLoader()->evaluate(globalObject, exec, moduleKey, moduleRecord);
>+    return JSC::jsUndefined();
>+}
>+
> } // namespace WebCore
>diff --git a/Source/WebCore/bindings/js/JSDOMWindowBase.h b/Source/WebCore/bindings/js/JSDOMWindowBase.h
>index 5ed3862c141187c006b688db797794b369810564..2d44b8009e54dbb074e8f9977c16b25e1257eabe 100644
>--- a/Source/WebCore/bindings/js/JSDOMWindowBase.h
>+++ b/Source/WebCore/bindings/js/JSDOMWindowBase.h
>@@ -78,6 +78,11 @@ namespace WebCore {
>         JSC::WatchpointSet m_windowCloseWatchpoints;
> 
>     private:
>+        // Module Loader hooks.
>+        static JSC::JSInternalPromise* moduleLoaderResolve(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSValue, JSC::JSValue);
>+        static JSC::JSInternalPromise* moduleLoaderFetch(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSValue);
>+        static JSC::JSValue moduleLoaderEvaluate(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSValue, JSC::JSValue);
>+
>         RefPtr<DOMWindow> m_impl;
>         JSDOMWindowShell* m_shell;
>     };
>diff --git a/Source/WebCore/bindings/js/JSMainThreadExecState.h b/Source/WebCore/bindings/js/JSMainThreadExecState.h
>index 09e7e5b6026879b5335a1fe1ef71c447430bfcd4..4fd683e159102b15287d63899c016efd374803e5 100644
>--- a/Source/WebCore/bindings/js/JSMainThreadExecState.h
>+++ b/Source/WebCore/bindings/js/JSMainThreadExecState.h
>@@ -74,6 +74,24 @@ class JSMainThreadExecState {
>         task.run(exec);
>     }
> 
>+    static JSC::JSInternalPromise* loadModule(JSC::ExecState* exec, const String& moduleName)
>+    {
>+        JSMainThreadExecState currentState(exec);
>+        return JSC::loadModule(exec, moduleName);
>+    }
>+
>+    static JSC::JSInternalPromise* loadModule(JSC::ExecState* exec, const JSC::SourceCode& sourceCode)
>+    {
>+        JSMainThreadExecState currentState(exec);
>+        return JSC::loadModule(exec, sourceCode);
>+    }
>+
>+    static JSC::JSInternalPromise* linkAndEvaluateModule(JSC::ExecState* exec, const JSC::Identifier& moduleKey)
>+    {
>+        JSMainThreadExecState currentState(exec);
>+        return JSC::linkAndEvaluateModule(exec, moduleKey);
>+    }
>+
>     static InspectorInstrumentationCookie instrumentFunctionCall(ScriptExecutionContext*, JSC::CallType, const JSC::CallData&);
> 
> private:
>diff --git a/Source/WebCore/bindings/js/ModuleFetcher.cpp b/Source/WebCore/bindings/js/ModuleFetcher.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..23f1eaa08880d4a63bcad4e349fc4a0594fe13e4
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ModuleFetcher.cpp
>@@ -0,0 +1,135 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "ModuleFetcher.h"
>+
>+#include "CachedResourceLoader.h"
>+#include "CachedScript.h"
>+#include "DOMWrapperWorld.h"
>+#include "Frame.h"
>+#include "JSDOMBinding.h"
>+#include "ModuleLoader.h"
>+#include "ResourceLoaderOptions.h"
>+#include "ScriptController.h"
>+#include "ScriptSourceCode.h"
>+
>+namespace WebCore {
>+
>+ModuleFetcher::ModuleFetcher(JSDOMGlobalObject* globalObject, const URL& sourceURL, JSC::JSInternalPromiseDeferred* deferred, Document& document)
>+    : m_document(document)
>+    , m_sourceURL(sourceURL)
>+    , m_globalObject(globalObject->vm(), globalObject)
>+    , m_deferred(globalObject->vm(), deferred)
>+{
>+}
>+
>+ModuleFetcher::~ModuleFetcher()
>+{
>+    if (m_cachedScript) {
>+        m_cachedScript->removeClient(this);
>+        m_cachedScript = nullptr;
>+    }
>+}
>+
>+Ref<ModuleFetcher> ModuleFetcher::create(JSDOMGlobalObject* globalObject, const URL& sourceURL, JSC::JSInternalPromiseDeferred* deferred, Document& document)
>+{
>+    return adoptRef(*new ModuleFetcher(globalObject, sourceURL, deferred, document));
>+}
>+
>+bool ModuleFetcher::run()
>+{
>+    ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
>+    options.setContentSecurityPolicyImposition(ContentSecurityPolicyImposition::DoPolicyCheck);
>+
>+    CachedResourceRequest request(ResourceRequest(m_sourceURL), options);
>+
>+    // FIXME: Should handle "crossorigin" options.
>+    // Once the spec describes the details, we will follow it.
>+    request.setInitiator(AtomicString(m_sourceURL.string()));
>+
>+    m_cachedScript = m_document.cachedResourceLoader().requestScript(request);
>+    if (!m_cachedScript)
>+        return false;
>+
>+    // Note: If the content is already cached, this immeidately calls notifyFinished.
>+    m_cachedScript->addClient(this);
>+    return true;
>+}
>+
>+void ModuleFetcher::notifyFinished(CachedResource* resource)
>+{
>+    ASSERT_UNUSED(resource, resource == m_cachedScript);
>+    if (!m_cachedScript)
>+        return;
>+
>+    ASSERT(m_cachedScript);
>+    CachedResourceHandle<CachedScript> cachedScript = m_cachedScript;
>+    m_cachedScript = nullptr;
>+
>+#if ENABLE(NOSNIFF)
>+    if (cachedScript && !cachedScript->mimeTypeAllowedByNosniff()) {
>+        m_document.addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Refused to execute script from '" + cachedScript->url().stringCenterEllipsizedToLength() + "' because its MIME type ('" + cachedScript->mimeType() + "') is not executable, and strict MIME type checking is enabled.");
>+        return;
>+    }
>+#endif
>+
>+    if (Frame* frame = m_document.frame()) {
>+        JSC::JSLockHolder lock(m_globalObject->vm());
>+        JSC::ExecState* exec = m_globalObject->globalExec();
>+        if (cachedScript->errorOccurred()) {
>+            // The module loader pipeline is constructed as a chain of promises.
>+            // Rejecting a promise if some error occurs is important because the execution flow of
>+            // the promise chain is driven by "rejected" or "fulfilled" events.
>+            // If the promise is not rejected while error occurs, reject handler won't be executed
>+            // and all the subsequent promise chain 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 reported by the loader. But we need to reject the promise by some
>+            // error.
>+            //
>+            // Not to report the error twice, when we propagate the error that is already reported
>+            // to the inspector, we throw moduleLoaderAlreadyReportedErrorSymbol symbol instead.
>+            // By comparing the thrown error with this symbol, we can distinguish errors raised
>+            // when linking or executing a module graph from errors reported already.
>+            // In the reject handler of the promise, we only report a error that is not this symbol.
>+            m_deferred->reject(exec, JSC::Symbol::create(exec->vm(), *(frame->script().moduleLoaderAlreadyReportedErrorSymbol().uid())));
>+        } else if (!cachedScript->wasCanceled()) {
>+            ScriptSourceCode sourceCode(cachedScript.get());
>+            m_deferred->resolve(exec, JSC::jsString(exec, sourceCode.source()));
>+        }
>+    }
>+
>+    // A CachedResourceHandle alone does not prevent the underlying CachedResource
>+    // from purging its data buffer. Until we finish using the backing buffer of the
>+    // cached script, we don't remove the client.
>+    cachedScript->removeClient(this);
>+
>+    m_document.moduleLoader()->notifyFinished(this);
>+    // After ModuleLoader::notifyFinished call, |this| may be destroyed.
>+}
>+
>+}
>diff --git a/Source/WebCore/bindings/js/ModuleFetcher.h b/Source/WebCore/bindings/js/ModuleFetcher.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..b93d36ae360f2f72b0e99efba437f73546b4620f
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ModuleFetcher.h
>@@ -0,0 +1,69 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef ModuleFetcher_h
>+#define ModuleFetcher_h
>+
>+#include "CachedResourceClient.h"
>+#include "CachedResourceHandle.h"
>+#include "URL.h"
>+#include <heap/StrongInlines.h>
>+#include <runtime/JSInternalPromiseDeferred.h>
>+#include <wtf/Noncopyable.h>
>+#include <wtf/Ref.h>
>+
>+namespace WebCore {
>+
>+class CachedScript;
>+class Document;
>+class JSDOMGlobalObject;
>+
>+class ModuleFetcher : public RefCounted<ModuleFetcher>, private CachedResourceClient {
>+    WTF_MAKE_NONCOPYABLE(ModuleFetcher); WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    static Ref<ModuleFetcher> create(JSDOMGlobalObject*, const URL& sourceURL, JSC::JSInternalPromiseDeferred*, Document&);
>+
>+    ~ModuleFetcher();
>+
>+    bool run();
>+
>+    CachedScript* cachedScript() { return m_cachedScript.get(); }
>+
>+private:
>+    ModuleFetcher(JSDOMGlobalObject*, const URL& sourceURL, JSC::JSInternalPromiseDeferred*, Document&);
>+
>+    // For CachedResourceClient.
>+    virtual void notifyFinished(CachedResource*) override;
>+
>+    Document& m_document;
>+    URL m_sourceURL;
>+    JSC::Strong<JSDOMGlobalObject> m_globalObject;
>+    JSC::Strong<JSC::JSInternalPromiseDeferred> m_deferred;
>+    CachedResourceHandle<CachedScript> m_cachedScript { };
>+};
>+
>+} // namespace WebCore
>+
>+#endif // ModuleFetcher_h
>diff --git a/Source/WebCore/bindings/js/ModuleLoader.cpp b/Source/WebCore/bindings/js/ModuleLoader.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..5002b162d0123f5a088aef7bf0b43c5329527ec8
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ModuleLoader.cpp
>@@ -0,0 +1,134 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "ModuleLoader.h"
>+
>+#include "Document.h"
>+#include "ExceptionCode.h"
>+#include "Frame.h"
>+#include "JSDOMBinding.h"
>+#include "MicroTask.h"
>+#include "ModuleGraph.h"
>+#include "ScriptController.h"
>+#include <bindings/ScriptValue.h>
>+#include <runtime/Completion.h>
>+#include <runtime/JSInternalPromiseDeferred.h>
>+#include <runtime/JSModuleRecord.h>
>+#include <runtime/JSString.h>
>+#include <runtime/Symbol.h>
>+
>+namespace WebCore {
>+
>+ModuleLoader::ModuleLoader(Document& document)
>+    : m_document(document)
>+{
>+}
>+
>+JSC::JSInternalPromise* ModuleLoader::resolve(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSValue moduleNameValue, JSC::JSValue referrerValue)
>+{
>+    JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>+    if (moduleNameValue.isSymbol())
>+        return deferred->resolve(exec, moduleNameValue);
>+
>+    // FIXME: We now assume that module name is either symbol or string.
>+    // When exposing the reflection to the module loader and modules, we need to recast this part.
>+    ASSERT(moduleNameValue.isString());
>+    String moduleName = JSC::jsCast<JSC::JSString*>(moduleNameValue)->value(exec);
>+
>+    // Now, we consider the given moduleName as the same to the src="..." in the script tag.
>+    // We use the completed URL as the module key.
>+    //
>+    // FIXME: We need site packaging system. But it's not defined in the spec yet.
>+    // https://whatwg.github.io/loader/#browser-loader-prototype-%40%40resolve
>+    URL completedURL;
>+
>+    // FIXME: Check m_document lifetime.
>+    if (referrerValue.isSymbol())
>+        completedURL = m_document.completeURL(moduleName);
>+    else {
>+        if (referrerValue.isUndefined())
>+            completedURL = m_document.completeURL(moduleName);
>+        else {
>+            ASSERT(referrerValue.isString());
>+            String referrer = JSC::jsCast<JSC::JSString*>(referrerValue)->value(exec);
>+            completedURL = m_document.completeURL(moduleName, URL(ParsedURLString, referrer));
>+        }
>+    }
>+    if (!completedURL.isValid())
>+        return deferred->reject(exec, createDOMException(exec, SYNTAX_ERR));
>+
>+    return deferred->resolve(exec, jsString(exec, completedURL.string()));
>+}
>+
>+JSC::JSInternalPromise* ModuleLoader::fetch(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSValue moduleKeyValue)
>+{
>+    // FIXME: When implementing reflective module loader and modules, we should recast this implementation.
>+    JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
>+
>+    ASSERT_WITH_MESSAGE(!moduleKeyValue.isSymbol(), "Symbolic module key should be already fulfilled with the inlined resource.");
>+    ASSERT(moduleKeyValue.isString());
>+
>+    JSC::Identifier moduleKey = JSC::Identifier::fromString(exec, asString(moduleKeyValue)->value(exec));
>+
>+    URL completedURL(ParsedURLString, moduleKey.impl());
>+    ASSERT_WITH_MESSAGE(completedURL.isValid(), "The resolve hook should produce the valid URL as a string.");
>+
>+    Ref<ModuleFetcher> fetcher = ModuleFetcher::create(JSC::jsCast<JSDOMGlobalObject*>(globalObject), completedURL, deferred, m_document);
>+    m_fetchingSet.add(&fetcher.get());
>+    if (!fetcher->run()) {
>+        if (Frame* frame = m_document.frame())
>+            return deferred->reject(exec, JSC::Symbol::create(exec->vm(), *(frame->script().moduleLoaderAlreadyReportedErrorSymbol().uid())));
>+    }
>+
>+    return deferred->promise();
>+}
>+
>+JSC::JSValue ModuleLoader::evaluate(JSC::JSGlobalObject*, JSC::ExecState* exec, JSC::JSValue moduleKeyValue, JSC::JSValue moduleRecordValue)
>+{
>+    // FIXME: Currently, we only support JSModuleRecord.
>+    JSC::JSModuleRecord* moduleRecord = JSC::jsDynamicCast<JSC::JSModuleRecord*>(moduleRecordValue);
>+    if (!moduleRecord)
>+        return JSC::jsUndefined();
>+
>+    URL sourceURL;
>+    if (moduleKeyValue.isSymbol())
>+        sourceURL = m_document.url();
>+    else {
>+        ASSERT(moduleKeyValue.isString());
>+        sourceURL = URL(ParsedURLString, asString(moduleKeyValue)->value(exec));
>+    }
>+
>+    if (Frame* frame = m_document.frame())
>+        return frame->script().evaluateModule(sourceURL, moduleRecord);
>+    return JSC::jsUndefined();
>+}
>+
>+void ModuleLoader::notifyFinished(ModuleFetcher* fetcher)
>+{
>+    m_fetchingSet.remove(fetcher);
>+}
>+
>+}
>diff --git a/Source/WebCore/bindings/js/ModuleLoader.h b/Source/WebCore/bindings/js/ModuleLoader.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..34936968165eed858101781cd185470c8eb5e0d0
>--- /dev/null
>+++ b/Source/WebCore/bindings/js/ModuleLoader.h
>@@ -0,0 +1,64 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef ModuleLoader_h
>+#define ModuleLoader_h
>+
>+#include "Element.h"
>+#include "ModuleFetcher.h"
>+#include "ModuleGraph.h"
>+#include "Timer.h"
>+#include <runtime/JSInternalPromise.h>
>+#include <wtf/HashMap.h>
>+#include <wtf/Noncopyable.h>
>+#include <wtf/Vector.h>
>+
>+namespace WebCore {
>+
>+class Document;
>+
>+class ModuleLoader {
>+    WTF_MAKE_NONCOPYABLE(ModuleLoader); WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    explicit ModuleLoader(Document&);
>+
>+    Document& document()
>+    {
>+        return m_document;
>+    }
>+
>+    JSC::JSInternalPromise* resolve(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSValue moduleName, JSC::JSValue referrer);
>+    JSC::JSInternalPromise* fetch(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSValue moduleKey);
>+    JSC::JSValue evaluate(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSValue moduleKey, JSC::JSValue moduleRecord);
>+
>+    void notifyFinished(ModuleFetcher*);
>+private:
>+    Document& m_document;
>+    HashSet<RefPtr<ModuleFetcher>> m_fetchingSet;
>+};
>+
>+} // namespace WebCore
>+
>+#endif // ModuleLoader_h
>diff --git a/Source/WebCore/bindings/js/ScriptController.cpp b/Source/WebCore/bindings/js/ScriptController.cpp
>index 4b3b0972be77f3c76595f140e26a748ff8ea450c..99b7f8b62a4b7feaef3fc5b4a7ced718a53ed3cc 100644
>--- a/Source/WebCore/bindings/js/ScriptController.cpp
>+++ b/Source/WebCore/bindings/js/ScriptController.cpp
>@@ -36,11 +36,13 @@
> #include "JSMainThreadExecState.h"
> #include "MainFrame.h"
> #include "MemoryPressureHandler.h"
>+#include "ModuleGraph.h"
> #include "NP_jsobject.h"
> #include "Page.h"
> #include "PageConsoleClient.h"
> #include "PageGroup.h"
> #include "PluginViewBase.h"
>+#include "ScriptElement.h"
> #include "ScriptSourceCode.h"
> #include "ScriptableDocumentParser.h"
> #include "Settings.h"
>@@ -54,7 +56,11 @@
> #include <inspector/ScriptCallStack.h>
> #include <profiler/Profile.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>
> 
>@@ -86,6 +92,7 @@ ScriptController::ScriptController(Frame& frame)
>     : m_frame(frame)
>     , m_sourceURL(0)
>     , m_paused(false)
>+    , m_moduleLoaderAlreadyReportedErrorSymbol()
> #if ENABLE(NETSCAPE_PLUGIN_API)
>     , m_windowScriptNPObject(0)
> #endif
>@@ -175,11 +182,128 @@ Deprecated::ScriptValue ScriptController::evaluateInWorld(const ScriptSourceCode
>     return Deprecated::ScriptValue(exec->vm(), returnValue);
> }
> 
>-Deprecated::ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode) 
>+Deprecated::ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode)
> {
>     return evaluateInWorld(sourceCode, mainThreadNormalWorld());
> }
> 
>+static void handleModuleLoaderError(ExecState* exec, JSValue error, const PrivateName& moduleLoaderAlreadyReportedErrorSymbol)
>+{
>+    // Once reported error is marked as moduleLoaderAlreadyReportedErrorSymbol.
>+    // Don't report it here again.
>+    if (Symbol* symbol = jsDynamicCast<Symbol*>(error)) {
>+        if (symbol->privateName() == moduleLoaderAlreadyReportedErrorSymbol)
>+            return;
>+    }
>+
>+    // FIXME: Because we have not supported the "crossorigin" attribute in the module tag,
>+    // we pass the nullptr to reportException's CachedScript* parameter. When passing nullptr
>+    // to reportException, WebCore does not show the detail of the error if the URL of the
>+    // source does not pass the same origin policy. So the current behavior is conservative;
>+    // only the module code that URL is within the same origin can report the details of the
>+    // error. Once the spec describes the behavior, we will follow it.
>+    reportException(exec, error, nullptr);
>+}
>+
>+void ScriptController::loadModuleInWorld(ModuleGraph& moduleGraph, const String& moduleName, DOMWrapperWorld& world)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    initModuleGraph(moduleGraph, JSMainThreadExecState::loadModule(exec, moduleName), world);
>+}
>+
>+void ScriptController::loadModule(ModuleGraph& moduleGraph, const String& moduleName)
>+{
>+    loadModuleInWorld(moduleGraph, moduleName, mainThreadNormalWorld());
>+}
>+
>+void ScriptController::loadModuleInWorld(ModuleGraph& moduleGraph, const ScriptSourceCode& sourceCode, DOMWrapperWorld& world)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    initModuleGraph(moduleGraph, JSMainThreadExecState::loadModule(exec, sourceCode.jsSourceCode()), world);
>+}
>+
>+void ScriptController::loadModule(ModuleGraph& moduleGraph, const ScriptSourceCode& sourceCode)
>+{
>+    loadModuleInWorld(moduleGraph, sourceCode, mainThreadNormalWorld());
>+}
>+
>+void ScriptController::linkAndEvaluateModuleInWorld(ModuleGraph& moduleGraph, DOMWrapperWorld& world)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    JSInternalPromise* promise = JSMainThreadExecState::linkAndEvaluateModule(exec, Identifier::fromUid(&exec->vm(), moduleGraph.moduleKey()));
>+
>+    WeakPtr<Element> weakPtr(moduleGraph.weakElementPtr());
>+    JSFunction* fulfillHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [weakPtr](ExecState*) {
>+        if (RefPtr<Element> element = weakPtr.get())
>+            toScriptElementIfPossible(element.get())->moduleGraph()->notifyEvaluated();
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    PrivateName moduleLoaderAlreadyReportedErrorSymbol = m_moduleLoaderAlreadyReportedErrorSymbol;
>+    JSFunction* rejectHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [moduleLoaderAlreadyReportedErrorSymbol, weakPtr](ExecState* exec) {
>+        if (RefPtr<Element> element = weakPtr.get())
>+            toScriptElementIfPossible(element.get())->moduleGraph()->notifyEvaluated();
>+        handleModuleLoaderError(exec, exec->argument(0), moduleLoaderAlreadyReportedErrorSymbol);
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    promise->then(exec, fulfillHandler, rejectHandler);
>+}
>+
>+void ScriptController::linkAndEvaluateModule(ModuleGraph& moduleGraph)
>+{
>+    linkAndEvaluateModuleInWorld(moduleGraph, mainThreadNormalWorld());
>+}
>+
>+Deprecated::ScriptValue 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> protect(m_frame);
>+
>+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willEvaluateScript(m_frame, sourceURL, jsSourceCode.firstLine());
>+
>+    JSValue returnValue = moduleRecord->evaluate(exec);
>+    NakedPtr<Exception> evaluationException;
>+    if (exec->hadException())
>+        evaluationException = exec->vm().exception();
>+
>+    InspectorInstrumentation::didEvaluateScript(cookie, m_frame);
>+
>+    if (evaluationException) {
>+        reportException(exec, evaluationException, nullptr);
>+        m_sourceURL = savedSourceURL;
>+        return Deprecated::ScriptValue();
>+    }
>+
>+    m_sourceURL = savedSourceURL;
>+    return Deprecated::ScriptValue(exec->vm(), returnValue);
>+}
>+
>+Deprecated::ScriptValue ScriptController::evaluateModule(const URL& sourceURL, JSModuleRecord* moduleRecord)
>+{
>+    return evaluateModule(sourceURL, moduleRecord, mainThreadNormalWorld());
>+}
>+
> Ref<DOMWrapperWorld> ScriptController::createWorld()
> {
>     return DOMWrapperWorld::create(JSDOMWindow::commonVM());
>@@ -272,6 +396,41 @@ JSDOMWindowShell* ScriptController::initScript(DOMWrapperWorld& world)
>     return windowShell;
> }
> 
>+static Identifier jsValueToModuleKey(ExecState* exec, JSValue value)
>+{
>+    if (value.isSymbol())
>+        return Identifier::fromUid(jsCast<Symbol*>(value)->privateName());
>+    ASSERT(value.isString());
>+    return Identifier::fromString(exec, jsCast<JSString*>(value)->value(exec));
>+}
>+
>+void ScriptController::initModuleGraph(ModuleGraph& moduleGraph, JSInternalPromise* promise, DOMWrapperWorld& world)
>+{
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    WeakPtr<Element> weakPtr(moduleGraph.weakElementPtr());
>+    JSFunction* fulfillHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [weakPtr](ExecState* exec) {
>+        // ModuleGraph, script element and document may be destroyed during loading the module.
>+        // In this case, we should not execute module body.
>+        if (RefPtr<Element> element = weakPtr.get()) {
>+            Identifier moduleKey = jsValueToModuleKey(exec, exec->argument(0));
>+            toScriptElementIfPossible(element.get())->moduleGraph()->notifyLoaded(moduleKey.impl());
>+        }
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    PrivateName moduleLoaderAlreadyReportedErrorSymbol = m_moduleLoaderAlreadyReportedErrorSymbol;
>+    JSFunction* rejectHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [moduleLoaderAlreadyReportedErrorSymbol, weakPtr](ExecState* exec) {
>+        if (RefPtr<Element> element = weakPtr.get())
>+            toScriptElementIfPossible(element.get())->moduleGraph()->notifyErrored();
>+        handleModuleLoaderError(exec, exec->argument(0), moduleLoaderAlreadyReportedErrorSymbol);
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    promise->then(exec, fulfillHandler, rejectHandler);
>+}
>+
> TextPosition ScriptController::eventHandlerPosition() const
> {
>     // FIXME: If we are not currently parsing, we should use our current location
>diff --git a/Source/WebCore/bindings/js/ScriptController.h b/Source/WebCore/bindings/js/ScriptController.h
>index 07c53b7c8edfb4e28f5ca13aa2c4e05594ef5122..901b53ebaf54c478f7d41ef1dc5150c1b085a96e 100644
>--- a/Source/WebCore/bindings/js/ScriptController.h
>+++ b/Source/WebCore/bindings/js/ScriptController.h
>@@ -44,6 +44,9 @@ class ScriptValue;
> 
> namespace JSC {
>     class JSGlobalObject;
>+    class JSModuleRecord;
>+    class JSInternalPromise;
>+
>     class ExecState;
> 
>     namespace Bindings {
>@@ -57,6 +60,7 @@ namespace WebCore {
> class Frame;
> class HTMLDocument;
> class HTMLPlugInElement;
>+class ModuleGraph;
> class ScriptSourceCode;
> class SecurityOrigin;
> class Widget;
>@@ -115,6 +119,17 @@ class ScriptController {
>     Deprecated::ScriptValue evaluate(const ScriptSourceCode&);
>     Deprecated::ScriptValue evaluateInWorld(const ScriptSourceCode&, DOMWrapperWorld&);
> 
>+    void loadModuleInWorld(ModuleGraph&, const String& moduleName, DOMWrapperWorld&);
>+    void loadModule(ModuleGraph&, const String& moduleName);
>+    void loadModuleInWorld(ModuleGraph&, const ScriptSourceCode&, DOMWrapperWorld&);
>+    void loadModule(ModuleGraph&, const ScriptSourceCode&);
>+
>+    void linkAndEvaluateModuleInWorld(ModuleGraph& , DOMWrapperWorld&);
>+    void linkAndEvaluateModule(ModuleGraph&);
>+
>+    Deprecated::ScriptValue evaluateModule(const URL&, JSC::JSModuleRecord*, DOMWrapperWorld&);
>+    Deprecated::ScriptValue evaluateModule(const URL&, JSC::JSModuleRecord*);
>+
>     WTF::TextPosition eventHandlerPosition() const;
> 
>     void enableEval();
>@@ -135,6 +150,8 @@ class ScriptController {
> 
>     const String* sourceURL() const { return m_sourceURL; } // 0 if we are not evaluating any script
> 
>+    const JSC::PrivateName& moduleLoaderAlreadyReportedErrorSymbol() const { return m_moduleLoaderAlreadyReportedErrorSymbol; }
>+
>     void clearWindowShell(DOMWindow* newDOMWindow, bool goingIntoPageCache);
>     void updateDocument();
> 
>@@ -170,6 +187,7 @@ class ScriptController {
> 
> private:
>     WEBCORE_EXPORT JSDOMWindowShell* initScript(DOMWrapperWorld&);
>+    void initModuleGraph(ModuleGraph&, JSC::JSInternalPromise*, DOMWrapperWorld&);
> 
>     void disconnectPlatformScriptObjects();
> 
>@@ -178,6 +196,7 @@ class ScriptController {
>     const String* m_sourceURL;
> 
>     bool m_paused;
>+    JSC::PrivateName m_moduleLoaderAlreadyReportedErrorSymbol;
> 
>     // The root object used for objects bound outside the context of a plugin, such
>     // as NPAPI plugins. The plugins using these objects prevent a page from being cached so they
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index 21793c22f053fb7b0656817cfc7dab3184ae8bd4..3861fe853b0eb926ad5c709c3393d96e6455ebde 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -102,6 +102,7 @@
> #include "MediaProducer.h"
> #include "MediaQueryList.h"
> #include "MediaQueryMatcher.h"
>+#include "ModuleLoader.h"
> #include "MouseEventWithHitTestResults.h"
> #include "NameNodeList.h"
> #include "NestingLevelIncrementer.h"
>@@ -461,6 +462,7 @@ Document::Document(Frame* frame, const URL& url, unsigned documentClasses, unsig
>     , m_startTime(std::chrono::steady_clock::now())
>     , m_overMinimumLayoutThreshold(false)
>     , m_scriptRunner(std::make_unique<ScriptRunner>(*this))
>+    , m_moduleLoader(std::make_unique<ModuleLoader>(*this))
>     , m_xmlVersion(ASCIILiteral("1.0"))
>     , m_xmlStandalone(StandaloneUnspecified)
>     , m_hasXMLDeclaration(false)
>@@ -602,6 +604,7 @@ Document::~Document()
>         m_domWindow->resetUnlessSuspendedForPageCache();
> 
>     m_scriptRunner = nullptr;
>+    m_moduleLoader = nullptr;
> 
>     removeAllEventListeners();
> 
>diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
>index 74ceaa96bc92f47817cebb5f3cf9390a19a77d69..f57c4131fdce55cccd4e6080dbb51953c4b27c3d 100644
>--- a/Source/WebCore/dom/Document.h
>+++ b/Source/WebCore/dom/Document.h
>@@ -128,6 +128,7 @@ class MediaPlaybackTarget;
> class MediaPlaybackTargetClient;
> class MediaQueryList;
> class MediaQueryMatcher;
>+class ModuleLoader;
> class MouseEventWithHitTestResults;
> class NamedFlowCollection;
> class NodeFilter;
>@@ -927,6 +928,7 @@ class Document : public ContainerNode, public TreeScope, public ScriptExecutionC
>     Document& topDocument() const;
>     
>     ScriptRunner* scriptRunner() { return m_scriptRunner.get(); }
>+    ModuleLoader* moduleLoader() { return m_moduleLoader.get(); }
> 
>     HTMLScriptElement* currentScript() const { return !m_currentScriptStack.isEmpty() ? m_currentScriptStack.last().get() : 0; }
>     void pushCurrentScript(PassRefPtr<HTMLScriptElement>);
>@@ -1510,6 +1512,7 @@ class Document : public ContainerNode, public TreeScope, public ScriptExecutionC
>     bool m_overMinimumLayoutThreshold;
>     
>     std::unique_ptr<ScriptRunner> m_scriptRunner;
>+    std::unique_ptr<ModuleLoader> m_moduleLoader;
> 
>     Vector<RefPtr<HTMLScriptElement>> m_currentScriptStack;
> 
>diff --git a/Source/WebCore/dom/ModuleGraph.cpp b/Source/WebCore/dom/ModuleGraph.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..4417a2cd4e8b1e46b050213b3059613c7726ae87
>--- /dev/null
>+++ b/Source/WebCore/dom/ModuleGraph.cpp
>@@ -0,0 +1,85 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "ModuleGraph.h"
>+
>+#include "DOMWrapperWorld.h"
>+#include "Document.h"
>+#include "Element.h"
>+#include "ExceptionCode.h"
>+#include "Frame.h"
>+#include "ModuleLoader.h"
>+#include "ScriptController.h"
>+#include "ScriptElement.h"
>+#include "ScriptRunner.h"
>+#include "ScriptSourceCode.h"
>+
>+namespace WebCore {
>+
>+ModuleGraph::ModuleGraph(Element& element)
>+    : m_element(element)
>+    , m_weakPtrFactory(&element)
>+{
>+}
>+
>+void ModuleGraph::notifyLoaded(UniquedStringImpl* moduleKey)
>+{
>+    m_moduleKey = moduleKey;
>+    m_element.document().scriptRunner()->notifyModuleGraphReady(toScriptElementIfPossible(&m_element));
>+}
>+
>+void ModuleGraph::notifyErrored()
>+{
>+    m_errored = true;
>+    m_element.document().scriptRunner()->notifyModuleGraphReady(toScriptElementIfPossible(&m_element));
>+}
>+
>+void ModuleGraph::evaluate()
>+{
>+    if (m_errored)
>+        toScriptElementIfPossible(&m_element)->dispatchErrorEvent();
>+    else if (Frame* frame = m_element.document().frame())
>+        frame->script().linkAndEvaluateModule(*this);
>+}
>+
>+void ModuleGraph::notifyEvaluated()
>+{
>+    toScriptElementIfPossible(&m_element)->dispatchLoadEvent();
>+}
>+
>+void ModuleGraph::load(const String& moduleName)
>+{
>+    ASSERT(m_element.document().frame());
>+    m_element.document().frame()->script().loadModule(*this, moduleName);
>+}
>+
>+void ModuleGraph::load(const ScriptSourceCode& sourceCode)
>+{
>+    ASSERT(m_element.document().frame());
>+    m_element.document().frame()->script().loadModule(*this, sourceCode);
>+}
>+
>+}
>diff --git a/Source/WebCore/dom/ModuleGraph.h b/Source/WebCore/dom/ModuleGraph.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..c16e897cbc0281e5ef158180dcae9bf62b66a0e8
>--- /dev/null
>+++ b/Source/WebCore/dom/ModuleGraph.h
>@@ -0,0 +1,75 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef ModuleGraph_h
>+#define ModuleGraph_h
>+
>+#include "ModuleFetcher.h"
>+#include <runtime/JSInternalPromise.h>
>+#include <wtf/Noncopyable.h>
>+#include <wtf/WeakPtr.h>
>+
>+namespace WebCore {
>+
>+class Element;
>+class ScriptSourceCode;
>+
>+// Keep lifetime of a ModuleGraph the same to a ScriptElement.
>+class ModuleGraph {
>+    WTF_MAKE_NONCOPYABLE(ModuleGraph); WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    explicit ModuleGraph(Element&);
>+
>+    Element& element() { return m_element; }
>+    UniquedStringImpl* moduleKey() { return m_moduleKey.get(); }
>+
>+    void load(const String& moduleName);
>+    void load(const ScriptSourceCode&);
>+    void evaluate();
>+
>+    WeakPtr<Element> weakElementPtr()
>+    {
>+        return m_weakPtrFactory.createWeakPtr();
>+    }
>+
>+    void notifyLoaded(UniquedStringImpl* moduleKey);
>+    void notifyErrored();
>+
>+    void notifyEvaluated();
>+
>+    bool errorOccurred() const { return m_errored; }
>+    bool isLoaded() const { return m_moduleKey; }
>+
>+private:
>+
>+    Element& m_element;
>+    RefPtr<UniquedStringImpl> m_moduleKey;
>+    WeakPtrFactory<Element> m_weakPtrFactory;
>+    bool m_errored { false };
>+};
>+
>+} // namespace WebCore
>+
>+#endif // ModuleLoader_h
>diff --git a/Source/WebCore/dom/PendingModuleGraph.cpp b/Source/WebCore/dom/PendingModuleGraph.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..7f8ef23fc9953da19f34f32104e70070d7214d2c
>--- /dev/null
>+++ b/Source/WebCore/dom/PendingModuleGraph.cpp
>@@ -0,0 +1,54 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "PendingModuleGraph.h"
>+
>+#include "Element.h"
>+
>+namespace WebCore {
>+
>+PendingModuleGraph::PendingModuleGraph()
>+{
>+}
>+
>+PendingModuleGraph::PendingModuleGraph(Element* element)
>+    : m_element(element)
>+{
>+}
>+
>+PendingModuleGraph::~PendingModuleGraph()
>+{
>+}
>+
>+RefPtr<Element> PendingModuleGraph::releaseElementAndClear()
>+{
>+    RefPtr<Element> element;
>+    swap(element, m_element);
>+    return element;
>+}
>+
>+
>+}
>diff --git a/Source/WebCore/dom/PendingModuleGraph.h b/Source/WebCore/dom/PendingModuleGraph.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..51421d8b93e68650e73dfafa7a083a6f80a11dc7
>--- /dev/null
>+++ b/Source/WebCore/dom/PendingModuleGraph.h
>@@ -0,0 +1,50 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef PendingModuleGraph_h
>+#define PendingModuleGraph_h
>+
>+#include <wtf/RefPtr.h>
>+
>+namespace WebCore {
>+
>+class Element;
>+
>+class PendingModuleGraph {
>+public:
>+    PendingModuleGraph();
>+    PendingModuleGraph(Element*);
>+    // Not to include Element.h, we declare the destructor, but the implementation becomes empty.
>+    ~PendingModuleGraph();
>+
>+    RefPtr<Element> releaseElementAndClear();
>+private:
>+    // Only hold an element since an element keeps a module graph.
>+    RefPtr<Element> m_element;
>+};
>+
>+}
>+
>+#endif
>diff --git a/Source/WebCore/dom/ScriptElement.cpp b/Source/WebCore/dom/ScriptElement.cpp
>index 66bbece1d35e1a4763bf9ebebf0f0c12cdbef1d7..2ec6bde9db2f7d72650035a9b12dbc685b67362f 100644
>--- a/Source/WebCore/dom/ScriptElement.cpp
>+++ b/Source/WebCore/dom/ScriptElement.cpp
>@@ -37,6 +37,7 @@
> #include "HTMLParserIdioms.h"
> #include "IgnoreDestructiveWriteCountIncrementer.h"
> #include "MIMETypeRegistry.h"
>+#include "ModuleGraph.h"
> #include "Page.h"
> #include "SVGNames.h"
> #include "SVGScriptElement.h"
>@@ -161,6 +162,10 @@ bool ScriptElement::isScriptTypeSupported(LegacyTypeSupport supportLegacyTypes)
>             return true;
>     } else if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(type.stripWhiteSpace().lower()) || (supportLegacyTypes == AllowLegacyTypeInTypeAttribute && isLegacySupportedJavaScriptLanguage(type)))
>         return true;
>+#if ENABLE(ES6_MODULES)
>+    else if (type == "module")
>+        return true;
>+#endif
>     return false;
> }
> 
>@@ -217,6 +222,9 @@ bool ScriptElement::prepareScript(const TextPosition& scriptStartPosition, Legac
>     else
>         m_characterEncoding = document.charset();
> 
>+    if (isModuleType())
>+        return loadModule(scriptStartPosition);
>+
>     if (hasSourceAttribute())
>         if (!requestScript(sourceAttributeValue()))
>             return false;
>@@ -317,6 +325,9 @@ void ScriptElement::stopLoadRequest()
>             m_cachedScript->removeClient(this);
>         m_cachedScript = 0;
>     }
>+    // FIXME: The module loader should have the mechanism to stop loading.
>+    // The current loader spec does not have this. Once it is specified
>+    // we will introduce this feature.
> }
> 
> void ScriptElement::execute(CachedScript* cachedScript)
>@@ -332,6 +343,57 @@ void ScriptElement::execute(CachedScript* cachedScript)
>     cachedScript->removeClient(this);
> }
> 
>+bool ScriptElement::loadModule(const TextPosition& scriptStartPosition)
>+{
>+    // The browser module loader loads the module sources.
>+    // Since the module involves loading of the dependent modules and the dependent modules does not have corresponding script elements,
>+    // the functionality of loading modules is separated from the script element.
>+    if (hasSourceAttribute()) {
>+        String sourceUrl = sourceAttributeValue();
>+        Ref<Document> originalDocument(m_element.document());
>+        if (!m_element.dispatchBeforeLoadEvent(sourceUrl))
>+            return false;
>+
>+        // Script element may be detached and attached to a different document while executing the event listener.
>+        if (!m_element.inDocument() || &m_element.document() != originalDocument.ptr())
>+            return false;
>+
>+        if (stripLeadingAndTrailingHTMLSpaces(sourceUrl).isEmpty()) {
>+            dispatchErrorEvent();
>+            return false;
>+        }
>+
>+        // FIXME: Should support cross-origin mode in the module tag.
>+        // However we don't have the policy to apply this mode to the resources of the dependent modules.
>+        // Provided multiple module tags,
>+        //
>+        //   A: <script type="module" src="..." crossorigin="anonymous"></script>
>+        //   B: <script type="module" src="..."></script>
>+        //
>+        // 'A' has the "crossorigin" attribute. But 'B' does not have it.
>+        // However, ES6 modules allow 'A' and 'B' to load the same module and it will be cached in the
>+        // module loader. In that case, it is controversial that which "crossorigin" attribute will be
>+        // applied to the module loaded by the both. Once the spec of the module loader is fixed, we
>+        // should follow it.
>+
>+        m_isExternalScript = true;
>+        m_moduleGraph = std::make_unique<ModuleGraph>(m_element);
>+        m_element.document().scriptRunner()->queueModuleGraphForExecution(this, *m_moduleGraph);
>+        m_moduleGraph->load(sourceAttributeValue());
>+        return true;
>+    }
>+
>+    if (!m_element.document().contentSecurityPolicy()->allowInlineScript(m_element.document().url(), m_startLineNumber, m_element.isInUserAgentShadowTree()))
>+        return true;
>+
>+    // Reset line numbering for nested writes.
>+    TextPosition position = m_element.document().isInDocumentWrite() ? TextPosition() : scriptStartPosition;
>+    m_moduleGraph = std::make_unique<ModuleGraph>(m_element);
>+    m_element.document().scriptRunner()->queueModuleGraphForExecution(this, *m_moduleGraph);
>+    m_moduleGraph->load(ScriptSourceCode(scriptContent(), m_element.document().url(), position));
>+    return true;
>+}
>+
> void ScriptElement::notifyFinished(CachedResource* resource)
> {
>     ASSERT(!m_willBeParserExecuted);
>diff --git a/Source/WebCore/dom/ScriptElement.h b/Source/WebCore/dom/ScriptElement.h
>index b7e73d0dee83d324e872f7bc4c1b933dc96c112a..6e5c214294d81968c86e0d07a697074394a1c9b2 100644
>--- a/Source/WebCore/dom/ScriptElement.h
>+++ b/Source/WebCore/dom/ScriptElement.h
>@@ -31,6 +31,7 @@ namespace WebCore {
> class CachedScript;
> class ContainerNode;
> class Element;
>+class ModuleGraph;
> class ScriptElement;
> class ScriptSourceCode;
> 
>@@ -59,6 +60,7 @@ class ScriptElement : private CachedResourceClient {
>     bool readyToBeParserExecuted() const { return m_readyToBeParserExecuted; }
>     bool willExecuteWhenDocumentFinishedParsing() const { return m_willExecuteWhenDocumentFinishedParsing; }
>     CachedResourceHandle<CachedScript> cachedScript() { return m_cachedScript; }
>+    ModuleGraph* moduleGraph() { return m_moduleGraph.get(); }
> 
> protected:
>     ScriptElement(Element&, bool createdByParser, bool isEvaluated);
>@@ -82,6 +84,8 @@ class ScriptElement : private CachedResourceClient {
>     bool requestScript(const String& sourceUrl);
>     void stopLoadRequest();
> 
>+    bool loadModule(const TextPosition& scriptStartPosition);
>+
>     virtual void notifyFinished(CachedResource*) override;
> 
>     virtual String sourceAttributeValue() const = 0;
>@@ -93,6 +97,7 @@ class ScriptElement : private CachedResourceClient {
>     virtual bool asyncAttributeValue() const = 0;
>     virtual bool deferAttributeValue() const = 0;
>     virtual bool hasSourceAttribute() const = 0;
>+    virtual bool isModuleType() const = 0;
> 
>     Element& m_element;
>     CachedResourceHandle<CachedScript> m_cachedScript;
>@@ -109,6 +114,7 @@ class ScriptElement : private CachedResourceClient {
>     bool m_requestUsesAccessControl : 1;
>     String m_characterEncoding;
>     String m_fallbackCharacterEncoding;
>+    std::unique_ptr<ModuleGraph> m_moduleGraph;
> };
> 
> ScriptElement* toScriptElementIfPossible(Element*);
>diff --git a/Source/WebCore/dom/ScriptRunner.cpp b/Source/WebCore/dom/ScriptRunner.cpp
>index 96369804ad8f074bd736afbfb502a45fc9157601..47519bf0262554b23e439778a1268e6e47dba35e 100644
>--- a/Source/WebCore/dom/ScriptRunner.cpp
>+++ b/Source/WebCore/dom/ScriptRunner.cpp
>@@ -29,6 +29,8 @@
> #include "CachedScript.h"
> #include "Element.h"
> #include "MicroTask.h"
>+#include "ModuleGraph.h"
>+#include "PendingModuleGraph.h"
> #include "PendingScript.h"
> #include "ScriptElement.h"
> 
>@@ -48,6 +50,10 @@ ScriptRunner::~ScriptRunner()
>         m_document.decrementLoadEventDelayCount();
>     for (unsigned i = 0; i < m_pendingAsyncScripts.size(); ++i)
>         m_document.decrementLoadEventDelayCount();
>+    for (size_t i = 0; i < m_moduleGraphsToExecuteSoon.size(); ++i)
>+        m_document.decrementLoadEventDelayCount();
>+    for (unsigned i = 0; i < m_pendingModuleScriptElement.size(); ++i)
>+        m_document.decrementLoadEventDelayCount();
> }
> 
> void ScriptRunner::queueScriptForExecution(ScriptElement* scriptElement, CachedResourceHandle<CachedScript> cachedScript, ExecutionType executionType)
>@@ -71,6 +77,18 @@ void ScriptRunner::queueScriptForExecution(ScriptElement* scriptElement, CachedR
>     }
> }
> 
>+void ScriptRunner::queueModuleGraphForExecution(ScriptElement* scriptElement, ModuleGraph&)
>+{
>+    ASSERT(scriptElement);
>+
>+    Element& element = scriptElement->element();
>+    ASSERT(element.inDocument());
>+
>+    m_document.incrementLoadEventDelayCount();
>+
>+    m_pendingModuleScriptElement.add(&element);
>+}
>+
> void ScriptRunner::suspend()
> {
>     m_timer.stop();
>@@ -97,6 +115,26 @@ void ScriptRunner::notifyScriptReady(ScriptElement* scriptElement, ExecutionType
>     m_timer.startOneShot(0);
> }
> 
>+void ScriptRunner::notifyModuleGraphReady(ScriptElement* scriptElement)
>+{
>+    ASSERT_UNUSED(scriptElement, m_pendingModuleScriptElement.contains(&scriptElement->element()));
>+
>+    // ListHashSet correctly preserves the insertion order.
>+    // And it allow us to remove element during iteration.
>+    auto iterator = m_pendingModuleScriptElement.begin();
>+    while (iterator != m_pendingModuleScriptElement.end()) {
>+        ModuleGraph* moduleGraph = toScriptElementIfPossible(iterator->get())->moduleGraph();
>+        if (!moduleGraph->errorOccurred() && !moduleGraph->isLoaded())
>+            break;
>+        auto previous = iterator;
>+        ++iterator;
>+        m_moduleGraphsToExecuteSoon.append(PendingModuleGraph(previous->get()));
>+        m_pendingModuleScriptElement.remove(previous);
>+    }
>+    if (!m_moduleGraphsToExecuteSoon.isEmpty())
>+        m_timer.startOneShot(0);
>+}
>+
> void ScriptRunner::timerFired()
> {
>     Ref<Document> protect(m_document);
>@@ -121,6 +159,20 @@ void ScriptRunner::timerFired()
>         toScriptElementIfPossible(element.get())->execute(cachedScript);
>         m_document.decrementLoadEventDelayCount();
>     }
>+
>+    Vector<PendingModuleGraph> moduleGraphs;
>+    moduleGraphs.swap(m_moduleGraphsToExecuteSoon);
>+
>+    for (PendingModuleGraph& pendingModuleGraph : moduleGraphs) {
>+        RefPtr<Element> element = pendingModuleGraph.releaseElementAndClear();
>+        ASSERT(element);
>+        // Paper over https://bugs.webkit.org/show_bug.cgi?id=144050
>+        if (!element)
>+            continue;
>+        toScriptElementIfPossible(element.get())->moduleGraph()->evaluate();
>+        m_document.decrementLoadEventDelayCount();
>+    }
>+
>     MicroTaskQueue::singleton().runMicroTasks();
> }
> 
>diff --git a/Source/WebCore/dom/ScriptRunner.h b/Source/WebCore/dom/ScriptRunner.h
>index 27cdbf8b3af569462e5b9aeb16cd765050891e0d..bd2414342f08edcc47f00d4b56780b55dc58058f 100644
>--- a/Source/WebCore/dom/ScriptRunner.h
>+++ b/Source/WebCore/dom/ScriptRunner.h
>@@ -29,6 +29,7 @@
> #include "CachedResourceHandle.h"
> #include "Timer.h"
> #include <wtf/HashMap.h>
>+#include <wtf/ListHashSet.h>
> #include <wtf/Noncopyable.h>
> #include <wtf/PassRefPtr.h>
> #include <wtf/Vector.h>
>@@ -37,6 +38,9 @@ namespace WebCore {
> 
> class CachedScript;
> class Document;
>+class Element;
>+class ModuleGraph;
>+class PendingModuleGraph;
> class PendingScript;
> class ScriptElement;
> 
>@@ -48,11 +52,14 @@ class ScriptRunner {
> 
>     enum ExecutionType { ASYNC_EXECUTION, IN_ORDER_EXECUTION };
>     void queueScriptForExecution(ScriptElement*, CachedResourceHandle<CachedScript>, ExecutionType);
>-    bool hasPendingScripts() const { return !m_scriptsToExecuteSoon.isEmpty() || !m_scriptsToExecuteInOrder.isEmpty() || !m_pendingAsyncScripts.isEmpty(); }
>+    void queueModuleGraphForExecution(ScriptElement*, ModuleGraph&);
>+    bool hasPendingScripts() const { return !m_scriptsToExecuteSoon.isEmpty() || !m_scriptsToExecuteInOrder.isEmpty() || !m_pendingAsyncScripts.isEmpty() || !m_moduleGraphsToExecuteSoon.isEmpty() || !m_pendingModuleScriptElement.isEmpty(); }
>     void suspend();
>     void resume();
>     void notifyScriptReady(ScriptElement*, ExecutionType);
> 
>+    void notifyModuleGraphReady(ScriptElement*);
>+
> private:
>     void timerFired();
> 
>@@ -60,6 +67,8 @@ class ScriptRunner {
>     Vector<PendingScript> m_scriptsToExecuteInOrder;
>     Vector<PendingScript> m_scriptsToExecuteSoon; // http://www.whatwg.org/specs/web-apps/current-work/#set-of-scripts-that-will-execute-as-soon-as-possible
>     HashMap<ScriptElement*, PendingScript> m_pendingAsyncScripts;
>+    Vector<PendingModuleGraph> m_moduleGraphsToExecuteSoon;
>+    ListHashSet<RefPtr<Element>> m_pendingModuleScriptElement;
>     Timer m_timer;
> };
> 
>diff --git a/Source/WebCore/html/HTMLScriptElement.cpp b/Source/WebCore/html/HTMLScriptElement.cpp
>index e13a5cddcca2cb3b756a8d3a57e23f80a9b43e48..d15eb71be3f6bcfb10782f974875b400bc0d716c 100644
>--- a/Source/WebCore/html/HTMLScriptElement.cpp
>+++ b/Source/WebCore/html/HTMLScriptElement.cpp
>@@ -161,6 +161,15 @@ bool HTMLScriptElement::hasSourceAttribute() const
>     return fastHasAttribute(srcAttr);
> }
> 
>+bool HTMLScriptElement::isModuleType() const
>+{
>+#if ENABLE(ES6_MODULES)
>+    return fastGetAttribute(typeAttr).string() == "module";
>+#else
>+    return false;
>+#endif
>+}
>+
> void HTMLScriptElement::dispatchLoadEvent()
> {
>     ASSERT(!haveFiredLoadEvent());
>diff --git a/Source/WebCore/html/HTMLScriptElement.h b/Source/WebCore/html/HTMLScriptElement.h
>index 312c6626e8b8314e85e2df687dbf09f2b2fe37b2..1dfd8c8b73e872abcd5eb4b342e792d33503e79f 100644
>--- a/Source/WebCore/html/HTMLScriptElement.h
>+++ b/Source/WebCore/html/HTMLScriptElement.h
>@@ -62,6 +62,7 @@ class HTMLScriptElement final : public HTMLElement, public ScriptElement {
>     virtual bool asyncAttributeValue() const override;
>     virtual bool deferAttributeValue() const override;
>     virtual bool hasSourceAttribute() const override;
>+    virtual bool isModuleType() const override;
> 
>     virtual void dispatchLoadEvent() override;
> 
>diff --git a/Source/WebCore/svg/SVGScriptElement.cpp b/Source/WebCore/svg/SVGScriptElement.cpp
>index 8adfcfa410abe47e3324ae5b8d9243f566645d95..ba5f06f44b6b117fcbb6233538e2e14cd7f8e69f 100644
>--- a/Source/WebCore/svg/SVGScriptElement.cpp
>+++ b/Source/WebCore/svg/SVGScriptElement.cpp
>@@ -151,6 +151,11 @@ bool SVGScriptElement::deferAttributeValue() const
>     return false;
> }
> 
>+bool SVGScriptElement::isModuleType() const
>+{
>+    return false;
>+}
>+
> bool SVGScriptElement::hasSourceAttribute() const
> {
>     return hasAttribute(XLinkNames::hrefAttr);
>diff --git a/Source/WebCore/svg/SVGScriptElement.h b/Source/WebCore/svg/SVGScriptElement.h
>index 535e42e6f0646d8010419093c622924b383d7101..8afde31125e5dd498db82a4e0983ab074e0dcc66 100644
>--- a/Source/WebCore/svg/SVGScriptElement.h
>+++ b/Source/WebCore/svg/SVGScriptElement.h
>@@ -62,6 +62,7 @@ class SVGScriptElement final : public SVGElement
>     virtual bool asyncAttributeValue() const override;
>     virtual bool deferAttributeValue() const override;
>     virtual bool hasSourceAttribute() const override;
>+    virtual bool isModuleType() const override;
> 
>     virtual void dispatchLoadEvent() override { SVGExternalResourcesRequired::dispatchLoadEvent(this); }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 0f4e8c9014c916f5a39349767e014eb50da01a21..03919e6332fd4216177c06d427258105e9287a3c 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,22 @@
>+2015-09-23  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!).
>+
>+        * js/dom/module-inline-simple-expected.txt: Added.
>+        * js/dom/module-inline-simple.html: Added.
>+        * js/dom/module-src-simple-expected.txt: Added.
>+        * js/dom/module-src-simple.html: Added.
>+        * js/dom/script-tests/module-inline-simple.js: Added.
>+        (export.default.Cocoa.prototype.taste):
>+        (export.default.Cocoa):
>+        * js/dom/script-tests/module-src-simple-cocoa.js: Added.
>+        (Cocoa.prototype.taste):
>+        (Cocoa):
>+        * js/dom/script-tests/module-src-simple.js: Added.
>+
> 2015-09-18  Antti Koivisto  <antti@apple.com>
> 
>         Don't create renderers for children of shadow host
>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..09a962378d204dc599798b83c1270bc1ac15b92c
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-inline-simple.html
>@@ -0,0 +1,30 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test inlined module.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+</script>
>+<script 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>
>+<script>
>+debug('Module is not executed yet.');
>+</script>
>+<script src="../../resources/js-test-post.js"></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..4b3522ff43cba7e810c40edf75859d641d842893
>--- /dev/null
>+++ b/LayoutTests/js/dom/module-src-simple.html
>@@ -0,0 +1,19 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+description('Test module with "src" attribute.');
>+
>+// Module will be executed asynchronously.
>+window.jsTestIsAsync = true;
>+</script>
>+<script type="module" src="./script-tests/module-src-simple.js"></script>
>+<script>
>+debug('Module is not executed yet.');
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+</body>
>+</html>
>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-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();

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