Attachment 261547 Details for Bug 148897 – Patch

[patch] Patch

bug-148897-20150918173635.patch (text/plain), 70.03 KB, created by Yusuke Suzuki on 2015-09-18 17:36:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2015-09-18 17:36:49 PDT

Size: 70.03 KB

patch

obsolete

>Subversion Revision: 189986
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 6059c172d5a947a79864baefcc6ee9bbab08dba5..e1d528d7e853557ab4b25784f7b4f9156e4510b2 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2015-09-18  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>
> 
>         Implement type conversion instructions in WebAssembly
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 581b8fef1db983b8c99cf4a6b76f097cef49b671..2d590bd798e56bd119ce60dae52c6708e1ec99c1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,85 @@
>+2015-09-18  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!).
>+
>+        No new tests (OOPS!).
>+
>+        * ForwardingHeaders/runtime/JSInternalPromise.h: Added.
>+        * ForwardingHeaders/runtime/JSInternalPromiseDeferred.h: Added.
>+        * ForwardingHeaders/runtime/JSModuleRecord.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/ScriptController.cpp:
>+        (WebCore::ScriptController::ScriptController):
>+        (WebCore::ScriptController::evaluate):
>+        (WebCore::ScriptController::createModuleLoaderAsynchronousErrorReportFunction):
>+        (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/ModuleFetcher.cpp: Added.
>+        (WebCore::ModuleFetcher::ModuleFetcher):
>+        (WebCore::ModuleFetcher::create):
>+        (WebCore::ModuleFetcher::run):
>+        (WebCore::ModuleFetcher::notifyFinished):
>+        * dom/ModuleFetcher.h: Added.
>+        (WebCore::ModuleFetcher::moduleKey):
>+        (WebCore::ModuleFetcher::cachedScript):
>+        * dom/ModuleGraph.cpp: Added.
>+        (WebCore::ModuleGraph::ModuleGraph):
>+        (WebCore::ModuleGraph::notifyLoaded):
>+        (WebCore::ModuleGraph::notifyErrored):
>+        (WebCore::ModuleGraph::notifyExecuted):
>+        (WebCore::ModuleGraph::evaluate):
>+        (WebCore::ModuleGraph::create):
>+        * dom/ModuleGraph.h: Copied from Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h.
>+        (WebCore::ModuleGraph::element):
>+        (WebCore::ModuleGraph::moduleKey):
>+        (WebCore::ModuleGraph::weakPtr):
>+        * dom/ModuleLoader.cpp: Added.
>+        (WebCore::ModuleLoader::ModuleLoader):
>+        (WebCore::ModuleLoader::resolve):
>+        (WebCore::ModuleLoader::fetch):
>+        (WebCore::ModuleLoader::evaluate):
>+        (WebCore::ModuleLoader::notifyFinished):
>+        (WebCore::ModuleLoader::notifyModuleGraphReady):
>+        (WebCore::ModuleLoader::timerFired):
>+        * dom/ModuleLoader.h: Added.
>+        (WebCore::ModuleLoader::document):
>+        (WebCore::ModuleLoader::PendingModuleGraph::clear):
>+        * dom/ScriptElement.cpp:
>+        (WebCore::ScriptElement::isScriptTypeSupported):
>+        (WebCore::ScriptElement::prepareScript):
>+        (WebCore::ScriptElement::stopLoadRequest):
>+        (WebCore::ScriptElement::loadModule):
>+        * dom/ScriptElement.h:
>+        * html/HTMLScriptElement.cpp:
>+        (WebCore::HTMLScriptElement::isModuleType):
>+        * html/HTMLScriptElement.h:
>+        * svg/SVGScriptElement.cpp:
>+        (WebCore::SVGScriptElement::isModuleType):
>+        * svg/SVGScriptElement.h:
>+
> 2015-09-18  Alex Christensen  <achristensen@webkit.org>
> 
>         [Win] Fix bindings tests after r189934.
>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/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/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 784b03223a6282c431f41452c9583497ef2a9a3f..21896e271a43e95677592c46d0603c70cea61979 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -6319,6 +6319,12 @@
> 		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, ); }; };
>+		E3B10FA21BA004BC0093DE3A /* ModuleLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3B10FA01BA004BC0093DE3A /* ModuleLoader.cpp */; };
>+		E3B10FA31BA004BC0093DE3A /* ModuleLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E3B10FA11BA004BC0093DE3A /* ModuleLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		E3B10FA61BA0F29C0093DE3A /* ModuleFetcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3B10FA41BA0F29C0093DE3A /* ModuleFetcher.cpp */; };
>+		E3B10FA71BA0F29C0093DE3A /* ModuleFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E3B10FA51BA0F29C0093DE3A /* ModuleFetcher.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		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 */; };
>@@ -14070,6 +14076,12 @@
> 		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>"; };
>+		E3B10FA01BA004BC0093DE3A /* ModuleLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleLoader.cpp; sourceTree = "<group>"; };
>+		E3B10FA11BA004BC0093DE3A /* ModuleLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleLoader.h; sourceTree = "<group>"; };
>+		E3B10FA41BA0F29C0093DE3A /* ModuleFetcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleFetcher.cpp; sourceTree = "<group>"; };
>+		E3B10FA51BA0F29C0093DE3A /* ModuleFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleFetcher.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>"; };
>@@ -23478,6 +23490,12 @@
> 				41BF700A0FE86F49005E8DEC /* MessagePortChannel.h */,
> 				CB8CF0151A934B43000D510B /* MicroTask.cpp */,
> 				53B895AD19DC7C37009CAA93 /* MicroTask.h */,
>+				E3B10FA41BA0F29C0093DE3A /* ModuleFetcher.cpp */,
>+				E3B10FA51BA0F29C0093DE3A /* ModuleFetcher.h */,
>+				E339A5211BA6BD4600A3A7AE /* ModuleGraph.cpp */,
>+				E339A5221BA6BD4600A3A7AE /* ModuleGraph.h */,
>+				E3B10FA01BA004BC0093DE3A /* ModuleLoader.cpp */,
>+				E3B10FA11BA004BC0093DE3A /* ModuleLoader.h */,
> 				85031B2F0A44EFC700F992E0 /* MouseEvent.cpp */,
> 				85031B300A44EFC700F992E0 /* MouseEvent.h */,
> 				141B94E509EC4223000E9413 /* MouseEvent.idl */,
>@@ -24367,6 +24385,7 @@
> 				065AD4F50B0C2EDA005A2B1D /* ContextMenuClient.h in Headers */,
> 				5106D7BE18BDB76F000AB166 /* ContextMenuContext.h in Headers */,
> 				065AD4F70B0C2EDA005A2B1D /* ContextMenuController.h in Headers */,
>+				E3B10FA31BA004BC0093DE3A /* ModuleLoader.h in Headers */,
> 				06027CAD0B1CBFC000884B2D /* ContextMenuItem.h in Headers */,
> 				7ADE722610CBBB9B006B3B3A /* ContextMenuProvider.h in Headers */,
> 				2D5002FC1B56D7990020AAF7 /* PathUtilities.h in Headers */,
>@@ -24593,6 +24612,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 */,
>@@ -26834,6 +26854,7 @@
> 				2D93AEE319DF5641002A86C3 /* ServicesOverlayController.h in Headers */,
> 				756B2CE118B7101600FECFAA /* SessionID.h in Headers */,
> 				93309E10099E64920056E581 /* SetNodeAttributeCommand.h in Headers */,
>+				E3B10FA71BA0F29C0093DE3A /* ModuleFetcher.h in Headers */,
> 				B8DBDB4C130B0F8A00F5CDB1 /* SetSelectionCommand.h in Headers */,
> 				93F1994F08245E59001E9ABC /* Settings.h in Headers */,
> 				53EF766B16530A61004CBE49 /* SettingsMacros.h in Headers */,
>@@ -27979,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 */,
>@@ -28900,6 +28922,14 @@
> 				51E1ECC00C91C90400DC255B /* IconRecord.cpp in Sources */,
> 				51D719B9181106E00016DC51 /* IDBAny.cpp in Sources */,
> 				C585A66211D4FAC5004C3E4B /* IDBBindingUtilities.cpp in Sources */,
>+				51D719BF181106E00016DC51 /* IDBCursor.cpp in Sources */,
>+				516730A3182D8FBB003FAF5C /* IDBCursorBackend.cpp in Sources */,
>+				E3B10FA61BA0F29C0093DE3A /* ModuleFetcher.cpp in Sources */,
>+				510194441836F7E400925523 /* IDBCursorBackendOperations.cpp in Sources */,
>+				51D719C3181106E00016DC51 /* IDBCursorWithValue.cpp in Sources */,
>+				51D719C6181106E00016DC51 /* IDBDatabase.cpp in Sources */,
>+				51771C8E182DB4B7008E781E /* IDBDatabaseBackend.cpp in Sources */,
>+				51D719CB181106E00016DC51 /* IDBDatabaseCallbacksImpl.cpp in Sources */,
> 				51D719CE181106E00016DC51 /* IDBDatabaseException.cpp in Sources */,
> 				5163117D1851242B00534647 /* IDBDatabaseMetadata.cpp in Sources */,
> 				51D719D0181106E00016DC51 /* IDBEventDispatcher.cpp in Sources */,
>@@ -29802,6 +29832,7 @@
> 				D3A94A38122DABAC00A37BBC /* MediaQueryList.cpp in Sources */,
> 				D3AA10F3123A98AA0092152B /* MediaQueryMatcher.cpp in Sources */,
> 				C90843CF1B18E47D00B68564 /* MediaRemoteControls.cpp in Sources */,
>+				E3B10FA21BA004BC0093DE3A /* ModuleLoader.cpp in Sources */,
> 				CEEFCD7919DB31F7003876D7 /* MediaResourceLoader.cpp in Sources */,
> 				CDBEAEAC19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm in Sources */,
> 				C9027F411B1D0AD200BFBFEF /* MediaSession.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/ScriptController.cpp b/Source/WebCore/bindings/js/ScriptController.cpp
>index 4b3b0972be77f3c76595f140e26a748ff8ea450c..cab78a29a00525d4e03a7198a6109c63ea22e382 100644
>--- a/Source/WebCore/bindings/js/ScriptController.cpp
>+++ b/Source/WebCore/bindings/js/ScriptController.cpp
>@@ -36,6 +36,7 @@
> #include "JSMainThreadExecState.h"
> #include "MainFrame.h"
> #include "MemoryPressureHandler.h"
>+#include "ModuleGraph.h"
> #include "NP_jsobject.h"
> #include "Page.h"
> #include "PageConsoleClient.h"
>@@ -54,7 +55,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 +91,7 @@ ScriptController::ScriptController(Frame& frame)
>     : m_frame(frame)
>     , m_sourceURL(0)
>     , m_paused(false)
>+    , m_moduleLoaderAlreadyReportedErrorSymbol()
> #if ENABLE(NETSCAPE_PLUGIN_API)
>     , m_windowScriptNPObject(0)
> #endif
>@@ -175,11 +181,134 @@ 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());
> }
> 
>+JSFunction* ScriptController::createModuleLoaderAsynchronousErrorReportFunction(ModuleGraph& moduleGraph, DOMWrapperWorld& world)
>+{
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    WeakPtr<ModuleGraph> weakPtr(moduleGraph.weakPtr());
>+    PrivateName moduleLoaderAlreadyReportedErrorSymbol = m_moduleLoaderAlreadyReportedErrorSymbol;
>+    return JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [moduleLoaderAlreadyReportedErrorSymbol, weakPtr](ExecState* exec) {
>+        JSValue error = exec->argument(0);
>+
>+        if (RefPtr<ModuleGraph> moduleGraph = weakPtr.get())
>+            moduleGraph->notifyErrored();
>+
>+        // Once reported error is marked as moduleLoaderAlreadyReportedErrorSymbol.
>+        // Don't report it here again.
>+        if (Symbol* symbol = jsDynamicCast<Symbol*>(error)) {
>+            if (symbol->privateName() == moduleLoaderAlreadyReportedErrorSymbol)
>+                return JSValue::encode(jsUndefined());
>+        }
>+
>+        // 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);
>+
>+        return JSValue::encode(jsUndefined());
>+    });
>+}
>+
>+JSInternalPromise* ScriptController::loadModuleInWorld(ModuleGraph& moduleGraph, const String& moduleName, DOMWrapperWorld& world)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    return initModuleGraph(moduleGraph, JSMainThreadExecState::loadModule(exec, moduleName), world);
>+}
>+
>+JSInternalPromise* ScriptController::loadModule(ModuleGraph& moduleGraph, const String& moduleName)
>+{
>+    return loadModuleInWorld(moduleGraph, moduleName, mainThreadNormalWorld());
>+}
>+
>+JSInternalPromise* ScriptController::loadModuleInWorld(ModuleGraph& moduleGraph, const ScriptSourceCode& sourceCode, DOMWrapperWorld& world)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    return initModuleGraph(moduleGraph, JSMainThreadExecState::loadModule(exec, sourceCode.jsSourceCode()), world);
>+}
>+
>+JSInternalPromise* ScriptController::loadModule(ModuleGraph& moduleGraph, const ScriptSourceCode& sourceCode)
>+{
>+    return loadModuleInWorld(moduleGraph, sourceCode, mainThreadNormalWorld());
>+}
>+
>+JSInternalPromise* ScriptController::linkAndEvaluateModuleInWorld(ModuleGraph& moduleGraph, DOMWrapperWorld& world)
>+{
>+    JSLockHolder lock(world.vm());
>+
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    JSInternalPromise* promise = JSMainThreadExecState::linkAndEvaluateModule(exec, moduleGraph.moduleKey());
>+
>+    WeakPtr<ModuleGraph> weakPtr(moduleGraph.weakPtr());
>+    JSFunction* fulfillHandler = JSNativeStdFunction::create(exec->vm(), shell->window(), 1, String(), [weakPtr](ExecState*) {
>+        if (RefPtr<ModuleGraph> moduleGraph = weakPtr.get())
>+            moduleGraph->notifyExecuted();
>+        return JSValue::encode(jsUndefined());
>+    });
>+
>+    return promise->then(exec, fulfillHandler, createModuleLoaderAsynchronousErrorReportFunction(moduleGraph, world));
>+}
>+
>+JSInternalPromise* ScriptController::linkAndEvaluateModule(ModuleGraph& moduleGraph)
>+{
>+    return 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 +401,30 @@ 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));
>+}
>+
>+JSInternalPromise* ScriptController::initModuleGraph(ModuleGraph& moduleGraph, JSInternalPromise* promise, DOMWrapperWorld& world)
>+{
>+    JSDOMWindowShell* shell = windowShell(world);
>+    ExecState* exec = shell->window()->globalExec();
>+
>+    WeakPtr<ModuleGraph> weakPtr(moduleGraph.weakPtr());
>+    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<ModuleGraph> moduleGraph = weakPtr.get())
>+            moduleGraph->notifyLoaded(jsValueToModuleKey(exec, exec->argument(0)));
>+        return JSValue::encode(jsUndefined());
>+    });
>+    return promise->then(exec, fulfillHandler, createModuleLoaderAsynchronousErrorReportFunction(moduleGraph, world));
>+}
>+
> 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..4839c11d0ddd4b14828dae35564f1609e88c40f4 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 JSInternalPromise;
>+    class JSModuleRecord;
>+
>     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&);
> 
>+    JSC::JSInternalPromise* loadModuleInWorld(ModuleGraph&, const String& moduleName, DOMWrapperWorld&);
>+    JSC::JSInternalPromise* loadModule(ModuleGraph&, const String& moduleName);
>+    JSC::JSInternalPromise* loadModuleInWorld(ModuleGraph&, const ScriptSourceCode&, DOMWrapperWorld&);
>+    JSC::JSInternalPromise* loadModule(ModuleGraph&, const ScriptSourceCode&);
>+
>+    JSC::JSInternalPromise* linkAndEvaluateModuleInWorld(ModuleGraph& , DOMWrapperWorld&);
>+    JSC::JSInternalPromise* 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,8 @@ class ScriptController {
> 
> private:
>     WEBCORE_EXPORT JSDOMWindowShell* initScript(DOMWrapperWorld&);
>+    JSC::JSInternalPromise* initModuleGraph(ModuleGraph&, JSC::JSInternalPromise*, DOMWrapperWorld&);
>+    JSC::JSFunction* createModuleLoaderAsynchronousErrorReportFunction(ModuleGraph&, DOMWrapperWorld&);
> 
>     void disconnectPlatformScriptObjects();
> 
>@@ -178,6 +197,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/ModuleFetcher.cpp b/Source/WebCore/dom/ModuleFetcher.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..afaf6c594f77368728d7553b10d9a8e62fd9ffb0
>--- /dev/null
>+++ b/Source/WebCore/dom/ModuleFetcher.cpp
>@@ -0,0 +1,129 @@
>+/*
>+ * 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 JSC::Identifier& moduleKey, const URL& sourceURL, JSC::JSInternalPromiseDeferred* deferred, Document& document)
>+    : m_document(document)
>+    , m_moduleKey(moduleKey)
>+    , m_sourceURL(sourceURL)
>+    , m_globalObject(globalObject->vm(), globalObject)
>+    , m_deferred(globalObject->vm(), deferred)
>+{
>+}
>+
>+Ref<ModuleFetcher> ModuleFetcher::create(JSDOMGlobalObject* globalObject, const JSC::Identifier& moduleKey, const URL& sourceURL, JSC::JSInternalPromiseDeferred* deferred, Document& document)
>+{
>+    return adoptRef(*new ModuleFetcher(globalObject, moduleKey, 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) {
>+        if (Frame* frame = m_document.frame()) {
>+            JSC::JSLockHolder lock(m_globalObject->vm());
>+            JSC::ExecState* exec = m_globalObject->globalExec();
>+            m_deferred->reject(exec, JSC::Symbol::create(exec->vm(), *(frame->script().moduleLoaderAlreadyReportedErrorSymbol().uid())));
>+        }
>+        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);
>+    m_cachedScript->removeClient(this);
>+
>+#if ENABLE(NOSNIFF)
>+    if (m_cachedScript && !m_cachedScript->mimeTypeAllowedByNosniff()) {
>+        m_document.addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Refused to execute script from '" + m_cachedScript->url().stringCenterEllipsizedToLength() + "' because its MIME type ('" + m_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 (m_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 (!m_cachedScript->wasCanceled()) {
>+            ScriptSourceCode sourceCode(m_cachedScript.get());
>+            m_deferred->resolve(exec, JSC::jsString(exec, sourceCode.source()));
>+        }
>+    }
>+    m_cachedScript = nullptr;
>+
>+    m_document.moduleLoader()->notifyFinished(this);
>+    // After ModuleLoader::notifyFinished call, |this| may be destroyed.
>+}
>+
>+}
>diff --git a/Source/WebCore/dom/ModuleFetcher.h b/Source/WebCore/dom/ModuleFetcher.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..7957211ac0c012ee4e10f21d78dce52b514ab8de
>--- /dev/null
>+++ b/Source/WebCore/dom/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 JSC::Identifier& moduleKey, const URL& sourceURL, JSC::JSInternalPromiseDeferred*, Document&);
>+
>+    bool run();
>+
>+    const JSC::Identifier& moduleKey() { return m_moduleKey; }
>+    CachedScript* cachedScript() { return m_cachedScript.get(); }
>+
>+private:
>+    ModuleFetcher(JSDOMGlobalObject*, const JSC::Identifier& moduleKey, const URL& sourceURL, JSC::JSInternalPromiseDeferred*, Document&);
>+
>+    // For CachedResourceClient.
>+    virtual void notifyFinished(CachedResource*) override;
>+
>+    Document& m_document;
>+    JSC::Identifier m_moduleKey;
>+    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/dom/ModuleGraph.cpp b/Source/WebCore/dom/ModuleGraph.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..1b569879f6200db3aa6d3e807560a5c4e5c6aa0d
>--- /dev/null
>+++ b/Source/WebCore/dom/ModuleGraph.cpp
>@@ -0,0 +1,87 @@
>+/*
>+ * 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 "JSDOMBinding.h"
>+#include "ModuleLoader.h"
>+#include "ScriptController.h"
>+#include "ScriptElement.h"
>+#include "ScriptSourceCode.h"
>+#include <runtime/JSNativeStdFunction.h>
>+
>+namespace WebCore {
>+
>+ModuleGraph::ModuleGraph(Element& element)
>+    : m_element(element)
>+    , m_weakPtrFactory(this)
>+{
>+}
>+
>+void ModuleGraph::notifyLoaded(const JSC::Identifier& moduleKey)
>+{
>+    m_moduleKey = moduleKey;
>+    m_element.document().moduleLoader()->notifyModuleGraphReady(this);
>+}
>+
>+void ModuleGraph::notifyErrored()
>+{
>+    toScriptElementIfPossible(&m_element)->dispatchErrorEvent();
>+}
>+
>+void ModuleGraph::notifyExecuted()
>+{
>+    toScriptElementIfPossible(&m_element)->dispatchLoadEvent();
>+}
>+
>+void ModuleGraph::evaluate()
>+{
>+    if (Frame* frame = m_element.document().frame())
>+        frame->script().linkAndEvaluateModule(*this);
>+}
>+
>+Ref<ModuleGraph> ModuleGraph::create(Element& element, const String& moduleName)
>+{
>+    ASSERT(element.document().frame());
>+    Ref<ModuleGraph> moduleGraph = adoptRef(*new ModuleGraph(element));
>+    element.document().frame()->script().loadModule(moduleGraph, moduleName);
>+    return moduleGraph;
>+}
>+
>+Ref<ModuleGraph> ModuleGraph::create(Element& element, const ScriptSourceCode& sourceCode)
>+{
>+    ASSERT(element.document().frame());
>+    Ref<ModuleGraph> moduleGraph = adoptRef(*new ModuleGraph(element));
>+    element.document().frame()->script().loadModule(moduleGraph, sourceCode);
>+    return moduleGraph;
>+}
>+
>+}
>diff --git a/Source/WebCore/dom/ModuleGraph.h b/Source/WebCore/dom/ModuleGraph.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..22467a06e2774e6f6faeb82c7337676d962d6c9b
>--- /dev/null
>+++ b/Source/WebCore/dom/ModuleGraph.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 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;
>+
>+class ModuleGraph : public RefCounted<ModuleGraph> {
>+    WTF_MAKE_NONCOPYABLE(ModuleGraph); WTF_MAKE_FAST_ALLOCATED;
>+public:
>+    static Ref<ModuleGraph> create(Element&, const String& moduleName);
>+    static Ref<ModuleGraph> create(Element&, const ScriptSourceCode&);
>+
>+    Element& element() { return m_element; }
>+    const JSC::Identifier& moduleKey() { return m_moduleKey; }
>+
>+    void evaluate();
>+
>+    WeakPtr<ModuleGraph> weakPtr()
>+    {
>+        return m_weakPtrFactory.createWeakPtr();
>+    }
>+
>+    void notifyLoaded(const JSC::Identifier&);
>+    void notifyErrored();
>+    void notifyExecuted();
>+
>+private:
>+    explicit ModuleGraph(Element&);
>+
>+    Element& m_element;
>+    JSC::Identifier m_moduleKey;
>+    WeakPtrFactory<ModuleGraph> m_weakPtrFactory;
>+};
>+
>+} // namespace WebCore
>+
>+#endif // ModuleLoader_h
>diff --git a/Source/WebCore/dom/ModuleLoader.cpp b/Source/WebCore/dom/ModuleLoader.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..079f3e146ffbe38fd66b6305a8cb53950efbcbf8
>--- /dev/null
>+++ b/Source/WebCore/dom/ModuleLoader.cpp
>@@ -0,0 +1,150 @@
>+/*
>+ * 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>
>+
>+namespace WebCore {
>+
>+ModuleLoader::ModuleLoader(Document& document)
>+    : m_document(document)
>+    , m_timer(*this, &ModuleLoader::timerFired)
>+{
>+}
>+
>+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), moduleKey, completedURL, deferred, m_document);
>+    m_fetchingSet.add(&fetcher.get());
>+    fetcher->run();
>+
>+    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);
>+}
>+
>+void ModuleLoader::notifyModuleGraphReady(ModuleGraph* moduleGraph)
>+{
>+    m_moduleGraphsToExecute.append(PendingModuleGraph { &moduleGraph->element(), moduleGraph });
>+    m_timer.startOneShot(0);
>+}
>+
>+void ModuleLoader::timerFired()
>+{
>+    Ref<Document> protect(m_document);
>+    Vector<PendingModuleGraph> moduleGraphs;
>+    moduleGraphs.swap(m_moduleGraphsToExecute);
>+
>+    for (PendingModuleGraph& pendingModuleGraph : moduleGraphs) {
>+        pendingModuleGraph.moduleGraph->evaluate();
>+        MicroTaskQueue::singleton().runMicroTasks();
>+        pendingModuleGraph.clear();
>+    }
>+}
>+
>+}
>diff --git a/Source/WebCore/dom/ModuleLoader.h b/Source/WebCore/dom/ModuleLoader.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..718dea924d509f9b5cbd885c459c9f5d0d58c7ee
>--- /dev/null
>+++ b/Source/WebCore/dom/ModuleLoader.h
>@@ -0,0 +1,81 @@
>+/*
>+ * 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*);
>+    void notifyModuleGraphReady(ModuleGraph*);
>+
>+    void timerFired();
>+
>+    struct PendingModuleGraph {
>+        RefPtr<Element> element;
>+        RefPtr<ModuleGraph> moduleGraph;
>+
>+        void clear()
>+        {
>+            element = nullptr;
>+            moduleGraph = nullptr;
>+        }
>+    };
>+
>+private:
>+    Document& m_document;
>+    HashSet<RefPtr<ModuleFetcher>> m_fetchingSet;
>+    Vector<PendingModuleGraph> m_moduleGraphsToExecute;
>+    Timer m_timer;
>+};
>+
>+} // namespace WebCore
>+
>+#endif // ModuleLoader_h
>diff --git a/Source/WebCore/dom/ScriptElement.cpp b/Source/WebCore/dom/ScriptElement.cpp
>index 66bbece1d35e1a4763bf9ebebf0f0c12cdbef1d7..b385ebe6c6780bfa372c8d75552d294cf835b664 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,7 @@ void ScriptElement::stopLoadRequest()
>             m_cachedScript->removeClient(this);
>         m_cachedScript = 0;
>     }
>+    // FIXME: The module loader should have the mechanism to stop loading.
> }
> 
> void ScriptElement::execute(CachedScript* cachedScript)
>@@ -332,6 +341,52 @@ 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_moduleGraph = ModuleGraph::create(m_element, sourceAttributeValue());
>+        m_isExternalScript = true;
>+        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 = ModuleGraph::create(m_element, 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..74b3420309072c90d87565ff292adb080a8a9070 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;
> 
>@@ -82,6 +83,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 +96,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 +113,7 @@ class ScriptElement : private CachedResourceClient {
>     bool m_requestUsesAccessControl : 1;
>     String m_characterEncoding;
>     String m_fallbackCharacterEncoding;
>+    RefPtr<ModuleGraph> m_moduleGraph;
> };
> 
> ScriptElement* toScriptElementIfPossible(Element*);
>diff --git a/Source/WebCore/html/HTMLScriptElement.cpp b/Source/WebCore/html/HTMLScriptElement.cpp
>index e13a5cddcca2cb3b756a8d3a57e23f80a9b43e48..756779e7a50d5c4acc3dd397392510fc97ae64d8 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/Tools/ChangeLog b/Tools/ChangeLog
>index 98d4d2a5cc3182363532b085ff586848fd6dbde7..fc4a7c27b969ee13c0de3824e6b162bb9c1ea9e5 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2015-09-18  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!).
>+
>+        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h:
>+        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
>+        * WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h:
>+        * WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm:
>+
> 2015-09-18  Alexey Proskuryakov  <ap@apple.com>
> 
>         iOS WebKitTestRunner frequently crashes in WKContextGetIconDatabase
>diff --git a/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h b/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h
>index b4e13ea7ec489a89d512f4595de1004d7fbde182..bea09ca286c9de8dc433a955874ea23d803ce670 100644
>--- a/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h
>+++ b/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h
>@@ -52,10 +52,8 @@ @private
> - (void)slideDraggedImageTo:(NSPoint)screenPoint;
> - (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination;
> 
>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
> @property (readonly) NSSpringLoadingHighlight springLoadingHighlight;
> - (void)resetSpringLoading;
>-#endif
> @end
> 
> #endif
>diff --git a/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm b/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
>index 07c7f8dfb6b044eb1156da12ceb0c0a527120d67..f219d798ee07925198eb5c19e95ae8773352eff2 100644
>--- a/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
>+++ b/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
>@@ -142,7 +142,6 @@ - (void)enumerateDraggingItemsWithOptions:(NSEnumerationOptions)enumOpts forView
>     // Ignored.
> }
> 
>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
> -(NSSpringLoadingHighlight)springLoadingHighlight
> {
>     return NSSpringLoadingHighlightNone;
>@@ -151,7 +150,6 @@ -(NSSpringLoadingHighlight)springLoadingHighlight
> - (void)resetSpringLoading
> {
> }
>-#endif
> 
> @end
> 
>diff --git a/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h b/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h
>index 170020e300724067b0b2db04d4f73758ff9351d1..75229fe04039a716dab59fac9f74b1857e7b706f 100644
>--- a/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h
>+++ b/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h
>@@ -45,8 +45,6 @@ @private
> - (void)slideDraggedImageTo:(NSPoint)screenPoint;
> - (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination;
> 
>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
> @property (readonly) NSSpringLoadingHighlight springLoadingHighlight;
> - (void)resetSpringLoading;
>-#endif
> @end
>diff --git a/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm b/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm
>index 8b7d1582f69ec0f0504e9a4190685a6ef92fc040..1ea2c843182c308a22d923c6b012c6a1ae0ccbea 100644
>--- a/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm
>+++ b/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm
>@@ -146,7 +146,6 @@ - (void)enumerateDraggingItemsWithOptions:(NSEnumerationOptions)enumOpts forView
>     // Ignored.
> }
> 
>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
> -(NSSpringLoadingHighlight)springLoadingHighlight
> {
>     return NSSpringLoadingHighlightNone;
>@@ -155,6 +154,5 @@ -(NSSpringLoadingHighlight)springLoadingHighlight
> - (void)resetSpringLoading
> {
> }
>-#endif
> 
> @end

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