Attachment #420011 for bug #164860

View Details Raw Unified Return to Bug 164860

| Differences between



2021-02-11  Yusuke Suzuki  <ysuzuki@apple.com>

        JS Modules in Workers
        https://bugs.webkit.org/show_bug.cgi?id=164860

        Reviewed by NOBODY (OOPS!).

        * Headers.cmake:
        * Sources.txt:
        * WebCore.xcodeproj/project.pbxproj:
        * bindings/js/CachedModuleScriptLoader.cpp:
        (WebCore::CachedModuleScriptLoader::create):
        (WebCore::CachedModuleScriptLoader::CachedModuleScriptLoader):
        (WebCore::CachedModuleScriptLoader::load):
        (WebCore::CachedModuleScriptLoader::notifyFinished):
        * bindings/js/CachedModuleScriptLoader.h:
        * bindings/js/CachedScriptFetcher.cpp:
        (WebCore::CachedScriptFetcher::requestScriptWithCache const):
        * bindings/js/JSDOMGlobalObject.cpp:
        (WebCore::scriptModuleLoader):
        (WebCore::JSDOMGlobalObject::moduleLoaderResolve):
        (WebCore::JSDOMGlobalObject::moduleLoaderFetch):
        (WebCore::JSDOMGlobalObject::moduleLoaderEvaluate):
        (WebCore::JSDOMGlobalObject::moduleLoaderImportModule):
        (WebCore::JSDOMGlobalObject::moduleLoaderCreateImportMetaProperties):
        * bindings/js/JSDOMGlobalObject.h:
        * bindings/js/JSDOMWindowBase.cpp:
        (WebCore::JSDOMWindowBase::moduleLoaderResolve): Deleted.
        (WebCore::JSDOMWindowBase::moduleLoaderFetch): Deleted.
        (WebCore::JSDOMWindowBase::moduleLoaderEvaluate): Deleted.
        (WebCore::JSDOMWindowBase::moduleLoaderImportModule): Deleted.
        (WebCore::JSDOMWindowBase::moduleLoaderCreateImportMetaProperties): Deleted.
        * bindings/js/JSDOMWindowBase.h:
        * bindings/js/JSExecState.h:
        (WebCore::JSExecState::loadAndEvaluateModule):
        * bindings/js/JSWorkerGlobalScopeBase.cpp:
        * bindings/js/JSWorkletGlobalScopeBase.cpp:
        * bindings/js/ModuleScriptLoader.h: Copied from Source/WebCore/workers/WorkerType.h.
        (WebCore::ModuleScriptLoader::clearClient):
        (WebCore::ModuleScriptLoader::scriptFetcher):
        (WebCore::ModuleScriptLoader::parameters):
        (WebCore::ModuleScriptLoader::ModuleScriptLoader):
        * bindings/js/ModuleScriptLoaderClient.h: Renamed from Source/WebCore/bindings/js/CachedModuleScriptLoaderClient.h.
        * bindings/js/ScriptModuleLoader.cpp:
        (WebCore::ScriptModuleLoader::ScriptModuleLoader):
        (WebCore::resolveModuleSpecifier):
        (WebCore::ScriptModuleLoader::resolve):
        (WebCore::ScriptModuleLoader::fetch):
        (WebCore::ScriptModuleLoader::moduleURL):
        (WebCore::ScriptModuleLoader::responseURLFromRequestURL):
        (WebCore::ScriptModuleLoader::evaluate):
        (WebCore::ScriptModuleLoader::importModule):
        (WebCore::ScriptModuleLoader::notifyFinished):
        * bindings/js/ScriptModuleLoader.h:
        * bindings/js/ScriptSourceCode.h:
        (WebCore::ScriptSourceCode::ScriptSourceCode):
        * bindings/js/WorkerModuleScriptLoader.cpp: Added.
        (WebCore::WorkerModuleScriptLoader::create):
        (WebCore::WorkerModuleScriptLoader::WorkerModuleScriptLoader):
        (WebCore::WorkerModuleScriptLoader::~WorkerModuleScriptLoader):
        (WebCore::WorkerModuleScriptLoader::load):
        (WebCore::WorkerModuleScriptLoader::notifyFinished):
        * bindings/js/WorkerModuleScriptLoader.h: Copied from Source/WebCore/workers/WorkerType.h.
        * bindings/js/WorkerScriptFetcher.h: Added.
        * dom/Document.cpp:
        * dom/LoadableModuleScript.cpp:
        (WebCore::LoadableModuleScript::load): Deleted.
        * dom/LoadableModuleScript.h:
        * dom/ScriptElement.cpp:
        (WebCore::ScriptElement::requestModuleScript):
        * loader/ThreadableLoader.cpp:
        (WebCore::ThreadableLoader::create):
        * loader/ThreadableLoader.h:
        (WebCore::ThreadableLoader::create):
        * workers/Worker.cpp:
        (WebCore::Worker::Worker):
        (WebCore::Worker::create):
        (WebCore::Worker::notifyFinished):
        * workers/Worker.h:
        * workers/Worker.idl:
        * workers/WorkerGlobalScope.cpp:
        (WebCore::WorkerGlobalScope::WorkerGlobalScope):
        (WebCore::WorkerGlobalScope::importScripts):
        * workers/WorkerGlobalScope.h:
        (WebCore::WorkerGlobalScope::credentials const):
        * workers/WorkerGlobalScopeProxy.h:
        * workers/WorkerMessagingProxy.cpp:
        (WebCore::WorkerMessagingProxy::startWorkerGlobalScope):
        * workers/WorkerMessagingProxy.h:
        * workers/WorkerOrWorkletGlobalScope.cpp:
        (WebCore::WorkerOrWorkletGlobalScope::WorkerOrWorkletGlobalScope):
        * workers/WorkerOrWorkletGlobalScope.h:
        (WebCore::WorkerOrWorkletGlobalScope::moduleLoader):
        * workers/WorkerOrWorkletScriptController.cpp:
        (WebCore::jsValueToModuleKey):
        (WebCore::WorkerOrWorkletScriptController::evaluateModule):
        (WebCore::WorkerOrWorkletScriptController::loadModuleSynchronously):
        (WebCore::WorkerOrWorkletScriptController::linkAndEvaluateModule):
        (WebCore::WorkerOrWorkletScriptController::loadAndEvaluateModule):
        * workers/WorkerOrWorkletScriptController.h:
        * workers/WorkerScriptLoader.cpp:
        (WebCore::WorkerScriptLoader::loadAsynchronously):
        (WebCore::WorkerScriptLoader::didReceiveResponse):
        * workers/WorkerScriptLoader.h:
        (WebCore::WorkerScriptLoader::responseSource const):
        (WebCore::WorkerScriptLoader::isRedirected const):
        * workers/WorkerThread.cpp:
        (WebCore::WorkerParameters::isolatedCopy const):
        (WebCore::WorkerThread::evaluateScriptIfNecessary):
        * workers/WorkerThread.h:
        * workers/WorkerType.h:
        * workers/service/ServiceWorkerContainer.h:
        * workers/service/ServiceWorkerJob.cpp:
        (WebCore::ServiceWorkerJob::fetchScriptWithContext):
        * workers/service/ServiceWorkerRegistrationOptions.h:
        * workers/service/context/ServiceWorkerThread.cpp:
        (WebCore::ServiceWorkerThread::ServiceWorkerThread):
        * workers/service/server/SWServerWorker.h:
        * worklets/WorkletGlobalScope.cpp:
        (WebCore::WorkletGlobalScope::fetchAndInvokeScript):
        (WebCore::WorkletGlobalScope::processNextScriptFetchJobIfNeeded):

2021-02-10  Alexey Proskuryakov  <ap@apple.com>

        Do not differentiate between Release and Production via ENABLE_DEVELOPER_MODE




    Modules/fetch/FetchBodyConsumer.h
    Modules/fetch/FetchBodySource.h
    Modules/fetch/FetchRequestCredentials.h
    Modules/fetch/FetchHeaders.h
    Modules/fetch/FetchIdentifier.h
    Modules/fetch/FetchLoader.h

    bindings/js/WebCoreJITOperations.h
    bindings/js/WebCoreTypedArrayController.h
    bindings/js/WindowProxy.h
    bindings/js/WorkerScriptFetcher.h

    bridge/Bridge.h
    bridge/IdentifierRep.h

Lines 639-644 bindings/js/StructuredClone.cpp a/Source/WebCore/Sources.txt_sec1
- a/Source/WebCore/Sources.txt +1 lines
639	bindings/js/WebCoreJITOperations.cpp	639	bindings/js/WebCoreJITOperations.cpp
640	bindings/js/WebCoreJSClientData.cpp	640	bindings/js/WebCoreJSClientData.cpp
641	bindings/js/WebCoreTypedArrayController.cpp	641	bindings/js/WebCoreTypedArrayController.cpp
		642	bindings/js/WorkerModuleScriptLoader.cpp
642	bindings/js/WindowProxy.cpp	643	bindings/js/WindowProxy.cpp
643	bindings/js/WritableStream.cpp	644	bindings/js/WritableStream.cpp
644	bridge/IdentifierRep.cpp	645	bridge/IdentifierRep.cpp



		E30592641E27A3AD00D57C98 /* InlineClassicScript.h in Headers */ = {isa = PBXBuildFile; fileRef = E30592621E27A38C00D57C98 /* InlineClassicScript.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E30592681E27A3D100D57C98 /* CachedScriptFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E30592661E27A3C600D57C98 /* CachedScriptFetcher.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E307DED01D81E4C700141CAF /* CachedModuleScriptLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DEC71D81E44800141CAF /* CachedModuleScriptLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E307DED11D81E4CB00141CAF /* CachedModuleScriptLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DEC81D81E44800141CAF /* CachedModuleScriptLoaderClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E307DED51D81E4F200141CAF /* LoadableModuleScript.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DED31D81E4ED00141CAF /* LoadableModuleScript.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E3150EA71DA7219300194012 /* DOMJITHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = E3150EA51DA7218D00194012 /* DOMJITHelpers.h */; };
		E3201C1A1F8E82130076A032 /* ModuleFetchParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = E38D06091F8E811900649CF2 /* ModuleFetchParameters.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E323CFFA1E5AF6AF00F0B4A0 /* JSDOMConvertPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = E323CFF91E5AF6A500F0B4A0 /* JSDOMConvertPromise.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E3432DE425D377E30058E612 /* WorkerModuleScriptLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E3432DE025D377E20058E612 /* WorkerModuleScriptLoader.h */; };
		E347E5FA25D4F00000F17A5C /* WorkerScriptFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E347E5F825D4F00000F17A5C /* WorkerScriptFetcher.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E35188B425D387CF00A77AF3 /* ModuleScriptLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E35188B325D387CF00A77AF3 /* ModuleScriptLoaderClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E3565B7B1DC2D6C900217DBD /* JSEventCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = E34EE49F1DC2D57500EAA9D3 /* JSEventCustom.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E35802B61DC8435D00A9773C /* DOMJITIDLTypeFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = E35802B51DC8435800A9773C /* DOMJITIDLTypeFilter.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E3582C282527F66900D1B790 /* WebCoreJITOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = E3582C262527F66800D1B790 /* WebCoreJITOperations.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E35B907F23F60A50000011FF /* LocalizedDeviceModel.h in Headers */ = {isa = PBXBuildFile; fileRef = E35B907C23F60677000011FF /* LocalizedDeviceModel.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E364321C25D37A6700F90E2A /* ModuleScriptLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E364321A25D37A6600F90E2A /* ModuleScriptLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E377FE4D1DADE16500CDD025 /* NodeConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = E3D049931DADC04500718F3C /* NodeConstants.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E37C86501EB63E3F0087C6CA /* JSDOMPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = E37C864F1EB63E2D0087C6CA /* JSDOMPromise.h */; settings = {ATTRIBUTES = (Private, ); }; };
		E39628BF2395728F00658ECD /* DeviceOrientationUpdateProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = E39628BD2395728E00658ECD /* DeviceOrientationUpdateProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };

		E30592661E27A3C600D57C98 /* CachedScriptFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedScriptFetcher.h; sourceTree = "<group>"; };
		E307DEC61D81E44800141CAF /* CachedModuleScriptLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedModuleScriptLoader.cpp; sourceTree = "<group>"; };
		E307DEC71D81E44800141CAF /* CachedModuleScriptLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedModuleScriptLoader.h; sourceTree = "<group>"; };
		E307DEC81D81E44800141CAF /* CachedModuleScriptLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedModuleScriptLoaderClient.h; sourceTree = "<group>"; };
		E307DED21D81E4ED00141CAF /* LoadableModuleScript.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoadableModuleScript.cpp; sourceTree = "<group>"; };
		E307DED31D81E4ED00141CAF /* LoadableModuleScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoadableModuleScript.h; sourceTree = "<group>"; };
		E3150EA51DA7218D00194012 /* DOMJITHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMJITHelpers.h; sourceTree = "<group>"; };

		E329276322543F5900308A9A /* TypedOMCSSUnitValue.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TypedOMCSSUnitValue.cpp; sourceTree = "<group>"; };
		E329276622543FDE00308A9A /* DOMRectReadOnly.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DOMRectReadOnly.cpp; sourceTree = "<group>"; };
		E334825E1DC93AA0009C9544 /* DOMJITAbstractHeapRepository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMJITAbstractHeapRepository.h; path = DerivedSources/WebCore/DOMJITAbstractHeapRepository.h; sourceTree = BUILT_PRODUCTS_DIR; };
		E3432DE025D377E20058E612 /* WorkerModuleScriptLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerModuleScriptLoader.h; sourceTree = "<group>"; };
		E3432DE325D377E30058E612 /* WorkerModuleScriptLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerModuleScriptLoader.cpp; sourceTree = "<group>"; };
		E347E5F825D4F00000F17A5C /* WorkerScriptFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerScriptFetcher.h; sourceTree = "<group>"; };
		E34EE49F1DC2D57500EAA9D3 /* JSEventCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSEventCustom.h; sourceTree = "<group>"; };
		E35188B325D387CF00A77AF3 /* ModuleScriptLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleScriptLoaderClient.h; sourceTree = "<group>"; };
		E35802B51DC8435800A9773C /* DOMJITIDLTypeFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMJITIDLTypeFilter.h; sourceTree = "<group>"; };
		E3582C242527F66800D1B790 /* WebCoreJITOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreJITOperations.cpp; sourceTree = "<group>"; };
		E3582C262527F66800D1B790 /* WebCoreJITOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreJITOperations.h; sourceTree = "<group>"; };
		E35B907C23F60677000011FF /* LocalizedDeviceModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalizedDeviceModel.h; sourceTree = "<group>"; };
		E35B907E23F60677000011FF /* LocalizedDeviceModel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalizedDeviceModel.mm; sourceTree = "<group>"; };
		E364321A25D37A6600F90E2A /* ModuleScriptLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleScriptLoader.h; sourceTree = "<group>"; };
		E37C864F1EB63E2D0087C6CA /* JSDOMPromise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMPromise.h; sourceTree = "<group>"; };
		E38838941BAD145F00D62EE3 /* ScriptModuleLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptModuleLoader.cpp; sourceTree = "<group>"; };
		E38838951BAD145F00D62EE3 /* ScriptModuleLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptModuleLoader.h; sourceTree = "<group>"; };

				2DFA488E1DB541C200362B99 /* BufferSource.h */,
				E307DEC61D81E44800141CAF /* CachedModuleScriptLoader.cpp */,
				E307DEC71D81E44800141CAF /* CachedModuleScriptLoader.h */,
				E307DEC81D81E44800141CAF /* CachedModuleScriptLoaderClient.h */,
				E30592651E27A3C600D57C98 /* CachedScriptFetcher.cpp */,
				E30592661E27A3C600D57C98 /* CachedScriptFetcher.h */,
				BCD533630ED6848900887468 /* CachedScriptSourceProvider.h */,

				4BDEA32D218034050052DFCD /* JSWorkletGlobalScopeBase.cpp */,
				4BDEA32B218033EB0052DFCD /* JSWorkletGlobalScopeBase.h */,
				709A01FD1E3D0BCC006B0D4C /* ModuleFetchFailureKind.h */,
				E364321A25D37A6600F90E2A /* ModuleScriptLoader.h */,
				E35188B325D387CF00A77AF3 /* ModuleScriptLoaderClient.h */,
				41B459ED1F55EBC70000F6FD /* ReadableStream.cpp */,
				41B459DA1F4CADB90000F6FD /* ReadableStream.h */,
				418C395E1C8F0AAB0051C8A3 /* ReadableStreamDefaultController.cpp */,

				0F099D0717B968A100FF84B9 /* WebCoreTypedArrayController.h */,
				463521AC2081090E00C28922 /* WindowProxy.cpp */,
				463521AA2081090B00C28922 /* WindowProxy.h */,
				E3432DE325D377E30058E612 /* WorkerModuleScriptLoader.cpp */,
				E3432DE025D377E20058E612 /* WorkerModuleScriptLoader.h */,
				E347E5F825D4F00000F17A5C /* WorkerScriptFetcher.h */,
				41418A0325643E1200363417 /* WritableStream.cpp */,
				41418A0425643E1300363417 /* WritableStream.h */,
			);

				BCB16C1C0979C3BD00467741 /* CachedImage.h in Headers */,
				319FBD5F15D2F464009640A6 /* CachedImageClient.h in Headers */,
				E307DED01D81E4C700141CAF /* CachedModuleScriptLoader.h in Headers */,
				E307DED11D81E4CB00141CAF /* CachedModuleScriptLoaderClient.h in Headers */,
				510184690B08602A004A825F /* CachedPage.h in Headers */,
				D0EDA775143E303C0028E383 /* CachedRawResource.h in Headers */,
				E1B533491717DEE300F205F9 /* CachedRawResourceClient.h in Headers */,

				C6D74AD509AA282E000B0A52 /* ModifySelectionListLevel.h in Headers */,
				709A01FE1E3D0BDD006B0D4C /* ModuleFetchFailureKind.h in Headers */,
				E3201C1A1F8E82130076A032 /* ModuleFetchParameters.h in Headers */,
				E364321C25D37A6700F90E2A /* ModuleScriptLoader.h in Headers */,
				E35188B425D387CF00A77AF3 /* ModuleScriptLoaderClient.h in Headers */,
				F55B3DC61251F12D003EF269 /* MonthInputType.h in Headers */,
				E39628C12395743100658ECD /* MotionManagerClient.h in Headers */,
				85031B460A44EFC700F992E0 /* MouseEvent.h in Headers */,

				18F831B80FD48C7800D8C56B /* WorkerLoaderProxy.h in Headers */,
				2E43464D0F546A8200B0F1BA /* WorkerLocation.h in Headers */,
				2E4346500F546A8200B0F1BA /* WorkerMessagingProxy.h in Headers */,
				E3432DE425D377E30058E612 /* WorkerModuleScriptLoader.h in Headers */,
				E1271A0B0EEEC77A00F61213 /* WorkerNavigator.h in Headers */,
				A5CB05251FB51F3A00089B97 /* WorkerNetworkAgent.h in Headers */,
				2E4346510F546A8200B0F1BA /* WorkerObjectProxy.h in Headers */,

				416E29A6102FA962007FC14E /* WorkerReportingProxy.h in Headers */,
				2E4346530F546A8200B0F1BA /* WorkerRunLoop.h in Headers */,
				A5B81CCF1FAA44DE0037D1E6 /* WorkerRuntimeAgent.h in Headers */,
				E347E5FA25D4F00000F17A5C /* WorkerScriptFetcher.h in Headers */,
				A7D6B3490F61104500B79FD1 /* WorkerScriptLoader.h in Headers */,
				2EA768040FE7126400AB9C8A /* WorkerScriptLoaderClient.h in Headers */,
				2E4346550F546A8200B0F1BA /* WorkerThread.h in Headers */,




namespace WebCore {

Ref<CachedModuleScriptLoader> CachedModuleScriptLoader::create(ModuleScriptLoaderClient& client, DeferredPromise& promise, CachedScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)
{
    return adoptRef(*new CachedModuleScriptLoader(client, promise, scriptFetcher, WTFMove(parameters)));
}

CachedModuleScriptLoader::CachedModuleScriptLoader(ModuleScriptLoaderClient& client, DeferredPromise& promise, CachedScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)
    : ModuleScriptLoader(client, promise, scriptFetcher, WTFMove(parameters))
    , m_promise(&promise)
    , m_scriptFetcher(scriptFetcher)
    , m_parameters(WTFMove(parameters))
{
}


    }
}

bool CachedModuleScriptLoader::load(Document& document, URL&& sourceURL)
{
    ASSERT(m_promise);
    ASSERT(!m_cachedScript);
    String integrity = m_parameters ? m_parameters->integrity() : String { };
    m_cachedScript = scriptFetcher().requestModuleScript(document, sourceURL, WTFMove(integrity));
    if (!m_cachedScript)
        return false;
    m_sourceURL = WTFMove(sourceURL);

    // If the content is already cached, this immediately calls notifyFinished.
    m_cachedScript->addClient(*this);


    Ref<CachedModuleScriptLoader> protectedThis(*this);
    if (m_client)
        m_client->notifyFinished(*this, WTFMove(m_sourceURL), m_promise.releaseNonNull());

    // Remove the client after calling notifyFinished to keep the data buffer in
    // CachedResource alive while notifyFinished processes the resource.




#include "CachedResourceClient.h"
#include "CachedResourceHandle.h"
#include "CachedScriptFetcher.h"
#include "ModuleScriptLoader.h"
#include <wtf/Ref.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>


namespace WebCore {

class ModuleScriptLoaderClient;
class CachedScript;
class CachedScriptFetcher;
class DeferredPromise;
class Document;
class JSDOMGlobalObject;
class ModuleFetchParameters;

class CachedModuleScriptLoader final : public ModuleScriptLoader, private CachedResourceClient {
public:
    static Ref<CachedModuleScriptLoader> create(ModuleScriptLoaderClient&, DeferredPromise&, CachedScriptFetcher&, RefPtr<ModuleFetchParameters>&&);

    virtual ~CachedModuleScriptLoader();

    bool load(Document&, URL&& sourceURL);

    CachedScriptFetcher& scriptFetcher() { return m_scriptFetcher.get(); }
    CachedScript* cachedScript() { return m_cachedScript.get(); }
    CachedScriptFetcher& scriptFetcher() { return static_cast<CachedScriptFetcher&>(ModuleScriptLoader::scriptFetcher()); }
    const URL& sourceURL() const { return m_sourceURL; }

    void clearClient()
    {
        ASSERT(m_client);
        m_client = nullptr;
    }

private:
    CachedModuleScriptLoader(ModuleScriptLoaderClient&, DeferredPromise&, CachedScriptFetcher&, RefPtr<ModuleFetchParameters>&&);

    void notifyFinished(CachedResource&, const NetworkLoadMetrics&) final;

    CachedModuleScriptLoaderClient* m_client { nullptr };
    RefPtr<DeferredPromise> m_promise;
    Ref<CachedScriptFetcher> m_scriptFetcher;
    RefPtr<ModuleFetchParameters> m_parameters;
    CachedResourceHandle<CachedScript> m_cachedScript;
    URL m_sourceURL;
};



/*
 * Copyright (C) 2016 Apple, Inc. All Rights Reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

namespace WebCore {

class CachedModuleScriptLoader;
class DeferredPromise;

class CachedModuleScriptLoaderClient {
public:
    virtual ~CachedModuleScriptLoaderClient() = default;

    virtual void notifyFinished(CachedModuleScriptLoader&, RefPtr<DeferredPromise>) = 0;
};

}



#include "CrossOriginAccessControl.h"
#include "Document.h"
#include "Settings.h"
#include "WorkerOrWorkletGlobalScope.h"

namespace WebCore {



CachedResourceHandle<CachedScript> CachedScriptFetcher::requestScriptWithCache(Document& document, const URL& sourceURL, const String& crossOriginMode, String&& integrity, Optional<ResourceLoadPriority> resourceLoadPriority) const
{
    // Without scripting, there is no way to start Workers.
    if (!document.settings().isScriptEnabled())
        return nullptr;




#include "JSWorkletGlobalScope.h"
#include "RejectedPromiseTracker.h"
#include "RuntimeEnabledFeatures.h"
#include "ScriptModuleLoader.h"
#include "StructuredClone.h"
#include "WebCoreJSClientData.h"
#include "WorkerGlobalScope.h"

}
#endif

static ScriptModuleLoader* scriptModuleLoader(JSDOMGlobalObject* globalObject)
{
    VM& vm = globalObject->vm();
    if (globalObject->inherits<JSDOMWindowBase>(vm)) {
        if (auto document = jsCast<const JSDOMWindowBase*>(globalObject)->wrapped().document())
            return &document->moduleLoader();
        return nullptr;
    }
    if (globalObject->inherits<JSRemoteDOMWindowBase>(vm))
        return nullptr;
    if (globalObject->inherits<JSWorkerGlobalScopeBase>(vm))
        return &jsCast<const JSWorkerGlobalScopeBase*>(globalObject)->wrapped().moduleLoader();
    if (globalObject->inherits<JSWorkletGlobalScopeBase>(vm))
        return &jsCast<const JSWorkletGlobalScopeBase*>(globalObject)->wrapped().moduleLoader();
#if ENABLE(INDEXED_DATABASE)
    if (globalObject->inherits<JSIDBSerializationGlobalObject>(vm))
        return nullptr;
#endif
    dataLog("Unexpected global object: ", JSValue(globalObject), "\n");
    RELEASE_ASSERT_NOT_REACHED();
    return nullptr;
}

JSC::Identifier JSDOMGlobalObject::moduleLoaderResolve(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleName, JSC::JSValue importerModuleKey, JSC::JSValue scriptFetcher)
{
    JSDOMGlobalObject* thisObject = JSC::jsCast<JSDOMGlobalObject*>(globalObject);
    if (auto* loader = scriptModuleLoader(thisObject))
        return loader->resolve(globalObject, moduleLoader, moduleName, importerModuleKey, scriptFetcher);
    return { };
}

JSC::JSInternalPromise* JSDOMGlobalObject::moduleLoaderFetch(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue parameters, JSC::JSValue scriptFetcher)
{
    VM& vm = globalObject->vm();
    auto scope = DECLARE_THROW_SCOPE(vm);
    JSDOMGlobalObject* thisObject = JSC::jsCast<JSDOMGlobalObject*>(globalObject);
    if (auto* loader = scriptModuleLoader(thisObject))
        RELEASE_AND_RETURN(scope, loader->fetch(globalObject, moduleLoader, moduleKey, parameters, scriptFetcher));
    JSC::JSInternalPromise* promise = JSC::JSInternalPromise::create(vm, globalObject->internalPromiseStructure());
    scope.release();
    promise->reject(globalObject, jsUndefined());
    return promise;
}

JSC::JSValue JSDOMGlobalObject::moduleLoaderEvaluate(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue moduleRecord, JSC::JSValue scriptFetcher)
{
    JSDOMGlobalObject* thisObject = JSC::jsCast<JSDOMGlobalObject*>(globalObject);
    if (auto* loader = scriptModuleLoader(thisObject))
        return loader->evaluate(globalObject, moduleLoader, moduleKey, moduleRecord, scriptFetcher);
    return JSC::jsUndefined();
}

JSC::JSInternalPromise* JSDOMGlobalObject::moduleLoaderImportModule(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSString* moduleName, JSC::JSValue parameters, const JSC::SourceOrigin& sourceOrigin)
{
    VM& vm = globalObject->vm();
    auto scope = DECLARE_THROW_SCOPE(vm);
    JSDOMGlobalObject* thisObject = JSC::jsCast<JSDOMGlobalObject*>(globalObject);
    if (auto* loader = scriptModuleLoader(thisObject))
        RELEASE_AND_RETURN(scope, loader->importModule(globalObject, moduleLoader, moduleName, parameters, sourceOrigin));
    JSC::JSInternalPromise* promise = JSC::JSInternalPromise::create(vm, globalObject->internalPromiseStructure());
    scope.release();
    promise->reject(globalObject, jsUndefined());
    return promise;
}

JSC::JSObject* JSDOMGlobalObject::moduleLoaderCreateImportMetaProperties(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSModuleRecord* moduleRecord, JSC::JSValue scriptFetcher)
{
    JSDOMGlobalObject* thisObject = JSC::jsCast<JSDOMGlobalObject*>(globalObject);
    if (auto* loader = scriptModuleLoader(thisObject))
        return loader->createImportMetaProperties(globalObject, moduleLoader, moduleKey, moduleRecord, scriptFetcher);
    return constructEmptyObject(globalObject->vm(), globalObject->nullPrototypeObjectStructure());
}

JSDOMGlobalObject& callerGlobalObject(JSGlobalObject& lexicalGlobalObject, CallFrame& callFrame)
{
    class GetCallerGlobalObjectFunctor {

Lines 105-110 class WEBCORE_EXPORT JSDOMGlobalObject : public JSC::JSGlobalObject { a/Source/WebCore/bindings/js/JSDOMGlobalObject.h_sec1
- a/Source/WebCore/bindings/js/JSDOMGlobalObject.h +6 lines
105	static JSC::JSPromise* instantiateStreaming(JSC::JSGlobalObject, JSC::JSValue, JSC::JSObject);	105	static JSC::JSPromise* instantiateStreaming(JSC::JSGlobalObject, JSC::JSValue, JSC::JSObject);
106	#endif	106	#endif
107		107
		108	static JSC::Identifier moduleLoaderResolve(JSC::JSGlobalObject, JSC::JSModuleLoader, JSC::JSValue, JSC::JSValue, JSC::JSValue);
		109	static JSC::JSInternalPromise* moduleLoaderFetch(JSC::JSGlobalObject, JSC::JSModuleLoader, JSC::JSValue, JSC::JSValue, JSC::JSValue);
		110	static JSC::JSValue moduleLoaderEvaluate(JSC::JSGlobalObject, JSC::JSModuleLoader, JSC::JSValue, JSC::JSValue, JSC::JSValue);
		111	static JSC::JSInternalPromise* moduleLoaderImportModule(JSC::JSGlobalObject, JSC::JSModuleLoader, JSC::JSString*, JSC::JSValue, const JSC::SourceOrigin&);
		112	static JSC::JSObject* moduleLoaderCreateImportMetaProperties(JSC::JSGlobalObject, JSC::JSModuleLoader, JSC::JSValue, JSC::JSModuleRecord*, JSC::JSValue);
		113
108	JSDOMStructureMap m_structures;	114	JSDOMStructureMap m_structures;
109	JSDOMConstructorMap m_constructors;	115	JSDOMConstructorMap m_constructors;
110	DOMGuardedObjectSet m_guardedObjects;	116	DOMGuardedObjectSet m_guardedObjects;



    }
}

JSC::Identifier JSDOMWindowBase::moduleLoaderResolve(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleName, JSC::JSValue importerModuleKey, JSC::JSValue scriptFetcher)
{
    JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
    if (RefPtr<Document> document = thisObject->wrapped().document())
        return document->moduleLoader().resolve(globalObject, moduleLoader, moduleName, importerModuleKey, scriptFetcher);
    return { };
}

JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderFetch(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue parameters, JSC::JSValue scriptFetcher)
{
    VM& vm = globalObject->vm();
    auto scope = DECLARE_THROW_SCOPE(vm);
    JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
    if (RefPtr<Document> document = thisObject->wrapped().document())
        RELEASE_AND_RETURN(scope, document->moduleLoader().fetch(globalObject, moduleLoader, moduleKey, parameters, scriptFetcher));
    JSC::JSInternalPromise* promise = JSC::JSInternalPromise::create(vm, globalObject->internalPromiseStructure());
    scope.release();
    promise->reject(globalObject, jsUndefined());
    return promise;
}

JSC::JSValue JSDOMWindowBase::moduleLoaderEvaluate(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue moduleRecord, JSC::JSValue scriptFetcher)
{
    JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
    if (RefPtr<Document> document = thisObject->wrapped().document())
        return document->moduleLoader().evaluate(globalObject, moduleLoader, moduleKey, moduleRecord, scriptFetcher);
    return JSC::jsUndefined();
}

JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderImportModule(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSString* moduleName, JSC::JSValue parameters, const JSC::SourceOrigin& sourceOrigin)
{
    VM& vm = globalObject->vm();
    auto scope = DECLARE_THROW_SCOPE(vm);
    JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
    if (RefPtr<Document> document = thisObject->wrapped().document())
        RELEASE_AND_RETURN(scope, document->moduleLoader().importModule(globalObject, moduleLoader, moduleName, parameters, sourceOrigin));
    JSC::JSInternalPromise* promise = JSC::JSInternalPromise::create(vm, globalObject->internalPromiseStructure());
    scope.release();
    promise->reject(globalObject, jsUndefined());
    return promise;
}

JSC::JSObject* JSDOMWindowBase::moduleLoaderCreateImportMetaProperties(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSModuleRecord* moduleRecord, JSC::JSValue scriptFetcher)
{
    JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
    if (RefPtr<Document> document = thisObject->wrapped().document())
        return document->moduleLoader().createImportMetaProperties(globalObject, moduleLoader, moduleKey, moduleRecord, scriptFetcher);
    return constructEmptyObject(globalObject->vm(), globalObject->nullPrototypeObjectStructure());
}

} // namespace WebCore



private:
    using ResponseCallback = WTF::Function<void(const char*, size_t)>;

    static JSC::Identifier moduleLoaderResolve(JSC::JSGlobalObject*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue, JSC::JSValue);
    static JSC::JSInternalPromise* moduleLoaderFetch(JSC::JSGlobalObject*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue, JSC::JSValue);
    static JSC::JSValue moduleLoaderEvaluate(JSC::JSGlobalObject*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue, JSC::JSValue);
    static JSC::JSInternalPromise* moduleLoaderImportModule(JSC::JSGlobalObject*, JSC::JSModuleLoader*, JSC::JSString*, JSC::JSValue, const JSC::SourceOrigin&);
    static JSC::JSObject* moduleLoaderCreateImportMetaProperties(JSC::JSGlobalObject*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSModuleRecord*, JSC::JSValue);

    RefPtr<DOMWindow> m_wrapped;
    RefPtr<Event> m_currentEvent;
};

Lines 103-108 class JSExecState { a/Source/WebCore/bindings/js/JSExecState.h_sec1
- a/Source/WebCore/bindings/js/JSExecState.h +6 lines
103	return *JSC::loadModule(&lexicalGlobalObject, sourceCode, scriptFetcher);	103	return *JSC::loadModule(&lexicalGlobalObject, sourceCode, scriptFetcher);
104	}	104	}
105		105
		106	static JSC::JSInternalPromise& loadAndEvaluateModule(JSC::JSGlobalObject& lexicalGlobalObject, const String& moduleName, JSC::JSValue parameters, JSC::JSValue scriptFetcher)
		107	{
		108	JSExecState currentState(&lexicalGlobalObject);
		109	return *JSC::loadAndEvaluateModule(&lexicalGlobalObject, moduleName, parameters, scriptFetcher);
		110	}
		111
106	static JSC::JSValue linkAndEvaluateModule(JSC::JSGlobalObject& lexicalGlobalObject, const JSC::Identifier& moduleKey, JSC::JSValue scriptFetcher, NakedPtr<JSC::Exception>& returnedException)	112	static JSC::JSValue linkAndEvaluateModule(JSC::JSGlobalObject& lexicalGlobalObject, const JSC::Identifier& moduleKey, JSC::JSValue scriptFetcher, NakedPtr<JSC::Exception>& returnedException)
107	{	113	{
108	JSC::VM& vm = JSC::getVM(&lexicalGlobalObject);	114	JSC::VM& vm = JSC::getVM(&lexicalGlobalObject);



    &javaScriptRuntimeFlags,
    &queueMicrotaskToEventLoop,
    &shouldInterruptScriptBeforeTimeout,
    &moduleLoaderImportModule,
    &moduleLoaderResolve,
    &moduleLoaderFetch,
    &moduleLoaderCreateImportMetaProperties,
    &moduleLoaderEvaluate,
    &promiseRejectionTracker,
    &reportUncaughtExceptionAtEventLoop,
    &currentScriptExecutionOwner,



    &javaScriptRuntimeFlags,
    nullptr, // queueMicrotaskToEventLoop
    &shouldInterruptScriptBeforeTimeout,
    &moduleLoaderImportModule,
    &moduleLoaderResolve,
    &moduleLoaderFetch,
    &moduleLoaderCreateImportMetaProperties,
    &moduleLoaderEvaluate,
    &promiseRejectionTracker,
    &reportUncaughtExceptionAtEventLoop,
    &currentScriptExecutionOwner,



/*
 * Copyright (C) 2021 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#include "JSDOMPromiseDeferred.h"
#include "ModuleFetchParameters.h"
#include <wtf/RefCounted.h>
#include <JavaScriptCore/ScriptFetcher.h>

namespace WebCore {

class ModuleScriptLoaderClient;

class ModuleScriptLoader : public RefCounted<ModuleScriptLoader> {
public:
    virtual ~ModuleScriptLoader() = default;

    void clearClient()
    {
        ASSERT(m_client);
        m_client = nullptr;
    }

    JSC::ScriptFetcher& scriptFetcher() { return m_scriptFetcher.get(); }
    ModuleFetchParameters* parameters() { return m_parameters.get(); }

protected:
    ModuleScriptLoader(ModuleScriptLoaderClient& client, DeferredPromise& promise, JSC::ScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)
        : m_client(&client)
        , m_promise(&promise)
        , m_scriptFetcher(scriptFetcher)
        , m_parameters(WTFMove(parameters))
    {
    }

    ModuleScriptLoaderClient* m_client;
    RefPtr<DeferredPromise> m_promise;
    Ref<JSC::ScriptFetcher> m_scriptFetcher;
    RefPtr<ModuleFetchParameters> m_parameters;
};

} // namespace WebCore



/*
 * Copyright (C) 2021 Apple, Inc. All Rights Reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

namespace WebCore {

class ModuleScriptLoader;
class DeferredPromise;

class ModuleScriptLoaderClient {
public:
    virtual ~ModuleScriptLoaderClient() = default;

    virtual void notifyFinished(ModuleScriptLoader&, URL&&, Ref<DeferredPromise>) = 0;
};

}

Lines 29-35 a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec1
- a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp -65 / +142 lines
29	#include "CachedModuleScriptLoader.h"	29	#include "CachedModuleScriptLoader.h"
30	#include "CachedScript.h"	30	#include "CachedScript.h"
31	#include "CachedScriptFetcher.h"	31	#include "CachedScriptFetcher.h"
32	#include "Document.h"
33	#include "Frame.h"	32	#include "Frame.h"
34	#include "JSDOMBinding.h"	33	#include "JSDOMBinding.h"
35	#include "JSDOMPromiseDeferred.h"	34	#include "JSDOMPromiseDeferred.h"
Lines 41-46 a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec2
41	#include "ScriptSourceCode.h"	40	#include "ScriptSourceCode.h"
42	#include "SubresourceIntegrity.h"	41	#include "SubresourceIntegrity.h"
43	#include "WebCoreJSClientData.h"	42	#include "WebCoreJSClientData.h"
		43	#include "WorkerModuleScriptLoader.h"
		44	#include "WorkerScriptFetcher.h"
44	#include <JavaScriptCore/Completion.h>	45	#include <JavaScriptCore/Completion.h>
45	#include <JavaScriptCore/JSInternalPromise.h>	46	#include <JavaScriptCore/JSInternalPromise.h>
46	#include <JavaScriptCore/JSModuleRecord.h>	47	#include <JavaScriptCore/JSModuleRecord.h>
Lines 52-59 a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec3
52		53
53	namespace WebCore {	54	namespace WebCore {
54		55
55	ScriptModuleLoader::ScriptModuleLoader(Document& document)	56	ScriptModuleLoader::ScriptModuleLoader(ScriptExecutionContext& context, OwnerType ownerType)
56	: m_document(document)	57	: m_context(context)
		58	, m_ownerType(ownerType)
57	{	59	{
58	}	60	}
59		61
Lines 68-74 static bool isRootModule(JSC::JSValue importerModuleKey) a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec4
68	return importerModuleKey.isSymbol() \|\| importerModuleKey.isUndefined();	70	return importerModuleKey.isSymbol() \|\| importerModuleKey.isUndefined();
69	}	71	}
70		72
71	static Expected<URL, String> resolveModuleSpecifier(Document& document, const String& specifier, const URL& baseURL)	73	static Expected<URL, String> resolveModuleSpecifier(ScriptExecutionContext& context, ScriptModuleLoader::OwnerType ownerType, const String& specifier, const URL& baseURL)
72	{	74	{
73	// https://html.spec.whatwg.org/multipage/webappapis.html#resolve-a-module-specifier	75	// https://html.spec.whatwg.org/multipage/webappapis.html#resolve-a-module-specifier
74		76
Lines 79-85 static Expected<URL, String> resolveModuleSpecifier(Document& document, const St a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec5
79	if (!specifier.startsWith('/') && !specifier.startsWith("./") && !specifier.startsWith("../"))	81	if (!specifier.startsWith('/') && !specifier.startsWith("./") && !specifier.startsWith("../"))
80	return makeUnexpected(makeString("Module specifier, '"_s, specifier, "' does not start with \"/\", \"./\", or \"../\". Referenced from "_s, baseURL.string()));	82	return makeUnexpected(makeString("Module specifier, '"_s, specifier, "' does not start with \"/\", \"./\", or \"../\". Referenced from "_s, baseURL.string()));
81		83
82	auto result = document.completeURL(specifier, baseURL);	84	URL result;
		85	if (ownerType == ScriptModuleLoader::OwnerType::Document)
		86	result = downcast<Document>(context).completeURL(specifier, baseURL);
		87	else
		88	result = URL(baseURL, specifier);
		89
83	if (!result.isValid())	90	if (!result.isValid())
84	return makeUnexpected(makeString("Module name, '"_s, result.string(), "' does not resolve to a valid URL."_s));	91	return makeUnexpected(makeString("Module name, '"_s, result.string(), "' does not resolve to a valid URL."_s));
85	return result;	92	return result;
Lines 107-113 JSC::Identifier ScriptModuleLoader::resolve(JSC::JSGlobalObject* jsGlobalObject, a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec6
107	URL baseURL = responseURLFromRequestURL(*jsGlobalObject, importerModuleKey);	114	URL baseURL = responseURLFromRequestURL(*jsGlobalObject, importerModuleKey);
108	RETURN_IF_EXCEPTION(scope, { });	115	RETURN_IF_EXCEPTION(scope, { });
109		116
110	auto result = resolveModuleSpecifier(m_document, specifier, baseURL);	117	auto result = resolveModuleSpecifier(m_context, m_ownerType, specifier, baseURL);
111	if (!result) {	118	if (!result) {
112	JSC::throwTypeError(jsGlobalObject, scope, result.error());	119	JSC::throwTypeError(jsGlobalObject, scope, result.error());
113	return { };	120	return { };
Lines 161-173 JSC::JSInternalPromise* ScriptModuleLoader::fetch(JSC::JSGlobalObject* jsGlobalO a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec7
161	if (auto* scriptFetchParameters = JSC::jsDynamicCast<JSC::JSScriptFetchParameters*>(vm, parameters))	168	if (auto* scriptFetchParameters = JSC::jsDynamicCast<JSC::JSScriptFetchParameters*>(vm, parameters))
162	topLevelFetchParameters = static_cast<ModuleFetchParameters*>(&scriptFetchParameters->parameters());	169	topLevelFetchParameters = static_cast<ModuleFetchParameters*>(&scriptFetchParameters->parameters());
163		170
164	auto loader = CachedModuleScriptLoader::create(this, deferred.get(), static_cast<CachedScriptFetcher>(JSC::jsCast<JSC::JSScriptFetcher>(scriptFetcher)->fetcher()), WTFMove(topLevelFetchParameters));	171	if (m_ownerType == OwnerType::Document) {
165	m_loaders.add(loader.copyRef());	172	auto loader = CachedModuleScriptLoader::create(this, deferred.get(), static_cast<CachedScriptFetcher>(JSC::jsCast<JSC::JSScriptFetcher>(scriptFetcher)->fetcher()), WTFMove(topLevelFetchParameters));
166	if (!loader->load(m_document, completedURL)) {	173	m_loaders.add(loader.copyRef());
167	loader->clearClient();	174	if (!loader->load(downcast<Document>(m_context), WTFMove(completedURL))) {
168	m_loaders.remove(WTFMove(loader));	175	loader->clearClient();
169	rejectToPropagateNetworkError(deferred.get(), ModuleFetchFailureKind::WasErrored, "Importing a module script failed."_s);	176	m_loaders.remove(WTFMove(loader));
170	return jsPromise;	177	rejectToPropagateNetworkError(deferred.get(), ModuleFetchFailureKind::WasErrored, "Importing a module script failed."_s);
		178	return jsPromise;
		179	}
		180	} else {
		181	auto loader = WorkerModuleScriptLoader::create(this, deferred.get(), static_cast<WorkerScriptFetcher>(JSC::jsCast<JSC::JSScriptFetcher>(scriptFetcher)->fetcher()), WTFMove(topLevelFetchParameters));
		182	m_loaders.add(loader.copyRef());
		183	loader->load(m_context, WTFMove(completedURL));
171	}	184	}
172		185
173	return jsPromise;	186	return jsPromise;
Lines 176-182 JSC::JSInternalPromise* ScriptModuleLoader::fetch(JSC::JSGlobalObject* jsGlobalO a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec8
176	URL ScriptModuleLoader::moduleURL(JSC::JSGlobalObject& jsGlobalObject, JSC::JSValue moduleKeyValue)	189	URL ScriptModuleLoader::moduleURL(JSC::JSGlobalObject& jsGlobalObject, JSC::JSValue moduleKeyValue)
177	{	190	{
178	if (moduleKeyValue.isSymbol())	191	if (moduleKeyValue.isSymbol())
179	return m_document.url();	192	return m_context.url();
180		193
181	ASSERT(moduleKeyValue.isString());	194	ASSERT(moduleKeyValue.isString());
182	return URL(URL(), asString(moduleKeyValue)->value(&jsGlobalObject));	195	return URL(URL(), asString(moduleKeyValue)->value(&jsGlobalObject));
Lines 187-194 URL ScriptModuleLoader::responseURLFromRequestURL(JSC::JSGlobalObject& jsGlobalO a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec9
187	JSC::VM& vm = jsGlobalObject.vm();	200	JSC::VM& vm = jsGlobalObject.vm();
188	auto scope = DECLARE_THROW_SCOPE(vm);	201	auto scope = DECLARE_THROW_SCOPE(vm);
189		202
190	if (isRootModule(moduleKeyValue))	203	if (isRootModule(moduleKeyValue)) {
191	return m_document.baseURL();	204	if (m_ownerType == OwnerType::Document)
		205	return downcast<Document>(m_context).baseURL();
		206	return m_context.url();
		207	}
192		208
193	ASSERT(!isRootModule(moduleKeyValue));	209	ASSERT(!isRootModule(moduleKeyValue));
194	ASSERT(moduleKeyValue.isString());	210	ASSERT(moduleKeyValue.isString());
Lines 219-226 JSC::JSValue ScriptModuleLoader::evaluate(JSC::JSGlobalObject* jsGlobalObject, J a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec10
219	if (!sourceURL.isValid())	235	if (!sourceURL.isValid())
220	return JSC::throwTypeError(jsGlobalObject, scope, "Module key is an invalid URL."_s);	236	return JSC::throwTypeError(jsGlobalObject, scope, "Module key is an invalid URL."_s);
221		237
222	if (auto* frame = m_document.frame())	238	if (m_ownerType == OwnerType::Document) {
223	return frame->script().evaluateModule(sourceURL, *moduleRecord);	239	if (auto* frame = downcast<Document>(m_context).frame())
		240	return frame->script().evaluateModule(sourceURL, *moduleRecord);
		241	} else {
		242	ASSERT(is<WorkerOrWorkletGlobalScope>(m_context));
		243	if (auto* script = downcast<WorkerOrWorkletGlobalScope>(m_context).script())
		244	return script->evaluateModule(*moduleRecord);
		245	}
224	return JSC::jsUndefined();	246	return JSC::jsUndefined();
225	}	247	}
226		248
Lines 248-255 JSC::JSInternalPromise* ScriptModuleLoader::importModule(JSC::JSGlobalObject* js a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec11
248	URL baseURL;	270	URL baseURL;
249	RefPtr<JSC::ScriptFetcher> scriptFetcher;	271	RefPtr<JSC::ScriptFetcher> scriptFetcher;
250	if (sourceOrigin.isNull()) {	272	if (sourceOrigin.isNull()) {
251	baseURL = m_document.baseURL();	273	if (m_ownerType == OwnerType::Document) {
252	scriptFetcher = CachedScriptFetcher::create(m_document.charset());	274	baseURL = downcast<Document>(m_context).baseURL();
		275	scriptFetcher = CachedScriptFetcher::create(downcast<Document>(m_context).charset());
		276	} else {
		277	baseURL = m_context.url();
		278	scriptFetcher = WorkerScriptFetcher::create(FetchOptions::Credentials::SameOrigin);
		279	}
253	} else {	280	} else {
254	baseURL = URL(URL(), sourceOrigin.string());	281	baseURL = URL(URL(), sourceOrigin.string());
255	if (!baseURL.isValid())	282	if (!baseURL.isValid())
Lines 257-270 JSC::JSInternalPromise* ScriptModuleLoader::importModule(JSC::JSGlobalObject* js a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec12
257		284
258	if (sourceOrigin.fetcher())	285	if (sourceOrigin.fetcher())
259	scriptFetcher = sourceOrigin.fetcher();	286	scriptFetcher = sourceOrigin.fetcher();
260	else	287
261	scriptFetcher = CachedScriptFetcher::create(m_document.charset());	288	if (!scriptFetcher) {
		289	if (m_ownerType == OwnerType::Document)
		290	scriptFetcher = CachedScriptFetcher::create(downcast<Document>(m_context).charset());
		291	else
		292	scriptFetcher = WorkerScriptFetcher::create(FetchOptions::Credentials::SameOrigin);
		293	}
262	}	294	}
263	ASSERT(baseURL.isValid());	295	ASSERT(baseURL.isValid());
264	ASSERT(scriptFetcher);	296	ASSERT(scriptFetcher);
265		297
266	auto specifier = moduleName->value(jsGlobalObject);	298	auto specifier = moduleName->value(jsGlobalObject);
267	auto result = resolveModuleSpecifier(m_document, specifier, baseURL);	299	auto result = resolveModuleSpecifier(m_context, m_ownerType, specifier, baseURL);
268	if (!result)	300	if (!result)
269	return rejectPromise(globalObject, TypeError, result.error());	301	return rejectPromise(globalObject, TypeError, result.error());
270		302
Lines 288-349 JSC::JSObject* ScriptModuleLoader::createImportMetaProperties(JSC::JSGlobalObjec a/Source/WebCore/bindings/js/ScriptModuleLoader.cpp_sec13
288	return metaProperties;	320	return metaProperties;
289	}	321	}
290		322
291	void ScriptModuleLoader::notifyFinished(CachedModuleScriptLoader& loader, RefPtr<DeferredPromise> promise)	323	void ScriptModuleLoader::notifyFinished(ModuleScriptLoader& moduleScriptLoader, URL&& sourceURL, Ref<DeferredPromise> promise)
292	{	324	{
293	// https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script	325	// https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
294		326
295	URL sourceURL = loader.sourceURL();	327	if (!m_loaders.remove(&moduleScriptLoader))
296	if (!m_loaders.remove(&loader))
297	return;	328	return;
298	loader.clearClient();	329	moduleScriptLoader.clearClient();
299		330
300	auto& cachedScript = *loader.cachedScript();	331	if (m_ownerType == OwnerType::Document) {
		332	auto& loader = static_cast<CachedModuleScriptLoader&>(moduleScriptLoader);
		333	auto& cachedScript = *loader.cachedScript();
301		334
302	if (cachedScript.resourceError().isAccessControl()) {	335	if (cachedScript.resourceError().isAccessControl()) {
303	promise->reject(TypeError, "Cross-origin script load denied by Cross-Origin Resource Sharing policy."_s);	336	promise->reject(TypeError, "Cross-origin script load denied by Cross-Origin Resource Sharing policy."_s);
304	return;	337	return;
305	}	338	}
306		339
307	if (cachedScript.errorOccurred()) {	340	if (cachedScript.errorOccurred()) {
308	rejectToPropagateNetworkError(*promise, ModuleFetchFailureKind::WasErrored, "Importing a module script failed."_s);	341	rejectToPropagateNetworkError(promise.get(), ModuleFetchFailureKind::WasErrored, "Importing a module script failed."_s);
309	return;	342	return;
310	}	343	}
311		344
312	if (cachedScript.wasCanceled()) {	345	if (cachedScript.wasCanceled()) {
313	rejectToPropagateNetworkError(*promise, ModuleFetchFailureKind::WasCanceled, "Importing a module script is canceled."_s);	346	rejectToPropagateNetworkError(promise.get(), ModuleFetchFailureKind::WasCanceled, "Importing a module script is canceled."_s);
314	return;	347	return;
315	}	348	}
316		349
317	if (!MIMETypeRegistry::isSupportedJavaScriptMIMEType(cachedScript.response().mimeType())) {	350	if (!MIMETypeRegistry::isSupportedJavaScriptMIMEType(cachedScript.response().mimeType())) {
318	// https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script	351	// https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
319	// The result of extracting a MIME type from response's header list (ignoring parameters) is not a JavaScript MIME type.	352	// The result of extracting a MIME type from response's header list (ignoring parameters) is not a JavaScript MIME type.
320	// For historical reasons, fetching a classic script does not include MIME type checking. In contrast, module scripts will fail to load if they are not of a correct MIME type.	353	// For historical reasons, fetching a classic script does not include MIME type checking. In contrast, module scripts will fail to load if they are not of a correct MIME type.
321	promise->reject(TypeError, makeString("'", cachedScript.response().mimeType(), "' is not a valid JavaScript MIME type."));	354	promise->reject(TypeError, makeString("'", cachedScript.response().mimeType(), "' is not a valid JavaScript MIME type."));
322	return;	355	return;
323	}	356	}
		357
		358	if (auto* parameters = loader.parameters()) {
		359	if (!matchIntegrityMetadata(cachedScript, parameters->integrity())) {
		360	promise->reject(TypeError, makeString("Cannot load script ", integrityMismatchDescription(cachedScript, parameters->integrity())));
		361	return;
		362	}
		363	}
		364
		365	URL responseURL = cachedScript.response().url();
		366	// If we do not have redirection, we must reserve the source URL's fragment explicitly here since ResourceResponse::url() is the one when we first cache it to MemoryCache.
		367	// FIXME: We should track fragments through redirections.
		368	// https://bugs.webkit.org/show_bug.cgi?id=158420
		369	// https://bugs.webkit.org/show_bug.cgi?id=210490
		370	if (!cachedScript.hasRedirections() && cachedScript.response().source() != ResourceResponse::Source::ServiceWorker) {
		371	if (sourceURL.hasFragmentIdentifier())
		372	responseURL.setFragmentIdentifier(sourceURL.fragmentIdentifier());
		373	}
		374
		375	m_requestURLToResponseURLMap.add(sourceURL.string(), WTFMove(responseURL));
		376	promise->resolveWithCallback([&] (JSDOMGlobalObject& jsGlobalObject) {
		377	return JSC::JSSourceCode::create(jsGlobalObject.vm(),
		378	JSC::SourceCode { ScriptSourceCode { &cachedScript, JSC::SourceProviderSourceType::Module, loader.scriptFetcher() }.jsSourceCode() });
		379	});
		380	} else {
		381	auto& loader = static_cast<WorkerModuleScriptLoader&>(moduleScriptLoader);
		382	auto& workerScriptLoader = loader.scriptLoader();
324		383
325	if (auto* parameters = loader.parameters()) {	384	if (workerScriptLoader.failed()) {
326	if (!matchIntegrityMetadata(cachedScript, parameters->integrity())) {	385	if (workerScriptLoader.error().isAccessControl()) {
327	promise->reject(TypeError, makeString("Cannot load script ", integrityMismatchDescription(cachedScript, parameters->integrity())));	386	promise->reject(TypeError, "Cross-origin script load denied by Cross-Origin Resource Sharing policy."_s);
		387	return;
		388	}
		389
		390	if (workerScriptLoader.error().isCancellation()) {
		391	rejectToPropagateNetworkError(promise.get(), ModuleFetchFailureKind::WasCanceled, "Importing a module script is canceled."_s);
		392	return;
		393	}
		394
		395	rejectToPropagateNetworkError(promise.get(), ModuleFetchFailureKind::WasErrored, "Importing a module script failed."_s);
328	return;	396	return;
329	}	397	}
330	}
331		398
332	URL responseURL = cachedScript.response().url();	399	if (!MIMETypeRegistry::isSupportedJavaScriptMIMEType(workerScriptLoader.responseMIMEType())) {
333	// If we do not have redirection, we must reserve the source URL's fragment explicitly here since ResourceResponse::url() is the one when we first cache it to MemoryCache.	400	// https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
334	// FIXME: We should track fragments through redirections.	401	// The result of extracting a MIME type from response's header list (ignoring parameters) is not a JavaScript MIME type.
335	// https://bugs.webkit.org/show_bug.cgi?id=158420	402	// For historical reasons, fetching a classic script does not include MIME type checking. In contrast, module scripts will fail to load if they are not of a correct MIME type.
336	// https://bugs.webkit.org/show_bug.cgi?id=210490	403	promise->reject(TypeError, makeString("'", workerScriptLoader.responseMIMEType(), "' is not a valid JavaScript MIME type."));
337	if (!cachedScript.hasRedirections() && cachedScript.response().source() != ResourceResponse::Source::ServiceWorker) {	404	return;
338	if (sourceURL.hasFragmentIdentifier())	405	}
339	responseURL.setFragmentIdentifier(sourceURL.fragmentIdentifier());
340	}
341		406
342	m_requestURLToResponseURLMap.add(sourceURL.string(), WTFMove(responseURL));	407	URL responseURL = workerScriptLoader.responseURL();
343	promise->resolveWithCallback([&] (JSDOMGlobalObject& jsGlobalObject) {	408
344	return JSC::JSSourceCode::create(jsGlobalObject.vm(),	409	// If we do not have redirection, we must reserve the source URL's fragment explicitly here since ResourceResponse::url() is the one when we first cache it to MemoryCache.
345	JSC::SourceCode { ScriptSourceCode { &cachedScript, JSC::SourceProviderSourceType::Module, loader.scriptFetcher() }.jsSourceCode() });	410	// FIXME: We should track fragments through redirections.
346	});	411	// https://bugs.webkit.org/show_bug.cgi?id=158420
		412	// https://bugs.webkit.org/show_bug.cgi?id=210490
		413	if (!workerScriptLoader.isRedirected() && workerScriptLoader.responseSource() != ResourceResponse::Source::ServiceWorker) {
		414	if (sourceURL.hasFragmentIdentifier())
		415	responseURL.setFragmentIdentifier(sourceURL.fragmentIdentifier());
		416	}
		417
		418	m_requestURLToResponseURLMap.add(sourceURL.string(), responseURL);
		419	promise->resolveWithCallback([&] (JSDOMGlobalObject& jsGlobalObject) {
		420	return JSC::JSSourceCode::create(jsGlobalObject.vm(),
		421	JSC::SourceCode { ScriptSourceCode { workerScriptLoader.script(), WTFMove(responseURL), { }, JSC::SourceProviderSourceType::Module, loader.scriptFetcher() }.jsSourceCode() });
		422	});
		423	}
347	}	424	}
348		425
349	}	426	}




#pragma once

#include "ModuleScriptLoader.h"
#include "ModuleScriptLoaderClient.h"
#include <JavaScriptCore/JSCJSValue.h>
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>


namespace WebCore {

class Document;
class JSDOMGlobalObject;
class ScriptExecutionContext;

class ScriptModuleLoader final : private ModuleScriptLoaderClient {
    WTF_MAKE_NONCOPYABLE(ScriptModuleLoader); WTF_MAKE_FAST_ALLOCATED;
public:
    enum class OwnerType : uint8_t { Document, WorkerOrWorklet };
    explicit ScriptModuleLoader(ScriptExecutionContext&, OwnerType);
    ~ScriptModuleLoader();

    ScriptExecutionContext& context() { return m_context; }

    JSC::Identifier resolve(JSC::JSGlobalObject*, JSC::JSModuleLoader*, JSC::JSValue moduleName, JSC::JSValue importerModuleKey, JSC::JSValue scriptFetcher);
    JSC::JSInternalPromise* fetch(JSC::JSGlobalObject*, JSC::JSModuleLoader*, JSC::JSValue moduleKey, JSC::JSValue parameters, JSC::JSValue scriptFetcher);

    JSC::JSObject* createImportMetaProperties(JSC::JSGlobalObject*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSModuleRecord*, JSC::JSValue);

private:
    void notifyFinished(ModuleScriptLoader&, URL&&, Ref<DeferredPromise>) final;

    URL moduleURL(JSC::JSGlobalObject&, JSC::JSValue);
    URL responseURLFromRequestURL(JSC::JSGlobalObject&, JSC::JSValue);

    ScriptExecutionContext& m_context;
    HashMap<String, URL> m_requestURLToResponseURLMap;
    HashSet<Ref<ModuleScriptLoader>> m_loaders;
    OwnerType m_ownerType;
};

} // namespace WebCore

Lines 57-63 class ScriptSourceCode { a/Source/WebCore/bindings/js/ScriptSourceCode.h_sec1
- a/Source/WebCore/bindings/js/ScriptSourceCode.h -1 / +1 lines
57	{	57	{
58	}	58	}
59		59
60	ScriptSourceCode(const String& source, URL&& url, const TextPosition& startPosition, JSC::SourceProviderSourceType sourceType, Ref<CachedScriptFetcher>&& scriptFetcher)	60	ScriptSourceCode(const String& source, URL&& url, const TextPosition& startPosition, JSC::SourceProviderSourceType sourceType, Ref<JSC::ScriptFetcher>&& scriptFetcher)
61	: m_provider(JSC::StringSourceProvider::create(source, JSC::SourceOrigin { url, WTFMove(scriptFetcher) }, url.string(), startPosition, sourceType))	61	: m_provider(JSC::StringSourceProvider::create(source, JSC::SourceOrigin { url, WTFMove(scriptFetcher) }, url.string(), startPosition, sourceType))
62	, m_code(m_provider.copyRef(), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt())	62	, m_code(m_provider.copyRef(), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt())
63	{	63	{



/*
 * Copyright (C) 2021 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 "WorkerModuleScriptLoader.h"

#include "CachedScriptFetcher.h"
#include "DOMWrapperWorld.h"
#include "Frame.h"
#include "JSDOMBinding.h"
#include "JSDOMPromiseDeferred.h"
#include "ModuleFetchParameters.h"
#include "ResourceLoaderOptions.h"
#include "ScriptController.h"
#include "ScriptModuleLoader.h"
#include "ScriptSourceCode.h"
#include "WorkerScriptLoader.h"

namespace WebCore {

Ref<WorkerModuleScriptLoader> WorkerModuleScriptLoader::create(ModuleScriptLoaderClient& client, DeferredPromise& promise, WorkerScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)
{
    return adoptRef(*new WorkerModuleScriptLoader(client, promise, scriptFetcher, WTFMove(parameters)));
}

WorkerModuleScriptLoader::WorkerModuleScriptLoader(ModuleScriptLoaderClient& client, DeferredPromise& promise, WorkerScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)
    : ModuleScriptLoader(client, promise, scriptFetcher, WTFMove(parameters))
    , m_scriptLoader(WorkerScriptLoader::create())
{
}

WorkerModuleScriptLoader::~WorkerModuleScriptLoader()
{
    m_scriptLoader->cancel();
}

bool WorkerModuleScriptLoader::load(ScriptExecutionContext& context, URL&& sourceURL)
{
    m_sourceURL = WTFMove(sourceURL);

    ResourceRequest request { m_sourceURL };

    FetchOptions fetchOptions;
    fetchOptions.mode = FetchOptions::Mode::Cors;
    fetchOptions.cache = FetchOptions::Cache::Default;
    fetchOptions.redirect = FetchOptions::Redirect::Follow;
    fetchOptions.credentials = static_cast<WorkerScriptFetcher&>(scriptFetcher()).credentials();
    auto contentSecurityPolicyEnforcement = context.shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceChildSrcDirective;

    String taskMode = "loadModulesInWorkerOrWorkletMode"_s;
    m_scriptLoader->loadAsynchronously(context, WTFMove(request), WTFMove(fetchOptions), contentSecurityPolicyEnforcement, ServiceWorkersMode::All, *this, WTFMove(taskMode));
    return true;
}

void WorkerModuleScriptLoader::notifyFinished()
{
    ASSERT(m_promise);

    auto protectedThis = makeRef(*this);
    if (m_client)
        m_client->notifyFinished(*this, WTFMove(m_sourceURL), m_promise.releaseNonNull());
}

}



/*
 * Copyright (C) 2021 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#include "ModuleScriptLoader.h"
#include "WorkerScriptLoaderClient.h"
#include <wtf/Ref.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
#include <wtf/URL.h>

namespace WebCore {

class DeferredPromise;
class JSDOMGlobalObject;
class ModuleFetchParameters;
class ScriptExecutionContext;
class ModuleScriptLoaderClient;
class WorkerScriptLoader;

class WorkerModuleScriptLoader final : public ModuleScriptLoader, private WorkerScriptLoaderClient {
public:
    static Ref<WorkerModuleScriptLoader> create(ModuleScriptLoaderClient&, DeferredPromise&, WorkerScriptFetcher&, RefPtr<ModuleFetchParameters>&&);

    virtual ~WorkerModuleScriptLoader();

    bool load(ScriptExecutionContext&, URL&& sourceURL);

    WorkerScriptLoader& scriptLoader() { return m_scriptLoader.get(); }

private:
    WorkerModuleScriptLoader(ModuleScriptLoaderClient&, DeferredPromise&, WorkerScriptFetcher&, RefPtr<ModuleFetchParameters>&&);

    void didReceiveResponse(unsigned long, const ResourceResponse&) final { }
    void notifyFinished() final;

    Ref<WorkerScriptLoader> m_scriptLoader;
    URL m_sourceURL;
};

} // namespace WebCore



/*
 * Copyright (C) 2021 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#pragma once

#include "LoadableScript.h"
#include <JavaScriptCore/ScriptFetcher.h>
#include <wtf/Optional.h>
#include <wtf/text/WTFString.h>

namespace WebCore {

class CachedScript;
class Document;

class WorkerScriptFetcher final : public JSC::ScriptFetcher {
public:
    static Ref<WorkerScriptFetcher> create(FetchOptions::Credentials credentials)
    {
        return adoptRef(*new WorkerScriptFetcher(credentials));
    }

    FetchOptions::Credentials credentials() const { return m_credentials; }

    void notifyLoadCompleted(UniquedStringImpl& moduleKey)
    {
        m_moduleKey = &moduleKey;
        m_isLoaded = true;
    }

    void notifyLoadFailed(LoadableScript::Error&& error)
    {
        m_error = WTFMove(error);
        m_isLoaded = true;
    }

    void notifyLoadWasCanceled()
    {
        m_wasCanceled = true;
        m_isLoaded = true;
    }

    bool isLoaded() const { return m_isLoaded; }
    Optional<LoadableScript::Error> error() const { return m_error; }
    bool wasCanceled() const { return m_wasCanceled; }
    UniquedStringImpl* moduleKey() const { return m_moduleKey.get(); }

protected:
    WorkerScriptFetcher(FetchOptions::Credentials credentials)
        : m_credentials(credentials)
    {
    }

private:
    FetchOptions::Credentials m_credentials;
    RefPtr<UniquedStringImpl> m_moduleKey;
    Optional<LoadableScript::Error> m_error;
    bool m_wasCanceled { false };
    bool m_isLoaded { false };
};

} // namespace WebCore

Lines 615-621 Document::Document(Frame* frame, const Settings& settings, const URL& url, Docum a/Source/WebCore/dom/Document.cpp_sec1
- a/Source/WebCore/dom/Document.cpp -1 / +1 lines
615	, m_documentCreationTime(MonotonicTime::now())	615	, m_documentCreationTime(MonotonicTime::now())
616	#endif	616	#endif
617	, m_scriptRunner(makeUnique<ScriptRunner>(*this))	617	, m_scriptRunner(makeUnique<ScriptRunner>(*this))
618	, m_moduleLoader(makeUnique<ScriptModuleLoader>(*this))	618	, m_moduleLoader(makeUnique<ScriptModuleLoader>(*this, ScriptModuleLoader::OwnerType::Document))
619	#if ENABLE(XSLT)	619	#if ENABLE(XSLT)
620	, m_applyPendingXSLTransformsTimer(*this, &Document::applyPendingXSLTransformsTimerFired)	620	, m_applyPendingXSLTransformsTimer(*this, &Document::applyPendingXSLTransformsTimerFired)
621	#endif	621	#endif



    scriptElement.executeModuleScript(*this);
}

void LoadableModuleScript::load(Document& document, const URL& rootURL)
{
    if (auto* frame = document.frame())
        frame->script().loadModuleScript(*this, rootURL.string(), m_parameters.copyRef());
}

void LoadableModuleScript::load(Document& document, const ScriptSourceCode& sourceCode)
{
    if (auto* frame = document.frame())
        frame->script().loadModuleScript(*this, sourceCode);
}

}




    void setError(Error&&);

    void load(Document&, const URL& rootURL);
    void load(Document&, const ScriptSourceCode&);

    void notifyLoadCompleted(UniquedStringImpl&);
    void notifyLoadFailed(LoadableScript::Error&&);
    void notifyLoadWasCanceled();

    UniquedStringImpl* moduleKey() const { return m_moduleKey.get(); }

    ModuleFetchParameters& parameters() { return m_parameters.get(); }

private:
    LoadableModuleScript(const String& nonce, const String& integrity, ReferrerPolicy, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree);


Lines 42-47 a/Source/WebCore/dom/ScriptElement.cpp_sec1
- a/Source/WebCore/dom/ScriptElement.cpp -2 / +7 lines
42	#include "LoadableClassicScript.h"	42	#include "LoadableClassicScript.h"
43	#include "LoadableModuleScript.h"	43	#include "LoadableModuleScript.h"
44	#include "MIMETypeRegistry.h"	44	#include "MIMETypeRegistry.h"
		45	#include "ModuleFetchParameters.h"
45	#include "PendingScript.h"	46	#include "PendingScript.h"
46	#include "RuntimeApplicationChecks.h"	47	#include "RuntimeApplicationChecks.h"
47	#include "SVGScriptElement.h"	48	#include "SVGScriptElement.h"
Lines 351-358 bool ScriptElement::requestModuleScript(const TextPosition& scriptStartPosition) a/Source/WebCore/dom/ScriptElement.cpp_sec2
351	scriptCharset(),	352	scriptCharset(),
352	m_element.localName(),	353	m_element.localName(),
353	m_element.isInUserAgentShadowTree());	354	m_element.isInUserAgentShadowTree());
354	script->load(m_element.document(), moduleScriptRootURL);
355	m_loadableScript = WTFMove(script);	355	m_loadableScript = WTFMove(script);
		356	if (auto* frame = m_element.document().frame()) {
		357	auto& script = downcast<LoadableModuleScript>(*m_loadableScript.get());
		358	frame->script().loadModuleScript(script, moduleScriptRootURL.string(), makeRef(script.parameters()));
		359	}
356	return true;	360	return true;
357	}	361	}
358		362
Lines 367-374 bool ScriptElement::requestModuleScript(const TextPosition& scriptStartPosition) a/Source/WebCore/dom/ScriptElement.cpp_sec3
367	if (!contentSecurityPolicy.allowInlineScript(m_element.document().url().string(), m_startLineNumber, sourceCode.source().toStringWithoutCopying(), hasKnownNonce))	371	if (!contentSecurityPolicy.allowInlineScript(m_element.document().url().string(), m_startLineNumber, sourceCode.source().toStringWithoutCopying(), hasKnownNonce))
368	return false;	372	return false;
369		373
370	script->load(m_element.document(), sourceCode);
371	m_loadableScript = WTFMove(script);	374	m_loadableScript = WTFMove(script);
		375	if (auto* frame = m_element.document().frame())
		376	frame->script().loadModuleScript(downcast<LoadableModuleScript>(*m_loadableScript.get()), sourceCode);
372	return true;	377	return true;
373	}	378	}
374		379



}


RefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext& context, ThreadableLoaderClient& client, ResourceRequest&& request, const ThreadableLoaderOptions& options, String&& referrer, String&& taskMode)
{
    if (is<WorkerGlobalScope>(context) || (is<WorkletGlobalScope>(context) && downcast<WorkletGlobalScope>(context).workerOrWorkletThread()))
        return WorkerThreadableLoader::create(static_cast<WorkerOrWorkletGlobalScope&>(context), client, WTFMove(taskMode), WTFMove(request), options, WTFMove(referrer));

    Document* document = nullptr;
    if (is<WorkletGlobalScope>(context))

Lines 74-80 namespace WebCore { a/Source/WebCore/loader/ThreadableLoader.h_sec1
- a/Source/WebCore/loader/ThreadableLoader.h -1 / +1 lines
74	WTF_MAKE_NONCOPYABLE(ThreadableLoader);	74	WTF_MAKE_NONCOPYABLE(ThreadableLoader);
75	public:	75	public:
76	static void loadResourceSynchronously(ScriptExecutionContext&, ResourceRequest&&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);	76	static void loadResourceSynchronously(ScriptExecutionContext&, ResourceRequest&&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
77	static RefPtr<ThreadableLoader> create(ScriptExecutionContext&, ThreadableLoaderClient&, ResourceRequest&&, const ThreadableLoaderOptions&, String&& referrer = String());	77	static RefPtr<ThreadableLoader> create(ScriptExecutionContext&, ThreadableLoaderClient&, ResourceRequest&&, const ThreadableLoaderOptions&, String&& referrer = String(), String&& taskMode = { });
78		78
79	virtual void computeIsDone() = 0;	79	virtual void computeIsDone() = 0;
80	virtual void cancel() = 0;	80	virtual void cancel() = 0;

Lines 70-75 inline Worker::Worker(ScriptExecutionContext& context, JSC::RuntimeFlags runtime a/Source/WebCore/workers/Worker.cpp_sec1
- a/Source/WebCore/workers/Worker.cpp -2 / +15 lines
70	, m_identifier("worker:" + Inspector::IdentifiersFactory::createIdentifier())	70	, m_identifier("worker:" + Inspector::IdentifiersFactory::createIdentifier())
71	, m_contextProxy(WorkerGlobalScopeProxy::create(*this))	71	, m_contextProxy(WorkerGlobalScopeProxy::create(*this))
72	, m_runtimeFlags(runtimeFlags)	72	, m_runtimeFlags(runtimeFlags)
		73	, m_type(options.type)
		74	, m_credentials(options.credentials)
73	{	75	{
74	static bool addedListener;	76	static bool addedListener;
75	if (!addedListener) {	77	if (!addedListener) {
Lines 113-122 ExceptionOr<Ref<Worker>> Worker::create(ScriptExecutionContext& context, JSC::Ru a/Source/WebCore/workers/Worker.cpp_sec2
113		115
114	FetchOptions fetchOptions;	116	FetchOptions fetchOptions;
115	fetchOptions.mode = FetchOptions::Mode::SameOrigin;	117	fetchOptions.mode = FetchOptions::Mode::SameOrigin;
		118	if (worker->m_type == WorkerType::Module)
		119	fetchOptions.credentials = worker->m_credentials;
		120	else
		121	fetchOptions.credentials = FetchOptions::Credentials::SameOrigin;
116	fetchOptions.cache = FetchOptions::Cache::Default;	122	fetchOptions.cache = FetchOptions::Cache::Default;
117	fetchOptions.redirect = FetchOptions::Redirect::Follow;	123	fetchOptions.redirect = FetchOptions::Redirect::Follow;
118	fetchOptions.destination = FetchOptions::Destination::Worker;	124	fetchOptions.destination = FetchOptions::Destination::Worker;
119	worker->m_scriptLoader->loadAsynchronously(context, WTFMove(request), WTFMove(fetchOptions), contentSecurityPolicyEnforcement, ServiceWorkersMode::All, worker);	125	worker->m_scriptLoader->loadAsynchronously(context, WTFMove(request), WTFMove(fetchOptions), contentSecurityPolicyEnforcement, ServiceWorkersMode::All, worker.get(), WorkerRunLoop::defaultMode());
		126
120	return worker;	127	return worker;
121	}	128	}
122		129
Lines 215-221 void Worker::notifyFinished() a/Source/WebCore/workers/Worker.cpp_sec3
215	ReferrerPolicy referrerPolicy = ReferrerPolicy::EmptyString;	222	ReferrerPolicy referrerPolicy = ReferrerPolicy::EmptyString;
216	if (auto policy = parseReferrerPolicy(m_scriptLoader->referrerPolicy(), ReferrerPolicySource::HTTPHeader))	223	if (auto policy = parseReferrerPolicy(m_scriptLoader->referrerPolicy(), ReferrerPolicySource::HTTPHeader))
217	referrerPolicy = *policy;	224	referrerPolicy = *policy;
218	m_contextProxy.startWorkerGlobalScope(m_scriptLoader->url(), m_name, context->userAgent(m_scriptLoader->url()), isOnline, m_scriptLoader->script(), contentSecurityPolicyResponseHeaders, m_shouldBypassMainWorldContentSecurityPolicy, m_workerCreationTime, referrerPolicy, m_runtimeFlags);	225
		226	URL responseURL = m_scriptLoader->responseURL();
		227	if (!m_scriptLoader->isRedirected() && m_scriptLoader->responseSource() != ResourceResponse::Source::ServiceWorker) {
		228	if (m_scriptLoader->url().hasFragmentIdentifier())
		229	responseURL.setFragmentIdentifier(m_scriptLoader->url().fragmentIdentifier());
		230	}
		231	m_contextProxy.startWorkerGlobalScope(responseURL, m_name, context->userAgent(responseURL), isOnline, m_scriptLoader->script(), contentSecurityPolicyResponseHeaders, m_shouldBypassMainWorldContentSecurityPolicy, m_workerCreationTime, referrerPolicy, m_type, m_credentials, m_runtimeFlags);
219	InspectorInstrumentation::scriptImported(*context, m_scriptLoader->identifier(), m_scriptLoader->script());	232	InspectorInstrumentation::scriptImported(*context, m_scriptLoader->identifier(), m_scriptLoader->script());
220	}	233	}
221		234

Lines 29-37 a/Source/WebCore/workers/Worker.h_sec1
- a/Source/WebCore/workers/Worker.h +8 lines
29	#include "ActiveDOMObject.h"	29	#include "ActiveDOMObject.h"
30	#include "ContentSecurityPolicyResponseHeaders.h"	30	#include "ContentSecurityPolicyResponseHeaders.h"
31	#include "EventTarget.h"	31	#include "EventTarget.h"
		32	#include "FetchRequestCredentials.h"
32	#include "MessagePort.h"	33	#include "MessagePort.h"
33	#include "PostMessageOptions.h"	34	#include "PostMessageOptions.h"
34	#include "WorkerScriptLoaderClient.h"	35	#include "WorkerScriptLoaderClient.h"
		36	#include "WorkerType.h"
35	#include <JavaScriptCore/RuntimeFlags.h>	37	#include <JavaScriptCore/RuntimeFlags.h>
36	#include <wtf/MonotonicTime.h>	38	#include <wtf/MonotonicTime.h>
37	#include <wtf/Optional.h>	39	#include <wtf/Optional.h>
Lines 55-60 class Worker final : public AbstractWorker, public ActiveDOMObject, private Work a/Source/WebCore/workers/Worker.h_sec2
55	WTF_MAKE_ISO_ALLOCATED(Worker);	57	WTF_MAKE_ISO_ALLOCATED(Worker);
56	public:	58	public:
57	struct Options {	59	struct Options {
		60	WorkerType type;
		61	FetchRequestCredentials credentials;
58	String name;	62	String name;
59	};	63	};
60	static ExceptionOr<Ref<Worker>> create(ScriptExecutionContext&, JSC::RuntimeFlags, const String& url, const Options&);	64	static ExceptionOr<Ref<Worker>> create(ScriptExecutionContext&, JSC::RuntimeFlags, const String& url, const Options&);
Lines 79-84 class Worker final : public AbstractWorker, public ActiveDOMObject, private Work a/Source/WebCore/workers/Worker.h_sec3
79	void postTaskToWorkerGlobalScope(Function<void(ScriptExecutionContext&)>&&);	83	void postTaskToWorkerGlobalScope(Function<void(ScriptExecutionContext&)>&&);
80	#endif	84	#endif
81		85
		86	WorkerType type() const { return m_type; }
		87
82	private:	88	private:
83	explicit Worker(ScriptExecutionContext&, JSC::RuntimeFlags, const Options&);	89	explicit Worker(ScriptExecutionContext&, JSC::RuntimeFlags, const Options&);
84		90
Lines 112-117 class Worker final : public AbstractWorker, public ActiveDOMObject, private Work a/Source/WebCore/workers/Worker.h_sec4
112	#if ENABLE(WEB_RTC)	118	#if ENABLE(WEB_RTC)
113	HashSet<String> m_transformers;	119	HashSet<String> m_transformers;
114	#endif	120	#endif
		121	WorkerType m_type { WorkerType::Classic };
		122	FetchRequestCredentials m_credentials { FetchRequestCredentials::SameOrigin };
115	};	123	};
116		124
117	} // namespace WebCore	125	} // namespace WebCore

Lines 38-43 a/Source/WebCore/workers/Worker.idl_sec1
- a/Source/WebCore/workers/Worker.idl +2 lines
38	};	38	};
39		39
40	dictionary WorkerOptions {	40	dictionary WorkerOptions {
		41	WorkerType type = "classic";
		42	FetchRequestCredentials credentials = "same-origin"; // credentials is only used if type is "module"
41	DOMString name = "";	43	DOMString name = "";
42	};	44	};
43		45

Lines 74-79 WorkerGlobalScope::WorkerGlobalScope(WorkerThreadType type, const WorkerParamete a/Source/WebCore/workers/WorkerGlobalScope.cpp_sec1
- a/Source/WebCore/workers/WorkerGlobalScope.cpp +7 lines
74	, m_performance(Performance::create(this, params.timeOrigin))	74	, m_performance(Performance::create(this, params.timeOrigin))
75	, m_referrerPolicy(params.referrerPolicy)	75	, m_referrerPolicy(params.referrerPolicy)
76	, m_settingsValues(params.settingsValues)	76	, m_settingsValues(params.settingsValues)
		77	, m_workerType(params.workerType)
		78	, m_credentials(params.credentials)
77	{	79	{
78	#if !ENABLE(INDEXED_DATABASE)	80	#if !ENABLE(INDEXED_DATABASE)
79	UNUSED_PARAM(connectionProxy);	81	UNUSED_PARAM(connectionProxy);
Lines 274-279 ExceptionOr<void> WorkerGlobalScope::importScripts(const Vector<String>& urls) a/Source/WebCore/workers/WorkerGlobalScope.cpp_sec2
274	{	276	{
275	ASSERT(contentSecurityPolicy());	277	ASSERT(contentSecurityPolicy());
276		278
		279	// https://html.spec.whatwg.org/multipage/workers.html#importing-scripts-and-libraries
		280	// 1. If worker global scope's type is "module", throw a TypeError exception.
		281	if (m_workerType == WorkerType::Module)
		282	return Exception { TypeError, "importScripts cannot be used if woerker type is \"module\""_s };
		283
277	Vector<URL> completedURLs;	284	Vector<URL> completedURLs;
278	completedURLs.reserveInitialCapacity(urls.size());	285	completedURLs.reserveInitialCapacity(urls.size());
279	for (auto& entry : urls) {	286	for (auto& entry : urls) {

Lines 123-128 class WorkerGlobalScope : public Supplementable<WorkerGlobalScope>, public Base6 a/Source/WebCore/workers/WorkerGlobalScope.h_sec1
- a/Source/WebCore/workers/WorkerGlobalScope.h -2 / +4 lines
123		123
124	const Settings::Values& settingsValues() const final { return m_settingsValues; }	124	const Settings::Values& settingsValues() const final { return m_settingsValues; }
125		125
		126	FetchOptions::Credentials credentials() const { return m_credentials; }
		127
126	protected:	128	protected:
127	WorkerGlobalScope(WorkerThreadType, const WorkerParameters&, Ref<SecurityOrigin>&&, WorkerThread&, Ref<SecurityOrigin>&& topOrigin, IDBClient::IDBConnectionProxy, SocketProvider);	129	WorkerGlobalScope(WorkerThreadType, const WorkerParameters&, Ref<SecurityOrigin>&&, WorkerThread&, Ref<SecurityOrigin>&& topOrigin, IDBClient::IDBConnectionProxy, SocketProvider);
128		130
Lines 163-170 class WorkerGlobalScope : public Supplementable<WorkerGlobalScope>, public Base6 a/Source/WebCore/workers/WorkerGlobalScope.h_sec2
163	mutable RefPtr<WorkerLocation> m_location;	165	mutable RefPtr<WorkerLocation> m_location;
164	mutable RefPtr<WorkerNavigator> m_navigator;	166	mutable RefPtr<WorkerNavigator> m_navigator;
165		167
166	std::unique_ptr<WorkerOrWorkletScriptController> m_script;
167
168	bool m_isOnline;	168	bool m_isOnline;
169	bool m_shouldBypassMainWorldContentSecurityPolicy;	169	bool m_shouldBypassMainWorldContentSecurityPolicy;
170		170
Lines 187-192 class WorkerGlobalScope : public Supplementable<WorkerGlobalScope>, public Base6 a/Source/WebCore/workers/WorkerGlobalScope.h_sec3
187	std::unique_ptr<CSSValuePool> m_cssValuePool;	187	std::unique_ptr<CSSValuePool> m_cssValuePool;
188	ReferrerPolicy m_referrerPolicy;	188	ReferrerPolicy m_referrerPolicy;
189	Settings::Values m_settingsValues;	189	Settings::Values m_settingsValues;
		190	WorkerType m_workerType;
		191	FetchOptions::Credentials m_credentials;
190	};	192	};
191		193
192	} // namespace WebCore	194	} // namespace WebCore

Lines 48-54 class WorkerGlobalScopeProxy { a/Source/WebCore/workers/WorkerGlobalScopeProxy.h_sec1
- a/Source/WebCore/workers/WorkerGlobalScopeProxy.h -1 / +1 lines
48	public:	48	public:
49	static WorkerGlobalScopeProxy& create(Worker&);	49	static WorkerGlobalScopeProxy& create(Worker&);
50		50
51	virtual void startWorkerGlobalScope(const URL& scriptURL, const String& name, const String& userAgent, bool isOnline, const String& sourceCode, const ContentSecurityPolicyResponseHeaders&, bool shouldBypassMainWorldContentSecurityPolicy, MonotonicTime timeOrigin, ReferrerPolicy, JSC::RuntimeFlags) = 0;	51	virtual void startWorkerGlobalScope(const URL& scriptURL, const String& name, const String& userAgent, bool isOnline, const String& sourceCode, const ContentSecurityPolicyResponseHeaders&, bool shouldBypassMainWorldContentSecurityPolicy, MonotonicTime timeOrigin, ReferrerPolicy, WorkerType, FetchRequestCredentials, JSC::RuntimeFlags) = 0;
52	virtual void terminateWorkerGlobalScope() = 0;	52	virtual void terminateWorkerGlobalScope() = 0;
53	virtual void postMessageToWorkerGlobalScope(MessageWithMessagePorts&&) = 0;	53	virtual void postMessageToWorkerGlobalScope(MessageWithMessagePorts&&) = 0;
54	virtual void postTaskToWorkerGlobalScope(Function<void(ScriptExecutionContext&)>&&) = 0;	54	virtual void postTaskToWorkerGlobalScope(Function<void(ScriptExecutionContext&)>&&) = 0;



        || (is<WorkerGlobalScope>(*m_scriptExecutionContext) && downcast<WorkerGlobalScope>(*m_scriptExecutionContext).thread().thread() == &Thread::current()));
}

void WorkerMessagingProxy::startWorkerGlobalScope(const URL& scriptURL, const String& name, const String& userAgent, bool isOnline, const String& sourceCode, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicyResponseHeaders, bool shouldBypassMainWorldContentSecurityPolicy, MonotonicTime timeOrigin, ReferrerPolicy referrerPolicy, WorkerType workerType, FetchRequestCredentials credentials, JSC::RuntimeFlags runtimeFlags)
{
    // FIXME: This need to be revisited when we support nested worker one day
    ASSERT(m_scriptExecutionContext);


    SocketProvider* socketProvider = document.socketProvider();

    WorkerParameters params = { scriptURL, name, identifier, userAgent, isOnline, contentSecurityPolicyResponseHeaders, shouldBypassMainWorldContentSecurityPolicy, timeOrigin, referrerPolicy, workerType, credentials, document.settingsValues() };
    auto thread = DedicatedWorkerThread::create(params, sourceCode, *this, *this, *this, startMode, document.topOrigin(), proxy, socketProvider, runtimeFlags);

    workerThreadCreated(thread.get());

Lines 50-56 class WorkerMessagingProxy final : public ThreadSafeRefCounted<WorkerMessagingPr a/Source/WebCore/workers/WorkerMessagingProxy.h_sec1
- a/Source/WebCore/workers/WorkerMessagingProxy.h -1 / +1 lines
50	private:	50	private:
51	// Implementations of WorkerGlobalScopeProxy.	51	// Implementations of WorkerGlobalScopeProxy.
52	// (Only use these functions in the worker object thread.)	52	// (Only use these functions in the worker object thread.)
53	void startWorkerGlobalScope(const URL& scriptURL, const String& name, const String& userAgent, bool isOnline, const String& sourceCode, const ContentSecurityPolicyResponseHeaders&, bool shouldBypassMainWorldContentSecurityPolicy, MonotonicTime timeOrigin, ReferrerPolicy, JSC::RuntimeFlags) final;	53	void startWorkerGlobalScope(const URL& scriptURL, const String& name, const String& userAgent, bool isOnline, const String& sourceCode, const ContentSecurityPolicyResponseHeaders&, bool shouldBypassMainWorldContentSecurityPolicy, MonotonicTime timeOrigin, ReferrerPolicy, WorkerType, FetchRequestCredentials, JSC::RuntimeFlags) final;
54	void terminateWorkerGlobalScope() final;	54	void terminateWorkerGlobalScope() final;
55	void postMessageToWorkerGlobalScope(MessageWithMessagePorts&&) final;	55	void postMessageToWorkerGlobalScope(MessageWithMessagePorts&&) final;
56	void postTaskToWorkerGlobalScope(Function<void(ScriptExecutionContext&)>&&) final;	56	void postTaskToWorkerGlobalScope(Function<void(ScriptExecutionContext&)>&&) final;



#include "config.h"
#include "WorkerOrWorkletGlobalScope.h"

#include "ScriptModuleLoader.h"
#include "WorkerEventLoop.h"
#include "WorkerInspectorController.h"
#include "WorkerOrWorkletScriptController.h"


WorkerOrWorkletGlobalScope::WorkerOrWorkletGlobalScope(WorkerThreadType type, Ref<JSC::VM>&& vm, WorkerOrWorkletThread* thread)
    : m_script(makeUnique<WorkerOrWorkletScriptController>(type, WTFMove(vm), this))
    , m_moduleLoader(makeUnique<ScriptModuleLoader>(*this, ScriptModuleLoader::OwnerType::WorkerOrWorklet))
    , m_thread(thread)
    , m_inspectorController(makeUnique<WorkerInspectorController>(*this))
{

Lines 32-37 a/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h_sec1
- a/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h +4 lines
32	namespace WebCore {	32	namespace WebCore {
33		33
34	class EventLoopTaskGroup;	34	class EventLoopTaskGroup;
		35	class ScriptModuleLoader;
35	class WorkerEventLoop;	36	class WorkerEventLoop;
36	class WorkerInspectorController;	37	class WorkerInspectorController;
37	class WorkerOrWorkletScriptController;	38	class WorkerOrWorkletScriptController;
Lines 54-59 class WorkerOrWorkletGlobalScope : public ScriptExecutionContext, public RefCoun a/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h_sec2
54		55
55	unsigned long createUniqueIdentifier() { return m_uniqueIdentifier++; }	56	unsigned long createUniqueIdentifier() { return m_uniqueIdentifier++; }
56		57
		58	ScriptModuleLoader& moduleLoader() { return *m_moduleLoader; }
		59
57	// ScriptExecutionContext.	60	// ScriptExecutionContext.
58	EventLoopTaskGroup& eventLoop() final;	61	EventLoopTaskGroup& eventLoop() final;
59	bool isContextThread() const final;	62	bool isContextThread() const final;
Lines 88-93 class WorkerOrWorkletGlobalScope : public ScriptExecutionContext, public RefCoun a/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h_sec3
88	void derefEventTarget() final { deref(); }	91	void derefEventTarget() final { deref(); }
89		92
90	std::unique_ptr<WorkerOrWorkletScriptController> m_script;	93	std::unique_ptr<WorkerOrWorkletScriptController> m_script;
		94	std::unique_ptr<ScriptModuleLoader> m_moduleLoader;
91	WorkerOrWorkletThread* m_thread;	95	WorkerOrWorkletThread* m_thread;
92	RefPtr<WorkerEventLoop> m_eventLoop;	96	RefPtr<WorkerEventLoop> m_eventLoop;
93	std::unique_ptr<EventLoopTaskGroup> m_defaultTaskGroup;	97	std::unique_ptr<EventLoopTaskGroup> m_defaultTaskGroup;

Lines 35-49 a/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp_sec1
- a/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp +201 lines
35	#include "JSExecState.h"	35	#include "JSExecState.h"
36	#include "JSPaintWorkletGlobalScope.h"	36	#include "JSPaintWorkletGlobalScope.h"
37	#include "JSServiceWorkerGlobalScope.h"	37	#include "JSServiceWorkerGlobalScope.h"
		38	#include "ModuleFetchFailureKind.h"
		39	#include "ModuleFetchParameters.h"
38	#include "ScriptSourceCode.h"	40	#include "ScriptSourceCode.h"
39	#include "WebCoreJSClientData.h"	41	#include "WebCoreJSClientData.h"
40	#include "WorkerConsoleClient.h"	42	#include "WorkerConsoleClient.h"
		43	#include "WorkerScriptFetcher.h"
41	#include <JavaScriptCore/Completion.h>	44	#include <JavaScriptCore/Completion.h>
42	#include <JavaScriptCore/DeferredWorkTimer.h>	45	#include <JavaScriptCore/DeferredWorkTimer.h>
43	#include <JavaScriptCore/Exception.h>	46	#include <JavaScriptCore/Exception.h>
44	#include <JavaScriptCore/ExceptionHelpers.h>	47	#include <JavaScriptCore/ExceptionHelpers.h>
45	#include <JavaScriptCore/GCActivityCallback.h>	48	#include <JavaScriptCore/GCActivityCallback.h>
		49	#include <JavaScriptCore/JSInternalPromise.h>
46	#include <JavaScriptCore/JSLock.h>	50	#include <JavaScriptCore/JSLock.h>
		51	#include <JavaScriptCore/JSModuleRecord.h>
		52	#include <JavaScriptCore/JSNativeStdFunction.h>
		53	#include <JavaScriptCore/JSScriptFetchParameters.h>
		54	#include <JavaScriptCore/JSScriptFetcher.h>
47	#include <JavaScriptCore/StrongInlines.h>	55	#include <JavaScriptCore/StrongInlines.h>
48		56
49	namespace WebCore {	57	namespace WebCore {
Lines 228-233 void WorkerOrWorkletScriptController::evaluate(const ScriptSourceCode& sourceCod a/Source/WebCore/workers/WorkerOrWorkletScriptController.cpp_sec2
228	}	236	}
229	}	237	}
230		238
		239	static Identifier jsValueToModuleKey(JSGlobalObject* lexicalGlobalObject, JSValue value)
		240	{
		241	if (value.isSymbol())
		242	return Identifier::fromUid(jsCast<Symbol*>(value)->privateName());
		243	ASSERT(value.isString());
		244	return asString(value)->toIdentifier(lexicalGlobalObject);
		245	}
		246
		247	JSC::JSValue WorkerOrWorkletScriptController::evaluateModule(JSC::JSModuleRecord& moduleRecord)
		248	{
		249	auto& globalObject = *m_globalScopeWrapper.get();
		250	VM& vm = globalObject.vm();
		251	JSLockHolder lock { vm };
		252	return moduleRecord.evaluate(&globalObject);
		253	}
		254
		255	MessageQueueWaitResult WorkerOrWorkletScriptController::loadModuleSynchronously(WorkerScriptFetcher& scriptFetcher, const ScriptSourceCode& sourceCode)
		256	{
		257	if (isExecutionForbidden())
		258	return MessageQueueTerminated;
		259
		260	initScriptIfNeeded();
		261
		262	auto& globalObject = *m_globalScopeWrapper.get();
		263	VM& vm = globalObject.vm();
		264	JSLockHolder lock { vm };
		265
		266	RefPtr<WorkerScriptFetcher> fetcherRef(&scriptFetcher);
		267	{
		268	auto& promise = JSExecState::loadModule(globalObject, sourceCode.jsSourceCode(), JSC::JSScriptFetcher::create(vm, { &scriptFetcher }));
		269
		270	auto& fulfillHandler = JSNativeStdFunction::create(vm, &globalObject, 1, String(), [fetcherRef](JSGlobalObject globalObject, CallFrame* callFrame) -> JSC::EncodedJSValue {
		271	VM& vm = globalObject->vm();
		272	auto scope = DECLARE_THROW_SCOPE(vm);
		273	Identifier moduleKey = jsValueToModuleKey(globalObject, callFrame->argument(0));
		274	RETURN_IF_EXCEPTION(scope, { });
		275	fetcherRef->notifyLoadCompleted(*moduleKey.impl());
		276	return JSValue::encode(jsUndefined());
		277	});
		278
		279	auto& rejectHandler = JSNativeStdFunction::create(vm, &globalObject, 1, String(), [fetcherRef](JSGlobalObject globalObject, CallFrame* callFrame) {
		280	VM& vm = globalObject->vm();
		281	JSValue errorValue = callFrame->argument(0);
		282	if (errorValue.isObject()) {
		283	auto* object = JSC::asObject(errorValue);
		284	if (JSValue failureKindValue = object->getDirect(vm, static_cast<JSVMClientData&>(*vm.clientData).builtinNames().failureKindPrivateName())) {
		285	// This is host propagated error in the module loader pipeline.
		286	switch (static_cast<ModuleFetchFailureKind>(failureKindValue.asInt32())) {
		287	case ModuleFetchFailureKind::WasErrored:
		288	fetcherRef->notifyLoadFailed(LoadableScript::Error {
		289	LoadableScript::ErrorType::CachedScript,
		290	WTF::nullopt
		291	});
		292	break;
		293	case ModuleFetchFailureKind::WasCanceled:
		294	fetcherRef->notifyLoadWasCanceled();
		295	break;
		296	}
		297	return JSValue::encode(jsUndefined());
		298	}
		299	}
		300
		301	auto scope = DECLARE_CATCH_SCOPE(vm);
		302	fetcherRef->notifyLoadFailed(LoadableScript::Error {
303	LoadableScript::ErrorType::CachedScript,
304	LoadableScript::ConsoleMessage {
305	MessageSource::JS,
306	MessageLevel::Error,
307	retrieveErrorMessage(*globalObject, vm, errorValue, scope),
308	}
309	});
310	return JSValue::encode(jsUndefined());
311	});
312
313	promise.then(&globalObject, &fulfillHandler, &rejectHandler);
314	}
315	m_globalScope->eventLoop().performMicrotaskCheckpoint();
316
317	// Drive RunLoop until we get either of "Worker is terminated", "Loading is done", or "Loading is failed".
318	WorkerRunLoop& runLoop = m_globalScope->workerOrWorkletThread()->runLoop();
319
320	// We do not want to receive messages that are not related to asynchronous resource loading.
321	// Otherwise, a worker discards some messages from the main thread here in a racy way.
322	// For example, the main thread can postMessage just after creating a Worker. In that case, postMessage's
323	// task is queued in WorkerRunLoop before start running module scripts. This task should not be discarded
324	// in the following driving of the RunLoop which mainly attempt to collect initial load of module scripts.
325	String taskMode = "loadModulesInWorkerOrWorkletMode"_s;
326	MessageQueueWaitResult result = MessageQueueMessageReceived;
327	while ((!fetcherRef->isLoaded() && !fetcherRef->wasCanceled()) && result != MessageQueueTerminated) {
328	result = runLoop.runInMode(m_globalScope, taskMode);
329	if (result != MessageQueueTerminated)
330	m_globalScope->eventLoop().performMicrotaskCheckpoint();
331	}
332
333	// FIXME: Currently we are not offering cancelling.
334	// if (!loader->done() && result == MessageQueueTerminated)
335	// loader->cancel();
336
337	return result;
338	}
339
340	void WorkerOrWorkletScriptController::linkAndEvaluateModule(WorkerScriptFetcher& scriptFetcher, const ScriptSourceCode& sourceCode, String* returnedExceptionMessage)
341	{
342	if (isExecutionForbidden())
343	return;
344
345	initScriptIfNeeded();
346
347	auto& globalObject = *m_globalScopeWrapper.get();
348	VM& vm = globalObject.vm();
349	JSLockHolder lock { vm };
350
351	NakedPtr<JSC::Exception> returnedException;
352	JSExecState::linkAndEvaluateModule(globalObject, Identifier::fromUid(vm, scriptFetcher.moduleKey()), jsUndefined(), returnedException);
353	if ((returnedException && isTerminatedExecutionException(vm, returnedException)) \|\| isTerminatingExecution()) {
354	forbidExecution();
355	return;
356	}
357
358	if (returnedException) {
359	if (m_globalScope->canIncludeErrorDetails(sourceCode.cachedScript(), sourceCode.url().string())) {
360	// FIXME: It's not great that this can run arbitrary code to string-ify the value of the exception.
361	// Do we need to do anything to handle that properly, if it, say, raises another exception?
362	if (returnedExceptionMessage)
363	*returnedExceptionMessage = returnedException->value().toWTFString(&globalObject);
364	} else {
365	// Overwrite the detailed error with a generic error.
366	String genericErrorMessage { "Script error."_s };
367	if (returnedExceptionMessage)
368	*returnedExceptionMessage = genericErrorMessage;
369	returnedException = JSC::Exception::create(vm, createError(&globalObject, genericErrorMessage));
370	}
371	}
372	}
373
374	void WorkerOrWorkletScriptController::loadAndEvaluateModule(const URL& moduleURL, FetchOptions::Credentials credentials, CompletionHandler<void(Optional<Exception>&&)>&& completionHandler)
375	{
376	if (isExecutionForbidden()) {
377	completionHandler(Exception { NotAllowedError });
378	return;
379	}
380
381	initScriptIfNeeded();
382
383	auto& globalObject = *m_globalScopeWrapper.get();
384	VM& vm = globalObject.vm();
385	JSLockHolder lock { vm };
386
387	auto scriptFetcher = WorkerScriptFetcher::create(credentials);
388	{
389	auto& promise = JSExecState::loadAndEvaluateModule(globalObject, moduleURL.string(), jsUndefined(), JSC::JSScriptFetcher::create(vm, { scriptFetcher.ptr() }));
390
391	auto task = createSharedTask<void(Optional<Exception>&&)>([completionHandler = WTFMove(completionHandler)](Optional<Exception>&& exception) mutable {
392	completionHandler(WTFMove(exception));
393	});
394
395	auto& fulfillHandler = JSNativeStdFunction::create(vm, &globalObject, 1, String(), [task](JSGlobalObject globalObject, CallFrame* callFrame) -> JSC::EncodedJSValue {
396	VM& vm = globalObject->vm();
397	auto scope = DECLARE_THROW_SCOPE(vm);
398	Identifier moduleKey = jsValueToModuleKey(globalObject, callFrame->argument(0));
399	RETURN_IF_EXCEPTION(scope, { });
400	task->run(WTF::nullopt);
401	return JSValue::encode(jsUndefined());
402	});
403
404	auto& rejectHandler = JSNativeStdFunction::create(vm, &globalObject, 1, String(), [task](JSGlobalObject globalObject, CallFrame* callFrame) {
405	VM& vm = globalObject->vm();
406	JSValue errorValue = callFrame->argument(0);
407	if (errorValue.isObject()) {
408	auto* object = JSC::asObject(errorValue);
409	if (JSValue failureKindValue = object->getDirect(vm, static_cast<JSVMClientData&>(*vm.clientData).builtinNames().failureKindPrivateName())) {
410	// This is host propagated error in the module loader pipeline.
411	switch (static_cast<ModuleFetchFailureKind>(failureKindValue.asInt32())) {
412	case ModuleFetchFailureKind::WasErrored:
413	case ModuleFetchFailureKind::WasCanceled:
414	task->run(Exception { NetworkError });
415	break;
416	}
417	return JSValue::encode(jsUndefined());
418	}
419	}
420
421	auto scope = DECLARE_CATCH_SCOPE(vm);
422	String string = retrieveErrorMessage(*globalObject, vm, errorValue, scope);
423	task->run(Exception { TypeError, string });
424	return JSValue::encode(jsUndefined());
425	});
426
427	promise.then(&globalObject, &fulfillHandler, &rejectHandler);
428	}
429	m_globalScope->eventLoop().performMicrotaskCheckpoint();
430	}
431
231	template<typename JSGlobalScopePrototype, typename JSGlobalScope, typename GlobalScope>	432	template<typename JSGlobalScopePrototype, typename JSGlobalScope, typename GlobalScope>
232	void WorkerOrWorkletScriptController::initScriptWithSubclass()	433	void WorkerOrWorkletScriptController::initScriptWithSubclass()
233	{	434	{



#include <JavaScriptCore/JSRunLoopTimer.h>
#include <wtf/Forward.h>
#include <wtf/Lock.h>
#include <wtf/MessageQueue.h>
#include <wtf/NakedPtr.h>

namespace JSC {

namespace WebCore {

class JSDOMGlobalObject;
class LoadableModuleScript;
class ScriptSourceCode;
class WorkerConsoleClient;
class WorkerOrWorkletGlobalScope;
class WorkerScriptFetcher;

class WorkerOrWorkletScriptController {
    WTF_MAKE_NONCOPYABLE(WorkerOrWorkletScriptController);

    void evaluate(const ScriptSourceCode&, String* returnedExceptionMessage = nullptr);
    void evaluate(const ScriptSourceCode&, NakedPtr<JSC::Exception>& returnedException, String* returnedExceptionMessage = nullptr);

    JSC::JSValue evaluateModule(JSC::JSModuleRecord&);

    void linkAndEvaluateModule(WorkerScriptFetcher&, const ScriptSourceCode&, String* returnedExceptionMessage = nullptr);
    MessageQueueWaitResult loadModuleSynchronously(WorkerScriptFetcher&, const ScriptSourceCode&);

    void loadAndEvaluateModule(const URL& moduleURL, FetchOptions::Credentials, CompletionHandler<void(Optional<Exception>&&)>&&);

protected:
    WorkerOrWorkletGlobalScope* globalScope() const { return m_globalScope; }




    return WTF::nullopt;
}

void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext& scriptExecutionContext, ResourceRequest&& scriptRequest, FetchOptions&& fetchOptions, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, ServiceWorkersMode serviceWorkerMode, WorkerScriptLoaderClient& client, String&& taskMode)
{
    m_client = &client;
    m_url = scriptRequest.url();

    ASSERT(fetchOptions.mode == FetchOptions::Mode::SameOrigin || (fetchOptions.destination != FetchOptions::Destination::Serviceworker && fetchOptions.destination != FetchOptions::Destination::Worker));

    ThreadableLoaderOptions options { WTFMove(fetchOptions) };
    // FIXME: We should add an option to set credential mode.
    options.credentials = FetchOptions::Credentials::SameOrigin;
    options.sendLoadCallbacks = SendCallbackPolicy::SendCallbacks;
    options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
    if (fetchOptions.destination == FetchOptions::Destination::Serviceworker)


    // During create, callbacks may happen which remove the last reference to this object.
    Ref<WorkerScriptLoader> protectedThis(*this);
    m_threadableLoader = ThreadableLoader::create(scriptExecutionContext, *this, WTFMove(*request), options, { }, WTFMove(taskMode));
}

const URL& WorkerScriptLoader::responseURL() const

    m_certificateInfo = response.certificateInfo() ? *response.certificateInfo() : CertificateInfo();
    m_responseMIMEType = response.mimeType();
    m_responseEncoding = response.textEncodingName();
    m_responseSource = response.source();
    m_isRedirected = response.isRedirected();
    m_contentSecurityPolicy = ContentSecurityPolicyResponseHeaders { response };
    m_referrerPolicy = response.httpHeaderField(HTTPHeaderName::ReferrerPolicy);
    if (m_client)



#include "FetchOptions.h"
#include "ResourceError.h"
#include "ResourceRequest.h"
#include "ResourceResponse.h"
#include "ThreadableLoader.h"
#include "ThreadableLoaderClient.h"
#include <memory>

namespace WebCore {

class Exception;
class ResourceResponse;
class ScriptExecutionContext;
class TextResourceDecoder;
class WorkerScriptLoaderClient;

    }

    Optional<Exception> loadSynchronously(ScriptExecutionContext*, const URL&, FetchOptions::Mode, FetchOptions::Cache, ContentSecurityPolicyEnforcement, const String& initiatorIdentifier);
    void loadAsynchronously(ScriptExecutionContext&, ResourceRequest&&, FetchOptions&&, ContentSecurityPolicyEnforcement, ServiceWorkersMode, WorkerScriptLoaderClient&, String&& taskMode);

    void notifyError();


    const String& referrerPolicy() const { return m_referrerPolicy; }
    const URL& url() const { return m_url; }
    const URL& responseURL() const;
    ResourceResponse::Source responseSource() const { return m_responseSource; }
    bool isRedirected() const { return m_isRedirected; }
    const CertificateInfo& certificateInfo() const { return m_certificateInfo; }
    const String& responseMIMEType() const { return m_responseMIMEType; }
    bool failed() const { return m_failed; }

    unsigned long m_identifier { 0 };
    bool m_failed { false };
    bool m_finishing { false };
    bool m_isRedirected { false };
    ResourceResponse::Source m_responseSource { ResourceResponse::Source::Unknown };
    ResourceError m_error;
};


Lines 32-37 a/Source/WebCore/workers/WorkerThread.cpp_sec1
- a/Source/WebCore/workers/WorkerThread.cpp -3 / +31 lines
32	#include "SecurityOrigin.h"	32	#include "SecurityOrigin.h"
33	#include "SocketProvider.h"	33	#include "SocketProvider.h"
34	#include "WorkerGlobalScope.h"	34	#include "WorkerGlobalScope.h"
		35	#include "WorkerScriptFetcher.h"
		36	#include <JavaScriptCore/ScriptCallStack.h>
35	#include <wtf/Threading.h>	37	#include <wtf/Threading.h>
36		38
37	namespace WebCore {	39	namespace WebCore {
Lines 55-60 WorkerParameters WorkerParameters::isolatedCopy() const a/Source/WebCore/workers/WorkerThread.cpp_sec2
55	shouldBypassMainWorldContentSecurityPolicy,	57	shouldBypassMainWorldContentSecurityPolicy,
56	timeOrigin,	58	timeOrigin,
57	referrerPolicy,	59	referrerPolicy,
		60	workerType,
		61	credentials,
58	settingsValues.isolatedCopy()	62	settingsValues.isolatedCopy()
59	};	63	};
60	}	64	}
Lines 123-131 bool WorkerThread::shouldWaitForWebInspectorOnStartup() const a/Source/WebCore/workers/WorkerThread.cpp_sec3
123		127
124	void WorkerThread::evaluateScriptIfNecessary(String& exceptionMessage)	128	void WorkerThread::evaluateScriptIfNecessary(String& exceptionMessage)
125	{	129	{
126	globalScope()->script()->evaluate(ScriptSourceCode(m_startupData->sourceCode, URL(m_startupData->params.scriptURL)), &exceptionMessage);	130	// We are currently holding only the initial script code. If the WorkerType is Module, we should fetch the entire graph before executing the rest of this.
127		131	// We invoke module loader as if we are executing inline module script tag in Document.
128	finishedEvaluatingScript();	132
		133	if (m_startupData->params.workerType == WorkerType::Classic) {
		134	globalScope()->script()->evaluate(ScriptSourceCode(m_startupData->sourceCode, URL(m_startupData->params.scriptURL)), &exceptionMessage);
		135	finishedEvaluatingScript();
		136	} else {
		137	// FIXME crossOrigin mode should be converted.
		138	// FIXME fix initiator name.
		139	// FIXME pass URL to module loader.
		140	ScriptSourceCode sourceCode(m_startupData->sourceCode, URL(m_startupData->params.scriptURL), { }, JSC::SourceProviderSourceType::Module);
		141	auto scriptFetcher = WorkerScriptFetcher::create(globalScope()->credentials());
		142	MessageQueueWaitResult result = globalScope()->script()->loadModuleSynchronously(scriptFetcher.get(), sourceCode);
		143	if (result != MessageQueueTerminated) {
		144	if (Optional<LoadableScript::Error> error = scriptFetcher->error()) {
		145	if (Optional<LoadableScript::ConsoleMessage> message = error->consoleMessage)
		146	exceptionMessage = message->message;
		147	else
		148	exceptionMessage = "Importing a module script failed."_s;
		149	globalScope()->reportException(exceptionMessage, { }, { }, { }, { }, { });
		150	} else if (!scriptFetcher->wasCanceled()) {
		151	// Evaluate.
		152	globalScope()->script()->linkAndEvaluateModule(scriptFetcher.get(), sourceCode, &exceptionMessage);
		153	finishedEvaluatingScript();
		154	}
		155	}
		156	}
129		157
130	// Free the startup data to cause its member variable deref's happen on the worker's thread (since	158	// Free the startup data to cause its member variable deref's happen on the worker's thread (since
131	// all ref/derefs of these objects are happening on the thread at this point). Note that	159	// all ref/derefs of these objects are happening on the thread at this point). Note that

Lines 26-32 a/Source/WebCore/workers/WorkerThread.h_sec1
- a/Source/WebCore/workers/WorkerThread.h +5 lines
26	#pragma once	26	#pragma once
27		27
28	#include "ContentSecurityPolicyResponseHeaders.h"	28	#include "ContentSecurityPolicyResponseHeaders.h"
		29	#include "FetchRequestCredentials.h"
29	#include "WorkerOrWorkletThread.h"	30	#include "WorkerOrWorkletThread.h"
		31	#include "WorkerRunLoop.h"
		32	#include "WorkerType.h"
30	#include <JavaScriptCore/RuntimeFlags.h>	33	#include <JavaScriptCore/RuntimeFlags.h>
31	#include <memory>	34	#include <memory>
32	#include <wtf/URL.h>	35	#include <wtf/URL.h>
Lines 63-68 struct WorkerParameters { a/Source/WebCore/workers/WorkerThread.h_sec2
63	bool shouldBypassMainWorldContentSecurityPolicy;	66	bool shouldBypassMainWorldContentSecurityPolicy;
64	MonotonicTime timeOrigin;	67	MonotonicTime timeOrigin;
65	ReferrerPolicy referrerPolicy;	68	ReferrerPolicy referrerPolicy;
		69	WorkerType workerType;
		70	FetchRequestCredentials credentials;
66	Settings::Values settingsValues;	71	Settings::Values settingsValues;
67		72
68	WorkerParameters isolatedCopy() const;	73	WorkerParameters isolatedCopy() const;

Lines 27-33 a/Source/WebCore/workers/WorkerType.h_sec1
- a/Source/WebCore/workers/WorkerType.h -1 / +1 lines
27		27
28	namespace WebCore {	28	namespace WebCore {
29		29
30	enum class WorkerType {	30	enum class WorkerType : uint8_t {
31	Classic,	31	Classic,
32	Module,	32	Module,
33	};	33	};

Lines 47-53 class NavigatorBase; a/Source/WebCore/workers/service/ServiceWorkerContainer.h_sec1
- a/Source/WebCore/workers/service/ServiceWorkerContainer.h -1 / +1 lines
47	class ServiceWorker;	47	class ServiceWorker;
48		48
49	enum class ServiceWorkerUpdateViaCache : uint8_t;	49	enum class ServiceWorkerUpdateViaCache : uint8_t;
50	enum class WorkerType;	50	enum class WorkerType : uint8_t;
51		51
52	template<typename IDLType> class DOMPromiseProxy;	52	template<typename IDLType> class DOMPromiseProxy;
53		53



    options.cache = cachePolicy;
    options.redirect = FetchOptions::Redirect::Error;
    options.destination = FetchOptions::Destination::Serviceworker;
    options.credentials = FetchOptions::Credentials::SameOrigin;
    m_scriptLoader->loadAsynchronously(context, WTFMove(request), WTFMove(options), ContentSecurityPolicyEnforcement::DoNotEnforce, ServiceWorkersMode::None, *this, WorkerRunLoop::defaultMode());
}

ResourceError ServiceWorkerJob::validateServiceWorkerResponse(const ServiceWorkerJobData& jobData, const ResourceResponse& response)

Lines 32-38 a/Source/WebCore/workers/service/ServiceWorkerRegistrationOptions.h_sec1
- a/Source/WebCore/workers/service/ServiceWorkerRegistrationOptions.h -1 / +1 lines
32	namespace WebCore {	32	namespace WebCore {
33		33
34	enum class ServiceWorkerUpdateViaCache : uint8_t;	34	enum class ServiceWorkerUpdateViaCache : uint8_t;
35	enum class WorkerType;	35	enum class WorkerType : uint8_t;
36		36
37	struct ServiceWorkerRegistrationOptions {	37	struct ServiceWorkerRegistrationOptions {
38	String scope;	38	String scope;



// FIXME: Use a valid WorkerObjectProxy
// FIXME: Use valid runtime flags

// FIXME: Use a valid WorkerType and Credentails for module service workers.
ServiceWorkerThread::ServiceWorkerThread(const ServiceWorkerContextData& data, String&& userAgent, const Settings::Values& settingsValues, WorkerLoaderProxy& loaderProxy, WorkerDebuggerProxy& debuggerProxy, IDBClient::IDBConnectionProxy* idbConnectionProxy, SocketProvider* socketProvider)
    : WorkerThread({ data.scriptURL, emptyString(), "serviceworker:" + Inspector::IdentifiersFactory::createIdentifier(), WTFMove(userAgent), platformStrategies()->loaderStrategy()->isOnLine(), data.contentSecurityPolicy, false, MonotonicTime::now(), { }, WorkerType::Classic, FetchRequestCredentials::SameOrigin, settingsValues }, data.script, loaderProxy, debuggerProxy, DummyServiceWorkerThreadProxy::shared(), WorkerThreadStartMode::Normal, data.registration.key.topOrigin().securityOrigin().get(), idbConnectionProxy, socketProvider, JSC::RuntimeFlags::createAllEnabled())
    , m_data(data.isolatedCopy())
    , m_workerObjectProxy(DummyServiceWorkerThreadProxy::shared())
    , m_heartBeatTimeout(SWContextManager::singleton().connection()->shouldUseShortTimeout() ? heartBeatTimeoutForTest : heartBeatTimeout)

Lines 50-56 struct ServiceWorkerClientIdentifier; a/Source/WebCore/workers/service/server/SWServerWorker.h_sec1
- a/Source/WebCore/workers/service/server/SWServerWorker.h -1 / +1 lines
50	struct ServiceWorkerClientQueryOptions;	50	struct ServiceWorkerClientQueryOptions;
51	struct ServiceWorkerContextData;	51	struct ServiceWorkerContextData;
52	struct ServiceWorkerJobDataIdentifier;	52	struct ServiceWorkerJobDataIdentifier;
53	enum class WorkerType;	53	enum class WorkerType : uint8_t;
54		54
55	class SWServerWorker : public RefCounted<SWServerWorker> {	55	class SWServerWorker : public RefCounted<SWServerWorker> {
56	public:	56	public:



void WorkletGlobalScope::fetchAndInvokeScript(const URL& moduleURL, FetchRequestCredentials credentials, CompletionHandler<void(Optional<Exception>&&)>&& completionHandler)
{
    ASSERT(!isMainThread());
    script()->loadAndEvaluateModule(moduleURL, credentials, WTFMove(completionHandler));
    processNextScriptFetchJobIfNeeded();
}

void WorkletGlobalScope::processNextScriptFetchJobIfNeeded()

    auto contentSecurityPolicyEnforcement = shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceChildSrcDirective;

    m_scriptLoader = WorkerScriptLoader::create();
    m_scriptLoader->loadAsynchronously(*this, WTFMove(request), WTFMove(fetchOptions), contentSecurityPolicyEnforcement, ServiceWorkersMode::All, *this, WorkerRunLoop::defaultMode());
}

void WorkletGlobalScope::didReceiveResponse(unsigned long, const ResourceResponse&)



2021-02-11  Yusuke Suzuki  <ysuzuki@apple.com>

        JS Modules in Workers
        https://bugs.webkit.org/show_bug.cgi?id=164860

        Reviewed by NOBODY (OOPS!).

        * TestExpectations:

2021-02-10  Amir Mark Jr  <amir_mark@apple.com>

        [MacOS] animations/keyframe-pseudo-shadow.html is flakey failing.



2021-02-11  Yusuke Suzuki  <ysuzuki@apple.com>

        JS Modules in Workers
        https://bugs.webkit.org/show_bug.cgi?id=164860

        Reviewed by NOBODY (OOPS!).

        * web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/non-object.tentative.any.worker-expected.txt:
        * web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror-module-expected.txt:
        * web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker-importScripts-expected.txt:
        * web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker.sub-expected.txt:
        * web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-nothrow-worker-expected.txt:
        * web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-worker-expected.txt:
        * web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-worker-expected.txt:
        * web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-3-dynamic-worker-expected.txt:
        * web-platform-tests/service-workers/service-worker/import-module-scripts.https-expected.txt:
        * web-platform-tests/workers/baseurl/alpha/import-in-moduleworker-expected.txt:
        * web-platform-tests/workers/baseurl/alpha/importScripts-in-worker-expected.txt:
        * web-platform-tests/workers/baseurl/alpha/xhr-in-moduleworker-expected.txt:
        * web-platform-tests/workers/baseurl/alpha/xhr-in-worker-expected.txt:
        * web-platform-tests/workers/constructors/Worker/same-origin-expected.txt:
        * web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-expected.txt:
        * web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-module-expected.txt:
        * web-platform-tests/workers/modules/dedicated-worker-import-blob-url.any-expected.txt:
        * web-platform-tests/workers/modules/dedicated-worker-import-csp-expected.txt:
        * web-platform-tests/workers/modules/dedicated-worker-import-failure-expected.txt:
        * web-platform-tests/workers/modules/dedicated-worker-import-meta-expected.txt:
        * web-platform-tests/workers/modules/dedicated-worker-import-meta.html:
        * web-platform-tests/workers/modules/dedicated-worker-import-referrer-expected.txt:
        * web-platform-tests/workers/modules/dedicated-worker-import.any-expected.txt:
        * web-platform-tests/workers/modules/dedicated-worker-options-type-expected.txt:
        * web-platform-tests/workers/modules/dedicated-worker-parse-error-failure-expected.txt:
        * web-platform-tests/workers/name-property-expected.txt:
        * web-platform-tests/xhr/open-url-redirected-worker-origin-expected.txt:

2021-02-10  Manuel Rego Casasnovas  <rego@igalia.com>

        Add support for modifier keys in test_driver.send_keys()



[ Debug ] http/tests/workers/worker-messageport-2.html [ Slow ]

# Skip workers tests that are timing out or are SharedWorker related only
imported/w3c/web-platform-tests/workers/constructors/Worker/same-origin.html [ Skip ]
imported/w3c/web-platform-tests/workers/data-url-shared.html [ Skip ]
imported/w3c/web-platform-tests/workers/examples/onconnect.any.html [ Skip ]
imported/w3c/web-platform-tests/workers/examples/onconnect.any.worker.html [ Skip ]

imported/w3c/web-platform-tests/workers/SharedWorker-replace-EventHandler.any.worker.html [ Skip ]
imported/w3c/web-platform-tests/workers/SharedWorker-script-error.html [ Skip ]
imported/w3c/web-platform-tests/workers/SharedWorker-simple.html [ Skip ]
imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-referrer.html [ Skip ]
imported/w3c/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html [ Skip ]

imported/w3c/web-platform-tests/workers/constructors/SharedWorker [ Skip ]

Lines 1-7 a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/non-object.tentative.any.worker-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/non-object.tentative.any.worker-expected.txt -5 / +5 lines
1		1
2	FAIL Non-object: null promise_test: Unhandled rejection with value: object "Error: Could not import the module './null.json'."	2	FAIL Non-object: null promise_test: Unhandled rejection with value: object "TypeError: 'application/json' is not a valid JavaScript MIME type."
3	FAIL Non-object: true promise_test: Unhandled rejection with value: object "Error: Could not import the module './true.json'."	3	FAIL Non-object: true promise_test: Unhandled rejection with value: object "TypeError: 'application/json' is not a valid JavaScript MIME type."
4	FAIL Non-object: false promise_test: Unhandled rejection with value: object "Error: Could not import the module './false.json'."	4	FAIL Non-object: false promise_test: Unhandled rejection with value: object "TypeError: 'application/json' is not a valid JavaScript MIME type."
5	FAIL Non-object: string promise_test: Unhandled rejection with value: object "Error: Could not import the module './string.json'."	5	FAIL Non-object: string promise_test: Unhandled rejection with value: object "TypeError: 'application/json' is not a valid JavaScript MIME type."
6	FAIL Non-object: array promise_test: Unhandled rejection with value: object "Error: Could not import the module './array.json'."	6	FAIL Non-object: array promise_test: Unhandled rejection with value: object "TypeError: 'application/json' is not a valid JavaScript MIME type."
7		7

Lines 1-4 a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror-module-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror-module-expected.txt -2 / +2 lines
1		1
2	Harness Error (TIMEOUT), message = null	2	FAIL Promise resolved during #report-the-error assert_array_equals: lengths differ, expected array ["handler 1", "handler 2", "handler 1 promise", "handler 2 promise"] length 4, got [] length 0
3		3	PASS Promise resolved during event handlers other than error
4		4

Lines 1-6 a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker-importScripts-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker-importScripts-expected.txt -4 / +4 lines
1		1
2	FAIL Relative URL-like from same-origin importScripts() promise_test: Unhandled rejection with value: object "Error: Could not import the module './import.js?pipe=header(Access-Control-Allow-Origin,*)&label=relative-cross-origin importScripts()'."	2	PASS Relative URL-like from same-origin importScripts()
3	FAIL Absolute URL-like from same-origin importScripts() promise_test: Unhandled rejection with value: object "Error: Could not import the module 'http://127.0.0.1:8800/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/import.js?pipe=header(Access-Control-Allow-Origin,*)&label=absolute-cross-origin importScripts()'."	3	PASS Absolute URL-like from same-origin importScripts()
4	PASS Relative URL-like from cross-origin importScripts()	4	FAIL Relative URL-like from cross-origin importScripts() assert_equals: Relative URL-like specifier resolution should fail expected "(unreached)" but got "gamma/import.js"
5	FAIL Absolute URL-like from cross-origin importScripts() promise_test: Unhandled rejection with value: object "Error: Could not import the module 'http://127.0.0.1:8800/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/import.js?pipe=header(Access-Control-Allow-Origin,*)&label=absolute-cross-origin importScripts()'."	5	PASS Absolute URL-like from cross-origin importScripts()
6		6

Lines 1-4 a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker.sub-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker.sub-expected.txt -2 / +2 lines
1		1
2	FAIL Relative URL-like from worker top-level script promise_test: Unhandled rejection with value: object "Error: Could not import the module './import.js?pipe=header(Access-Control-Allow-Origin,*)&label=relative-worker top-level script'."	2	PASS Relative URL-like from worker top-level script
3	FAIL Absolute URL-like from worker top-level script promise_test: Unhandled rejection with value: object "Error: Could not import the module 'http://127.0.0.1:8800/html/semantics/scripting-1/the-script-element/module/dynamic-import/gamma/import.js?pipe=header(Access-Control-Allow-Origin,*)&label=absolute-worker top-level script'."	3	PASS Absolute URL-like from worker top-level script
4		4

Lines 1-4 a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-nothrow-worker-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-nothrow-worker-expected.txt -2 / +1 lines
1		1
2	Harness Error (TIMEOUT), message = null	2	PASS Test evaluation order of modules
3
4		3

Lines 1-4 a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-worker-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-worker-expected.txt -2 / +1 lines
1		1
2	Harness Error (TIMEOUT), message = null	2	FAIL Test evaluation order of modules assert_array_equals: lengths differ, expected array ["step-1-1", "step-1-2", "global-error", "error", "microtask"] length 5, got ["step-1-1", "step-1-2", "microtask"] length 3
3
4		3

Lines 1-4 a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-worker-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-worker-expected.txt -2 / +1 lines
1		1
2	Harness Error (TIMEOUT), message = null	2	FAIL Test evaluation order of modules assert_array_equals: lengths differ, expected array ["step-2.2-1", "step-2.2-2", "global-error", "error", "microtask-2.2"] length 5, got ["step-2.2-1", "step-2.2-2", "microtask-2.2"] length 3
3
4		3

Lines 1-4 a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-3-dynamic-worker-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-3-dynamic-worker-expected.txt -2 / +1 lines
1		1
2	Harness Error (TIMEOUT), message = null	2	PASS Test evaluation order of modules
3
4		3



FAIL Static import. promise_test: Unhandled rejection with value: object "TypeError: SyntaxError: Unexpected token '*'. import call expects exactly one argument."
FAIL Nested static import. promise_test: Unhandled rejection with value: object "TypeError: SyntaxError: Unexpected token '*'. import call expects exactly one argument."
FAIL Static import and then dynamic import. promise_test: Unhandled rejection with value: object "TypeError: SyntaxError: Unexpected token '*'. import call expects exactly one argument."
PASS Dynamic import.
PASS Nested dynamic import.
PASS Dynamic import and then static import.
PASS eval(import()).


Lines 1-4 a/LayoutTests/imported/w3c/web-platform-tests/workers/baseurl/alpha/import-in-moduleworker-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/baseurl/alpha/import-in-moduleworker-expected.txt -2 / +1 lines
1	CONSOLE MESSAGE: SyntaxError: Unexpected identifier 'r'. import call expects exactly one argument.
2		1
3	FAIL Base URL in module dedicated workers: import assert_unreached: Got error event Reached unreachable code	2	PASS Base URL in module dedicated workers: import
4		3

Lines 1-3 a/LayoutTests/imported/w3c/web-platform-tests/workers/baseurl/alpha/importScripts-in-worker-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/baseurl/alpha/importScripts-in-worker-expected.txt -1 / +1 lines
1		1
2	FAIL importScripts assert_equals: expected "gamma/script.js" but got "beta/script.js"	2	PASS importScripts
3		3

Lines 1-3 a/LayoutTests/imported/w3c/web-platform-tests/workers/baseurl/alpha/xhr-in-moduleworker-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/baseurl/alpha/xhr-in-moduleworker-expected.txt -1 / +1 lines
1		1
2	FAIL Base URL in module dedicated workers: XHR assert_equals: expected "gamma\n" but got "beta\n"	2	PASS Base URL in module dedicated workers: XHR
3		3

Lines 1-3 a/LayoutTests/imported/w3c/web-platform-tests/workers/baseurl/alpha/xhr-in-worker-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/baseurl/alpha/xhr-in-worker-expected.txt -1 / +1 lines
1		1
2	FAIL xhr-worker assert_equals: expected "gamma\n" but got "beta\n"	2	PASS xhr-worker
3		3




Harness Error (TIMEOUT), message = null

PASS unsupported_scheme
FAIL data_url The operation is insecure.
PASS about_blank
PASS example_invalid
PASS port_81
PASS https_port_80
PASS https_port_8000
PASS http_post_8012
PASS javascript_url


Lines 1-3 a/LayoutTests/imported/w3c/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-expected.txt -1 / +1 lines
1		1
2	FAIL WorkerLocation with redirects: classic dedicated workers assert_equals: expected "http://localhost:8800/workers/interfaces/WorkerGlobalScope/location/post-location-members.js?a" but got "http://localhost:8800/workers/interfaces/WorkerGlobalScope/location/helper-redirect.py?fail"	2	PASS WorkerLocation with redirects: classic dedicated workers
3		3

Lines 1-3 a/LayoutTests/imported/w3c/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-module-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-module-expected.txt -1 / +1 lines
1		1
2	FAIL WorkerLocation with redirects: module dedicated workers assert_equals: expected "http://localhost:8800/workers/interfaces/WorkerGlobalScope/location/post-location-members.js?a" but got "http://localhost:8800/workers/interfaces/WorkerGlobalScope/location/helper-redirect.py?fail"	2	PASS WorkerLocation with redirects: module dedicated workers
3		3



CONSOLE MESSAGE: SyntaxError: Unexpected string literal "http://localhost:8800/workers/modules/resources/static-import-worker.js". import call expects exactly one argument.
CONSOLE MESSAGE: SyntaxError: Unexpected string literal "http://localhost:8800/workers/modules/resources/nested-static-import-worker.js". import call expects exactly one argument.
CONSOLE MESSAGE: SyntaxError: Unexpected string literal "http://localhost:8800/workers/modules/resources/static-import-and-then-dynamic-import-worker.js". import call expects exactly one argument.
CONSOLE MESSAGE: SyntaxError: Unexpected string literal "http://localhost:8800/workers/modules/resources/dynamic-import-worker.js". import call expects exactly one argument.
CONSOLE MESSAGE: SyntaxError: Unexpected string literal "http://localhost:8800/workers/modules/resources/nested-dynamic-import-worker.js". import call expects exactly one argument.
CONSOLE MESSAGE: SyntaxError: Unexpected string literal "http://localhost:8800/workers/modules/resources/dynamic-import-and-then-static-import-worker.js". import call expects exactly one argument.
CONSOLE MESSAGE: SyntaxError: Unexpected string literal "http://localhost:8800/workers/modules/resources/eval-dynamic-import-worker.js". import call expects exactly one argument.

PASS Static import.
PASS Nested static import.
PASS Static import and then dynamic import.
PASS Dynamic import.
PASS Nested dynamic import.
PASS Dynamic import and then static import.
PASS eval(import()).
FAIL Dynamic import and then static import. promise_test: Unhandled rejection with value: "SyntaxError: Unexpected string literal \"http://localhost:8800/workers/modules/resources/dynamic-import-and-then-static-import-worker.js\". import call expects exactly one argument."
FAIL eval(import()). promise_test: Unhandled rejection with value: "SyntaxError: Unexpected string literal \"http://localhost:8800/workers/modules/resources/eval-dynamic-import-worker.js\". import call expects exactly one argument."


Lines 1-13 a/LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-csp-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-csp-expected.txt +9 lines
1	CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'worker-src'.	1	CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'worker-src'.
2		2
		3	Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.js
3	CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'worker-src'.	4	CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'worker-src'.
4		5
		6	Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.js
		7	Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.js
		8	Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.js
5	CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'worker-src'.	9	CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'worker-src'.
6		10
		11	Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.js
7	CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'worker-src'.	12	CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'worker-src'.
8		13
		14	Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.js
		15	Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.js
		16	Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.js
9	CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'worker-src'.	17	CONSOLE MESSAGE: Unrecognized Content-Security-Policy directive 'worker-src'.
10		18
		19	Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-on-load-script.js
11		20
12	PASS worker-src 'self' directive should disallow cross origin static import.	21	PASS worker-src 'self' directive should disallow cross origin static import.
13	FAIL worker-src * directive should allow cross origin static import. assert_array_equals: expected property 0 to be "export-on-load-script.js" but got "ERROR" (expected array ["export-on-load-script.js"] got ["ERROR"])	22	FAIL worker-src * directive should allow cross origin static import. assert_array_equals: expected property 0 to be "export-on-load-script.js" but got "ERROR" (expected array ["export-on-load-script.js"] got ["ERROR"])



CONSOLE MESSAGE: Importing a module script failed.

PASS importScripts() on module worker should throw an exception.
PASS Worker construction for non-existent script should dispatch an ErrorEvent.
PASS Static import for non-existent script should dispatch an ErrorEvent.
PASS Dynamic import for non-existent script should throw an exception.
PASS Worker construction for an invalid URL should throw an exception.
PASS Worker construction for a file URL should throw an exception.




CONSOLE MESSAGE: SyntaxError: import.meta is only valid inside modules.

PASS Test import.meta.url on the top-level module script.
PASS Test import.meta.url on the imported module script.
PASS Test import.meta.url on the imported module script with a fragment.
FAIL Test import.meta.url on the imported module script. assert_true: expected true got false
FAIL Test import.meta.url on the imported module script with a fragment. assert_true: expected true got false


Lines 53-59 a/LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-meta.html_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-meta.html -1 / +1 lines
53	worker.postMessage('./' + script_url + '#1');	53	worker.postMessage('./' + script_url + '#1');
54	return new Promise(resolve => worker.onmessage = resolve);	54	return new Promise(resolve => worker.onmessage = resolve);
55	})	55	})
56	.then(msg_event => assert_true(msg_event.data.endsWith(script_url)));	56	.then(msg_event => assert_true(msg_event.data.endsWith(script_url + '#1')));
57	}, 'Test import.meta.url on the imported module script with a fragment.');	57	}, 'Test import.meta.url on the imported module script with a fragment.');
58		58
59	</script>	59	</script>



Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-referrer-checker.py
Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-referrer-checker.py
Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-referrer-checker.py
Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-referrer-checker.py
Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-referrer-checker.py
Blocked access to external URL https://www1.localhost:9443/workers/modules/resources/export-referrer-checker.py

PASS Same-origin top-level module script loading with "no-referrer" referrer policy
PASS Same-origin top-level module script loading with "origin" referrer policy
PASS Same-origin top-level module script loading with "same-origin" referrer policy
PASS Same-origin static import with "no-referrer" referrer policy.
PASS Same-origin static import with "origin" referrer policy.
PASS Same-origin static import with "same-origin" referrer policy.
FAIL Cross-origin static import with "no-referrer" referrer policy. promise_test: Unhandled rejection with value: object "TypeError: Type error"
FAIL Cross-origin static import with "origin" referrer policy. promise_test: Unhandled rejection with value: object "TypeError: Type error"
FAIL Cross-origin static import with "same-origin" referrer policy. promise_test: Unhandled rejection with value: object "TypeError: Type error"
FAIL Same-origin dynamic import with "no-referrer" referrer policy. assert_equals: expected "" but got "http://localhost:8800/workers/modules/resources/dynamic-import-same-origin-referrer-checker-worker.js"
FAIL Same-origin dynamic import with "origin" referrer policy. assert_equals: expected "http://localhost:8800/" but got "http://localhost:8800/workers/modules/resources/dynamic-import-same-origin-referrer-checker-worker.js"
PASS Same-origin dynamic import with "same-origin" referrer policy.
FAIL Cross-origin dynamic import with "no-referrer" referrer policy. promise_test: Unhandled rejection with value: object "TypeError: Type error"
FAIL Cross-origin dynamic import with "origin" referrer policy. promise_test: Unhandled rejection with value: object "TypeError: Type error"
FAIL Cross-origin dynamic import with "same-origin" referrer policy. promise_test: Unhandled rejection with value: object "TypeError: Type error"




CONSOLE MESSAGE: SyntaxError: Unexpected token '*'. import call expects exactly one argument.
CONSOLE MESSAGE: SyntaxError: Unexpected token '*'. import call expects exactly one argument.
CONSOLE MESSAGE: SyntaxError: Unexpected token '*'. import call expects exactly one argument.

PASS Static import.
PASS Nested static import.
PASS Static import and then dynamic import.
PASS Dynamic import.
PASS Nested dynamic import.
PASS Dynamic import and then static import.
PASS eval(import()).
FAIL Dynamic import and then static import. assert_array_equals: value is "Failed to do dynamic import: Error: Could not import the module './export-on-static-import-script.js'.", expected array
FAIL eval(import()). assert_array_equals: value is "Failed to do dynamic import: Error: Could not import the module './export-on-load-script.js'.", expected array




PASS Test worker construction with the default worker type.
PASS Test worker construction with the "classic" worker type.
PASS Test worker construction with the "module" worker type.
PASS Test worker construction with an empty worker type.
PASS Test worker construction with an unknown worker type.
      }" did not throw
FAIL Test worker construction with an unknown worker type. assert_throws_js: Worker construction with an unknown type should throw an exception function "() => {
        new Worker('resources/post-message-on-load-worker.js',
                   { type: 'unknown' });
      }" did not throw


Lines 1-7 a/LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-parse-error-failure-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-parse-error-failure-expected.txt -5 / +12 lines
1	CONSOLE MESSAGE: SyntaxError: Unexpected token '*'. import call expects exactly one argument.	1	CONSOLE MESSAGE: SyntaxError: Unexpected token ';'
		2	CONSOLE MESSAGE: SyntaxError: Unexpected token ';'
2		3
3	Harness Error (FAIL), message = Error: assert_implements: Static import must be supported on module dedicated worker to run this test. undefined	4	FAIL Module worker construction for script with syntax error should dispatch an event named error. assert_equals: expected function "function Event() {
4		5	[native code]
5	NOTRUN Module worker construction for script with syntax error should dispatch an event named error.	6	}" but got function "function ErrorEvent() {
6	NOTRUN Static import on module worker for script with syntax error should dispatch an event named error.	7	[native code]
		8	}"
		9	FAIL Static import on module worker for script with syntax error should dispatch an event named error. assert_equals: expected function "function Event() {
		10	[native code]
		11	}" but got function "function ErrorEvent() {
		12	[native code]
		13	}"
7		14



CONSOLE MESSAGE: Unhandled Promise Rejection: ReferenceError: Can't find variable: SharedWorker

Harness Error (FAIL), message = Unhandled rejection: Can't find variable: SharedWorker

PASS name property value for DedicatedWorkerGlobalScope
PASS name property is replaceable for DedicatedWorkerGlobalScope
PASS Declaring name as an accidental global must not cause a harness error for DedicatedWorkerGlobalScope


Lines 1-6 a/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-worker-origin-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/xhr/open-url-redirected-worker-origin-expected.txt -1 / +1 lines
1	Blocked access to external URL http://www2.localhost:8800/xhr/resources/inspect-headers.py?filter_name=origin&cors	1	Blocked access to external URL http://www2.localhost:8800/xhr/resources/inspect-headers.py?filter_name=origin&cors
2		2
3	FAIL Referer header assert_equals: expected "Referer: http://localhost:8800/xhr/resources/workerxhr-origin-referrer.js\n" but got "Referer: http://localhost:8800/xhr/resources/redirect.py?location=workerxhr-origin-referrer.js\n"	3	PASS Referer header
4	FAIL Origin header assert_equals: expected "Origin: http://localhost:8800\n" but got ""	4	FAIL Origin header assert_equals: expected "Origin: http://localhost:8800\n" but got ""
5	PASS Request URL test	5	PASS Request URL test
6		6

Return to Bug 164860

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +122 lines
		1	2021-02-11 Yusuke Suzuki <ysuzuki@apple.com>
		2
		3	JS Modules in Workers
		4	https://bugs.webkit.org/show_bug.cgi?id=164860
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Headers.cmake:
		9	* Sources.txt:
		10	* WebCore.xcodeproj/project.pbxproj:
		11	* bindings/js/CachedModuleScriptLoader.cpp:
		12	(WebCore::CachedModuleScriptLoader::create):
		13	(WebCore::CachedModuleScriptLoader::CachedModuleScriptLoader):
		14	(WebCore::CachedModuleScriptLoader::load):
		15	(WebCore::CachedModuleScriptLoader::notifyFinished):
		16	* bindings/js/CachedModuleScriptLoader.h:
		17	* bindings/js/CachedScriptFetcher.cpp:
		18	(WebCore::CachedScriptFetcher::requestScriptWithCache const):
		19	* bindings/js/JSDOMGlobalObject.cpp:
		20	(WebCore::scriptModuleLoader):
		21	(WebCore::JSDOMGlobalObject::moduleLoaderResolve):
		22	(WebCore::JSDOMGlobalObject::moduleLoaderFetch):
		23	(WebCore::JSDOMGlobalObject::moduleLoaderEvaluate):
		24	(WebCore::JSDOMGlobalObject::moduleLoaderImportModule):
		25	(WebCore::JSDOMGlobalObject::moduleLoaderCreateImportMetaProperties):
		26	* bindings/js/JSDOMGlobalObject.h:
		27	* bindings/js/JSDOMWindowBase.cpp:
		28	(WebCore::JSDOMWindowBase::moduleLoaderResolve): Deleted.
		29	(WebCore::JSDOMWindowBase::moduleLoaderFetch): Deleted.
		30	(WebCore::JSDOMWindowBase::moduleLoaderEvaluate): Deleted.
		31	(WebCore::JSDOMWindowBase::moduleLoaderImportModule): Deleted.
		32	(WebCore::JSDOMWindowBase::moduleLoaderCreateImportMetaProperties): Deleted.
		33	* bindings/js/JSDOMWindowBase.h:
		34	* bindings/js/JSExecState.h:
		35	(WebCore::JSExecState::loadAndEvaluateModule):
		36	* bindings/js/JSWorkerGlobalScopeBase.cpp:
		37	* bindings/js/JSWorkletGlobalScopeBase.cpp:
		38	* bindings/js/ModuleScriptLoader.h: Copied from Source/WebCore/workers/WorkerType.h.
		39	(WebCore::ModuleScriptLoader::clearClient):
		40	(WebCore::ModuleScriptLoader::scriptFetcher):
		41	(WebCore::ModuleScriptLoader::parameters):
		42	(WebCore::ModuleScriptLoader::ModuleScriptLoader):
		43	* bindings/js/ModuleScriptLoaderClient.h: Renamed from Source/WebCore/bindings/js/CachedModuleScriptLoaderClient.h.
		44	* bindings/js/ScriptModuleLoader.cpp:
		45	(WebCore::ScriptModuleLoader::ScriptModuleLoader):
		46	(WebCore::resolveModuleSpecifier):
		47	(WebCore::ScriptModuleLoader::resolve):
		48	(WebCore::ScriptModuleLoader::fetch):
		49	(WebCore::ScriptModuleLoader::moduleURL):
		50	(WebCore::ScriptModuleLoader::responseURLFromRequestURL):
		51	(WebCore::ScriptModuleLoader::evaluate):
		52	(WebCore::ScriptModuleLoader::importModule):
		53	(WebCore::ScriptModuleLoader::notifyFinished):
		54	* bindings/js/ScriptModuleLoader.h:
		55	* bindings/js/ScriptSourceCode.h:
		56	(WebCore::ScriptSourceCode::ScriptSourceCode):
		57	* bindings/js/WorkerModuleScriptLoader.cpp: Added.
		58	(WebCore::WorkerModuleScriptLoader::create):
		59	(WebCore::WorkerModuleScriptLoader::WorkerModuleScriptLoader):
		60	(WebCore::WorkerModuleScriptLoader::~WorkerModuleScriptLoader):
		61	(WebCore::WorkerModuleScriptLoader::load):
		62	(WebCore::WorkerModuleScriptLoader::notifyFinished):
		63	* bindings/js/WorkerModuleScriptLoader.h: Copied from Source/WebCore/workers/WorkerType.h.
		64	* bindings/js/WorkerScriptFetcher.h: Added.
65	* dom/Document.cpp:
66	* dom/LoadableModuleScript.cpp:
67	(WebCore::LoadableModuleScript::load): Deleted.
68	* dom/LoadableModuleScript.h:
69	* dom/ScriptElement.cpp:
70	(WebCore::ScriptElement::requestModuleScript):
71	* loader/ThreadableLoader.cpp:
72	(WebCore::ThreadableLoader::create):
73	* loader/ThreadableLoader.h:
74	(WebCore::ThreadableLoader::create):
75	* workers/Worker.cpp:
76	(WebCore::Worker::Worker):
77	(WebCore::Worker::create):
78	(WebCore::Worker::notifyFinished):
79	* workers/Worker.h:
80	* workers/Worker.idl:
81	* workers/WorkerGlobalScope.cpp:
82	(WebCore::WorkerGlobalScope::WorkerGlobalScope):
83	(WebCore::WorkerGlobalScope::importScripts):
84	* workers/WorkerGlobalScope.h:
85	(WebCore::WorkerGlobalScope::credentials const):
86	* workers/WorkerGlobalScopeProxy.h:
87	* workers/WorkerMessagingProxy.cpp:
88	(WebCore::WorkerMessagingProxy::startWorkerGlobalScope):
89	* workers/WorkerMessagingProxy.h:
90	* workers/WorkerOrWorkletGlobalScope.cpp:
91	(WebCore::WorkerOrWorkletGlobalScope::WorkerOrWorkletGlobalScope):
92	* workers/WorkerOrWorkletGlobalScope.h:
93	(WebCore::WorkerOrWorkletGlobalScope::moduleLoader):
94	* workers/WorkerOrWorkletScriptController.cpp:
95	(WebCore::jsValueToModuleKey):
96	(WebCore::WorkerOrWorkletScriptController::evaluateModule):
97	(WebCore::WorkerOrWorkletScriptController::loadModuleSynchronously):
98	(WebCore::WorkerOrWorkletScriptController::linkAndEvaluateModule):
99	(WebCore::WorkerOrWorkletScriptController::loadAndEvaluateModule):
100	* workers/WorkerOrWorkletScriptController.h:
101	* workers/WorkerScriptLoader.cpp:
102	(WebCore::WorkerScriptLoader::loadAsynchronously):
103	(WebCore::WorkerScriptLoader::didReceiveResponse):
104	* workers/WorkerScriptLoader.h:
105	(WebCore::WorkerScriptLoader::responseSource const):
106	(WebCore::WorkerScriptLoader::isRedirected const):
107	* workers/WorkerThread.cpp:
108	(WebCore::WorkerParameters::isolatedCopy const):
109	(WebCore::WorkerThread::evaluateScriptIfNecessary):
110	* workers/WorkerThread.h:
111	* workers/WorkerType.h:
112	* workers/service/ServiceWorkerContainer.h:
113	* workers/service/ServiceWorkerJob.cpp:
114	(WebCore::ServiceWorkerJob::fetchScriptWithContext):
115	* workers/service/ServiceWorkerRegistrationOptions.h:
116	* workers/service/context/ServiceWorkerThread.cpp:
117	(WebCore::ServiceWorkerThread::ServiceWorkerThread):
118	* workers/service/server/SWServerWorker.h:
119	* worklets/WorkletGlobalScope.cpp:
120	(WebCore::WorkletGlobalScope::fetchAndInvokeScript):
121	(WebCore::WorkletGlobalScope::processNextScriptFetchJobIfNeeded):
122
1	2021-02-10 Alexey Proskuryakov <ap@apple.com>	123	2021-02-10 Alexey Proskuryakov <ap@apple.com>
2		124
3	Do not differentiate between Release and Production via ENABLE_DEVELOPER_MODE	125	Do not differentiate between Release and Production via ENABLE_DEVELOPER_MODE

Lines 30-35 set(WebCore_PRIVATE_FRAMEWORK_HEADERS a/Source/WebCore/Headers.cmake_sec1
- a/Source/WebCore/Headers.cmake +2 lines
30		30
31	Modules/fetch/FetchBodyConsumer.h	31	Modules/fetch/FetchBodyConsumer.h
32	Modules/fetch/FetchBodySource.h	32	Modules/fetch/FetchBodySource.h
		33	Modules/fetch/FetchRequestCredentials.h
33	Modules/fetch/FetchHeaders.h	34	Modules/fetch/FetchHeaders.h
34	Modules/fetch/FetchIdentifier.h	35	Modules/fetch/FetchIdentifier.h
35	Modules/fetch/FetchLoader.h	36	Modules/fetch/FetchLoader.h
Lines 287-292 set(WebCore_PRIVATE_FRAMEWORK_HEADERS a/Source/WebCore/Headers.cmake_sec2
287	bindings/js/WebCoreJITOperations.h	288	bindings/js/WebCoreJITOperations.h
288	bindings/js/WebCoreTypedArrayController.h	289	bindings/js/WebCoreTypedArrayController.h
289	bindings/js/WindowProxy.h	290	bindings/js/WindowProxy.h
		291	bindings/js/WorkerScriptFetcher.h
290		292
291	bridge/Bridge.h	293	bridge/Bridge.h
292	bridge/IdentifierRep.h	294	bridge/IdentifierRep.h

Lines 40-55 a/Source/WebCore/bindings/js/CachedModuleScriptLoader.cpp_sec1
- a/Source/WebCore/bindings/js/CachedModuleScriptLoader.cpp -10 / +8 lines
40		40
41	namespace WebCore {	41	namespace WebCore {
42		42
43	Ref<CachedModuleScriptLoader> CachedModuleScriptLoader::create(CachedModuleScriptLoaderClient& client, DeferredPromise& promise, CachedScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)	43	Ref<CachedModuleScriptLoader> CachedModuleScriptLoader::create(ModuleScriptLoaderClient& client, DeferredPromise& promise, CachedScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)
44	{	44	{
45	return adoptRef(*new CachedModuleScriptLoader(client, promise, scriptFetcher, WTFMove(parameters)));	45	return adoptRef(*new CachedModuleScriptLoader(client, promise, scriptFetcher, WTFMove(parameters)));
46	}	46	}
47		47
48	CachedModuleScriptLoader::CachedModuleScriptLoader(CachedModuleScriptLoaderClient& client, DeferredPromise& promise, CachedScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)	48	CachedModuleScriptLoader::CachedModuleScriptLoader(ModuleScriptLoaderClient& client, DeferredPromise& promise, CachedScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)
49	: m_client(&client)	49	: ModuleScriptLoader(client, promise, scriptFetcher, WTFMove(parameters))
50	, m_promise(&promise)
51	, m_scriptFetcher(scriptFetcher)
52	, m_parameters(WTFMove(parameters))
53	{	50	{
54	}	51	}
55		52
Lines 61-74 CachedModuleScriptLoader::~CachedModuleScriptLoader() a/Source/WebCore/bindings/js/CachedModuleScriptLoader.cpp_sec2
61	}	58	}
62	}	59	}
63		60
64	bool CachedModuleScriptLoader::load(Document& document, const URL& sourceURL)	61	bool CachedModuleScriptLoader::load(Document& document, URL&& sourceURL)
65	{	62	{
		63	ASSERT(m_promise);
66	ASSERT(!m_cachedScript);	64	ASSERT(!m_cachedScript);
67	String integrity = m_parameters ? m_parameters->integrity() : String { };	65	String integrity = m_parameters ? m_parameters->integrity() : String { };
68	m_cachedScript = m_scriptFetcher->requestModuleScript(document, sourceURL, WTFMove(integrity));	66	m_cachedScript = scriptFetcher().requestModuleScript(document, sourceURL, WTFMove(integrity));
69	if (!m_cachedScript)	67	if (!m_cachedScript)
70	return false;	68	return false;
71	m_sourceURL = sourceURL;	69	m_sourceURL = WTFMove(sourceURL);
72		70
73	// If the content is already cached, this immediately calls notifyFinished.	71	// If the content is already cached, this immediately calls notifyFinished.
74	m_cachedScript->addClient(*this);	72	m_cachedScript->addClient(*this);
Lines 83-89 void CachedModuleScriptLoader::notifyFinished(CachedResource& resource, const Ne a/Source/WebCore/bindings/js/CachedModuleScriptLoader.cpp_sec3
83		81
84	Ref<CachedModuleScriptLoader> protectedThis(*this);	82	Ref<CachedModuleScriptLoader> protectedThis(*this);
85	if (m_client)	83	if (m_client)
86	m_client->notifyFinished(*this, WTFMove(m_promise));	84	m_client->notifyFinished(*this, WTFMove(m_sourceURL), m_promise.releaseNonNull());
87		85
88	// Remove the client after calling notifyFinished to keep the data buffer in	86	// Remove the client after calling notifyFinished to keep the data buffer in
89	// CachedResource alive while notifyFinished processes the resource.	87	// CachedResource alive while notifyFinished processes the resource.

Lines 27-32 a/Source/WebCore/bindings/js/CachedModuleScriptLoader.h_sec1
- a/Source/WebCore/bindings/js/CachedModuleScriptLoader.h -19 / +8 lines
27		27
28	#include "CachedResourceClient.h"	28	#include "CachedResourceClient.h"
29	#include "CachedResourceHandle.h"	29	#include "CachedResourceHandle.h"
		30	#include "CachedScriptFetcher.h"
		31	#include "ModuleScriptLoader.h"
30	#include <wtf/Ref.h>	32	#include <wtf/Ref.h>
31	#include <wtf/RefCounted.h>	33	#include <wtf/RefCounted.h>
32	#include <wtf/RefPtr.h>	34	#include <wtf/RefPtr.h>
Lines 34-75 a/Source/WebCore/bindings/js/CachedModuleScriptLoader.h_sec2
34		36
35	namespace WebCore {	37	namespace WebCore {
36		38
37	class CachedModuleScriptLoaderClient;	39	class ModuleScriptLoaderClient;
38	class CachedScript;	40	class CachedScript;
39	class CachedScriptFetcher;
40	class DeferredPromise;	41	class DeferredPromise;
41	class Document;	42	class Document;
42	class JSDOMGlobalObject;	43	class JSDOMGlobalObject;
43	class ModuleFetchParameters;	44	class ModuleFetchParameters;
44		45
45	class CachedModuleScriptLoader final : public RefCounted<CachedModuleScriptLoader>, private CachedResourceClient {	46	class CachedModuleScriptLoader final : public ModuleScriptLoader, private CachedResourceClient {
46	public:	47	public:
47	static Ref<CachedModuleScriptLoader> create(CachedModuleScriptLoaderClient&, DeferredPromise&, CachedScriptFetcher&, RefPtr<ModuleFetchParameters>&&);	48	static Ref<CachedModuleScriptLoader> create(ModuleScriptLoaderClient&, DeferredPromise&, CachedScriptFetcher&, RefPtr<ModuleFetchParameters>&&);
48		49
49	virtual ~CachedModuleScriptLoader();	50	virtual ~CachedModuleScriptLoader();
50		51
51	bool load(Document&, const URL& sourceURL);	52	bool load(Document&, URL&& sourceURL);
52		53
53	CachedScriptFetcher& scriptFetcher() { return m_scriptFetcher.get(); }
54	CachedScript* cachedScript() { return m_cachedScript.get(); }	54	CachedScript* cachedScript() { return m_cachedScript.get(); }
55	ModuleFetchParameters* parameters() { return m_parameters.get(); }	55	CachedScriptFetcher& scriptFetcher() { return static_cast<CachedScriptFetcher&>(ModuleScriptLoader::scriptFetcher()); }
56	const URL& sourceURL() const { return m_sourceURL; }
57
58	void clearClient()
59	{
60	ASSERT(m_client);
61	m_client = nullptr;
62	}
63		56
64	private:	57	private:
65	CachedModuleScriptLoader(CachedModuleScriptLoaderClient&, DeferredPromise&, CachedScriptFetcher&, RefPtr<ModuleFetchParameters>&&);	58	CachedModuleScriptLoader(ModuleScriptLoaderClient&, DeferredPromise&, CachedScriptFetcher&, RefPtr<ModuleFetchParameters>&&);
66		59
67	void notifyFinished(CachedResource&, const NetworkLoadMetrics&) final;	60	void notifyFinished(CachedResource&, const NetworkLoadMetrics&) final;
68		61
69	CachedModuleScriptLoaderClient* m_client { nullptr };
70	RefPtr<DeferredPromise> m_promise;
71	Ref<CachedScriptFetcher> m_scriptFetcher;
72	RefPtr<ModuleFetchParameters> m_parameters;
73	CachedResourceHandle<CachedScript> m_cachedScript;	62	CachedResourceHandle<CachedScript> m_cachedScript;
74	URL m_sourceURL;	63	URL m_sourceURL;
75	};	64	};

Lines 1-40 a/Source/WebCore/bindings/js/CachedModuleScriptLoaderClient.h_sec1
- a/Source/WebCore/bindings/js/CachedModuleScriptLoaderClient.h -40 lines
1	/*
2	* Copyright (C) 2016 Apple, Inc. All Rights Reserved.
3	*
4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions
6	* are met:
7	* 1. Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.
9	* 2. Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.
12	*
13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24	*/
25
26	#pragma once
27
28	namespace WebCore {
29
30	class CachedModuleScriptLoader;
31	class DeferredPromise;
32
33	class CachedModuleScriptLoaderClient {
34	public:
35	virtual ~CachedModuleScriptLoaderClient() = default;
36
37	virtual void notifyFinished(CachedModuleScriptLoader&, RefPtr<DeferredPromise>) = 0;
38	};
39
40	}

Lines 32-37 a/Source/WebCore/bindings/js/CachedScriptFetcher.cpp_sec1
- a/Source/WebCore/bindings/js/CachedScriptFetcher.cpp +2 lines
32	#include "CrossOriginAccessControl.h"	32	#include "CrossOriginAccessControl.h"
33	#include "Document.h"	33	#include "Document.h"
34	#include "Settings.h"	34	#include "Settings.h"
		35	#include "WorkerOrWorkletGlobalScope.h"
35		36
36	namespace WebCore {	37	namespace WebCore {
37		38
Lines 47-52 CachedResourceHandle<CachedScript> CachedScriptFetcher::requestModuleScript(Docu a/Source/WebCore/bindings/js/CachedScriptFetcher.cpp_sec2
47		48
48	CachedResourceHandle<CachedScript> CachedScriptFetcher::requestScriptWithCache(Document& document, const URL& sourceURL, const String& crossOriginMode, String&& integrity, Optional<ResourceLoadPriority> resourceLoadPriority) const	49	CachedResourceHandle<CachedScript> CachedScriptFetcher::requestScriptWithCache(Document& document, const URL& sourceURL, const String& crossOriginMode, String&& integrity, Optional<ResourceLoadPriority> resourceLoadPriority) const
49	{	50	{
		51	// Without scripting, there is no way to start Workers.
50	if (!document.settings().isScriptEnabled())	52	if (!document.settings().isScriptEnabled())
51	return nullptr;	53	return nullptr;
52		54

Lines 47-52 a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp_sec1
- a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp +74 lines
47	#include "JSWorkletGlobalScope.h"	47	#include "JSWorkletGlobalScope.h"
48	#include "RejectedPromiseTracker.h"	48	#include "RejectedPromiseTracker.h"
49	#include "RuntimeEnabledFeatures.h"	49	#include "RuntimeEnabledFeatures.h"
		50	#include "ScriptModuleLoader.h"
50	#include "StructuredClone.h"	51	#include "StructuredClone.h"
51	#include "WebCoreJSClientData.h"	52	#include "WebCoreJSClientData.h"
52	#include "WorkerGlobalScope.h"	53	#include "WorkerGlobalScope.h"
Lines 422-427 JSC::JSPromise* JSDOMGlobalObject::instantiateStreaming(JSC::JSGlobalObject* glo a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp_sec2
422	}	423	}
423	#endif	424	#endif
424		425
		426	static ScriptModuleLoader* scriptModuleLoader(JSDOMGlobalObject* globalObject)
		427	{
		428	VM& vm = globalObject->vm();
		429	if (globalObject->inherits<JSDOMWindowBase>(vm)) {
		430	if (auto document = jsCast<const JSDOMWindowBase*>(globalObject)->wrapped().document())
		431	return &document->moduleLoader();
		432	return nullptr;
		433	}
		434	if (globalObject->inherits<JSRemoteDOMWindowBase>(vm))
		435	return nullptr;
		436	if (globalObject->inherits<JSWorkerGlobalScopeBase>(vm))
		437	return &jsCast<const JSWorkerGlobalScopeBase*>(globalObject)->wrapped().moduleLoader();
		438	if (globalObject->inherits<JSWorkletGlobalScopeBase>(vm))
		439	return &jsCast<const JSWorkletGlobalScopeBase*>(globalObject)->wrapped().moduleLoader();
		440	#if ENABLE(INDEXED_DATABASE)
		441	if (globalObject->inherits<JSIDBSerializationGlobalObject>(vm))
		442	return nullptr;
		443	#endif
		444	dataLog("Unexpected global object: ", JSValue(globalObject), "\n");
		445	RELEASE_ASSERT_NOT_REACHED();
		446	return nullptr;
		447	}
		448
		449	JSC::Identifier JSDOMGlobalObject::moduleLoaderResolve(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleName, JSC::JSValue importerModuleKey, JSC::JSValue scriptFetcher)
		450	{
		451	JSDOMGlobalObject* thisObject = JSC::jsCast<JSDOMGlobalObject*>(globalObject);
		452	if (auto* loader = scriptModuleLoader(thisObject))
		453	return loader->resolve(globalObject, moduleLoader, moduleName, importerModuleKey, scriptFetcher);
		454	return { };
		455	}
		456
		457	JSC::JSInternalPromise* JSDOMGlobalObject::moduleLoaderFetch(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue parameters, JSC::JSValue scriptFetcher)
		458	{
		459	VM& vm = globalObject->vm();
		460	auto scope = DECLARE_THROW_SCOPE(vm);
		461	JSDOMGlobalObject* thisObject = JSC::jsCast<JSDOMGlobalObject*>(globalObject);
		462	if (auto* loader = scriptModuleLoader(thisObject))
		463	RELEASE_AND_RETURN(scope, loader->fetch(globalObject, moduleLoader, moduleKey, parameters, scriptFetcher));
		464	JSC::JSInternalPromise* promise = JSC::JSInternalPromise::create(vm, globalObject->internalPromiseStructure());
		465	scope.release();
		466	promise->reject(globalObject, jsUndefined());
		467	return promise;
		468	}
		469
		470	JSC::JSValue JSDOMGlobalObject::moduleLoaderEvaluate(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue moduleRecord, JSC::JSValue scriptFetcher)
		471	{
		472	JSDOMGlobalObject* thisObject = JSC::jsCast<JSDOMGlobalObject*>(globalObject);
		473	if (auto* loader = scriptModuleLoader(thisObject))
		474	return loader->evaluate(globalObject, moduleLoader, moduleKey, moduleRecord, scriptFetcher);
		475	return JSC::jsUndefined();
		476	}
		477
		478	JSC::JSInternalPromise* JSDOMGlobalObject::moduleLoaderImportModule(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSString* moduleName, JSC::JSValue parameters, const JSC::SourceOrigin& sourceOrigin)
		479	{
		480	VM& vm = globalObject->vm();
		481	auto scope = DECLARE_THROW_SCOPE(vm);
		482	JSDOMGlobalObject* thisObject = JSC::jsCast<JSDOMGlobalObject*>(globalObject);
		483	if (auto* loader = scriptModuleLoader(thisObject))
		484	RELEASE_AND_RETURN(scope, loader->importModule(globalObject, moduleLoader, moduleName, parameters, sourceOrigin));
		485	JSC::JSInternalPromise* promise = JSC::JSInternalPromise::create(vm, globalObject->internalPromiseStructure());
		486	scope.release();
		487	promise->reject(globalObject, jsUndefined());
		488	return promise;
		489	}
490
491	JSC::JSObject* JSDOMGlobalObject::moduleLoaderCreateImportMetaProperties(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSModuleRecord* moduleRecord, JSC::JSValue scriptFetcher)
492	{
493	JSDOMGlobalObject* thisObject = JSC::jsCast<JSDOMGlobalObject*>(globalObject);
494	if (auto* loader = scriptModuleLoader(thisObject))
495	return loader->createImportMetaProperties(globalObject, moduleLoader, moduleKey, moduleRecord, scriptFetcher);
496	return constructEmptyObject(globalObject->vm(), globalObject->nullPrototypeObjectStructure());
497	}
498
425	JSDOMGlobalObject& callerGlobalObject(JSGlobalObject& lexicalGlobalObject, CallFrame& callFrame)	499	JSDOMGlobalObject& callerGlobalObject(JSGlobalObject& lexicalGlobalObject, CallFrame& callFrame)
426	{	500	{
427	class GetCallerGlobalObjectFunctor {	501	class GetCallerGlobalObjectFunctor {

Lines 339-392 void JSDOMWindowBase::fireFrameClearedWatchpointsForWindow(DOMWindow* window) a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp_sec1
- a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp -50 lines
339	}	339	}
340	}	340	}
341		341
342	JSC::Identifier JSDOMWindowBase::moduleLoaderResolve(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleName, JSC::JSValue importerModuleKey, JSC::JSValue scriptFetcher)
343	{
344	JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
345	if (RefPtr<Document> document = thisObject->wrapped().document())
346	return document->moduleLoader().resolve(globalObject, moduleLoader, moduleName, importerModuleKey, scriptFetcher);
347	return { };
348	}
349
350	JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderFetch(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue parameters, JSC::JSValue scriptFetcher)
351	{
352	VM& vm = globalObject->vm();
353	auto scope = DECLARE_THROW_SCOPE(vm);
354	JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
355	if (RefPtr<Document> document = thisObject->wrapped().document())
356	RELEASE_AND_RETURN(scope, document->moduleLoader().fetch(globalObject, moduleLoader, moduleKey, parameters, scriptFetcher));
357	JSC::JSInternalPromise* promise = JSC::JSInternalPromise::create(vm, globalObject->internalPromiseStructure());
358	scope.release();
359	promise->reject(globalObject, jsUndefined());
360	return promise;
361	}
362
363	JSC::JSValue JSDOMWindowBase::moduleLoaderEvaluate(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSValue moduleRecord, JSC::JSValue scriptFetcher)
364	{
365	JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
366	if (RefPtr<Document> document = thisObject->wrapped().document())
367	return document->moduleLoader().evaluate(globalObject, moduleLoader, moduleKey, moduleRecord, scriptFetcher);
368	return JSC::jsUndefined();
369	}
370
371	JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderImportModule(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSString* moduleName, JSC::JSValue parameters, const JSC::SourceOrigin& sourceOrigin)
372	{
373	VM& vm = globalObject->vm();
374	auto scope = DECLARE_THROW_SCOPE(vm);
375	JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
376	if (RefPtr<Document> document = thisObject->wrapped().document())
377	RELEASE_AND_RETURN(scope, document->moduleLoader().importModule(globalObject, moduleLoader, moduleName, parameters, sourceOrigin));
378	JSC::JSInternalPromise* promise = JSC::JSInternalPromise::create(vm, globalObject->internalPromiseStructure());
379	scope.release();
380	promise->reject(globalObject, jsUndefined());
381	return promise;
382	}
383
384	JSC::JSObject* JSDOMWindowBase::moduleLoaderCreateImportMetaProperties(JSC::JSGlobalObject* globalObject, JSC::JSModuleLoader* moduleLoader, JSC::JSValue moduleKey, JSC::JSModuleRecord* moduleRecord, JSC::JSValue scriptFetcher)
385	{
386	JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
387	if (RefPtr<Document> document = thisObject->wrapped().document())
388	return document->moduleLoader().createImportMetaProperties(globalObject, moduleLoader, moduleKey, moduleRecord, scriptFetcher);
389	return constructEmptyObject(globalObject->vm(), globalObject->nullPrototypeObjectStructure());
390	}
391
392	} // namespace WebCore	342	} // namespace WebCore

Lines 59-69 const GlobalObjectMethodTable JSWorkerGlobalScopeBase::s_globalObjectMethodTable a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp_sec1
- a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp -5 / +5 lines
59	&javaScriptRuntimeFlags,	59	&javaScriptRuntimeFlags,
60	&queueMicrotaskToEventLoop,	60	&queueMicrotaskToEventLoop,
61	&shouldInterruptScriptBeforeTimeout,	61	&shouldInterruptScriptBeforeTimeout,
62	nullptr, // moduleLoaderImportModule	62	&moduleLoaderImportModule,
63	nullptr, // moduleLoaderResolve	63	&moduleLoaderResolve,
64	nullptr, // moduleLoaderFetch	64	&moduleLoaderFetch,
65	nullptr, // moduleLoaderCreateImportMetaProperties	65	&moduleLoaderCreateImportMetaProperties,
66	nullptr, // moduleLoaderEvaluate	66	&moduleLoaderEvaluate,
67	&promiseRejectionTracker,	67	&promiseRejectionTracker,
68	&reportUncaughtExceptionAtEventLoop,	68	&reportUncaughtExceptionAtEventLoop,
69	&currentScriptExecutionOwner,	69	&currentScriptExecutionOwner,

Lines 49-59 const GlobalObjectMethodTable JSWorkletGlobalScopeBase::s_globalObjectMethodTabl a/Source/WebCore/bindings/js/JSWorkletGlobalScopeBase.cpp_sec1
- a/Source/WebCore/bindings/js/JSWorkletGlobalScopeBase.cpp -5 / +5 lines
49	&javaScriptRuntimeFlags,	49	&javaScriptRuntimeFlags,
50	nullptr, // queueMicrotaskToEventLoop	50	nullptr, // queueMicrotaskToEventLoop
51	&shouldInterruptScriptBeforeTimeout,	51	&shouldInterruptScriptBeforeTimeout,
52	nullptr, // moduleLoaderImportModule	52	&moduleLoaderImportModule,
53	nullptr, // moduleLoaderResolve	53	&moduleLoaderResolve,
54	nullptr, // moduleLoaderFetch	54	&moduleLoaderFetch,
55	nullptr, // moduleLoaderCreateImportMetaProperties	55	&moduleLoaderCreateImportMetaProperties,
56	nullptr, // moduleLoaderEvaluate	56	&moduleLoaderEvaluate,
57	&promiseRejectionTracker,	57	&promiseRejectionTracker,
58	&reportUncaughtExceptionAtEventLoop,	58	&reportUncaughtExceptionAtEventLoop,
59	&currentScriptExecutionOwner,	59	&currentScriptExecutionOwner,

Line 0 a/Source/WebCore/bindings/js/ModuleScriptLoader.h_sec1
- a/Source/WebCore/bindings/js/ModuleScriptLoader.h +65 lines
		1	/*
		2	* Copyright (C) 2021 Apple Inc. All rights reserved.
		3	*
		4	* Redistribution and use in source and binary forms, with or without
		5	* modification, are permitted provided that the following conditions
		6	* are met:
		7	* 1. Redistributions of source code must retain the above copyright
		8	* notice, this list of conditions and the following disclaimer.
		9	* 2. Redistributions in binary form must reproduce the above copyright
		10	* notice, this list of conditions and the following disclaimer in the
		11	* documentation and/or other materials provided with the distribution.
		12	*
		13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
		14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
		15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
		17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
		23	* THE POSSIBILITY OF SUCH DAMAGE.
		24	*/
		25
		26	#pragma once
		27
		28	#include "JSDOMPromiseDeferred.h"
		29	#include "ModuleFetchParameters.h"
		30	#include <wtf/RefCounted.h>
		31	#include <JavaScriptCore/ScriptFetcher.h>
		32
		33	namespace WebCore {
		34
		35	class ModuleScriptLoaderClient;
		36
		37	class ModuleScriptLoader : public RefCounted<ModuleScriptLoader> {
		38	public:
		39	virtual ~ModuleScriptLoader() = default;
		40
		41	void clearClient()
		42	{
		43	ASSERT(m_client);
		44	m_client = nullptr;
		45	}
		46
		47	JSC::ScriptFetcher& scriptFetcher() { return m_scriptFetcher.get(); }
		48	ModuleFetchParameters* parameters() { return m_parameters.get(); }
		49
		50	protected:
		51	ModuleScriptLoader(ModuleScriptLoaderClient& client, DeferredPromise& promise, JSC::ScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)
		52	: m_client(&client)
		53	, m_promise(&promise)
		54	, m_scriptFetcher(scriptFetcher)
		55	, m_parameters(WTFMove(parameters))
		56	{
		57	}
		58
		59	ModuleScriptLoaderClient* m_client;
		60	RefPtr<DeferredPromise> m_promise;
		61	Ref<JSC::ScriptFetcher> m_scriptFetcher;
		62	RefPtr<ModuleFetchParameters> m_parameters;
		63	};
		64
65	} // namespace WebCore

Line 0 a/Source/WebCore/bindings/js/ModuleScriptLoaderClient.h_sec1
- a/Source/WebCore/bindings/js/ModuleScriptLoaderClient.h +40 lines
	1	/*
	2	* Copyright (C) 2021 Apple, Inc. All Rights Reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	* 1. Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* 2. Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	*
	13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
	14	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	15	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
	17	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
	18	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
	19	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
	20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
	21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25
	26	#pragma once
	27
	28	namespace WebCore {
	29
	30	class ModuleScriptLoader;
	31	class DeferredPromise;
	32
	33	class ModuleScriptLoaderClient {
	34	public:
	35	virtual ~ModuleScriptLoaderClient() = default;
	36
	37	virtual void notifyFinished(ModuleScriptLoader&, URL&&, Ref<DeferredPromise>) = 0;
	38	};
	39
	40	}

Line 0 a/Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp_sec1
- a/Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp +86 lines
		1	/*
		2	* Copyright (C) 2021 Apple Inc. All rights reserved.
		3	*
		4	* Redistribution and use in source and binary forms, with or without
		5	* modification, are permitted provided that the following conditions
		6	* are met:
		7	* 1. Redistributions of source code must retain the above copyright
		8	* notice, this list of conditions and the following disclaimer.
		9	* 2. Redistributions in binary form must reproduce the above copyright
		10	* notice, this list of conditions and the following disclaimer in the
		11	* documentation and/or other materials provided with the distribution.
		12	*
		13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
		14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
		15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
		17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
		23	* THE POSSIBILITY OF SUCH DAMAGE.
		24	*/
		25
		26	#include "config.h"
		27	#include "WorkerModuleScriptLoader.h"
		28
		29	#include "CachedScriptFetcher.h"
		30	#include "DOMWrapperWorld.h"
		31	#include "Frame.h"
		32	#include "JSDOMBinding.h"
		33	#include "JSDOMPromiseDeferred.h"
		34	#include "ModuleFetchParameters.h"
		35	#include "ResourceLoaderOptions.h"
		36	#include "ScriptController.h"
		37	#include "ScriptModuleLoader.h"
		38	#include "ScriptSourceCode.h"
		39	#include "WorkerScriptLoader.h"
		40
		41	namespace WebCore {
		42
		43	Ref<WorkerModuleScriptLoader> WorkerModuleScriptLoader::create(ModuleScriptLoaderClient& client, DeferredPromise& promise, WorkerScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)
		44	{
		45	return adoptRef(*new WorkerModuleScriptLoader(client, promise, scriptFetcher, WTFMove(parameters)));
		46	}
		47
		48	WorkerModuleScriptLoader::WorkerModuleScriptLoader(ModuleScriptLoaderClient& client, DeferredPromise& promise, WorkerScriptFetcher& scriptFetcher, RefPtr<ModuleFetchParameters>&& parameters)
		49	: ModuleScriptLoader(client, promise, scriptFetcher, WTFMove(parameters))
		50	, m_scriptLoader(WorkerScriptLoader::create())
		51	{
		52	}
		53
		54	WorkerModuleScriptLoader::~WorkerModuleScriptLoader()
		55	{
		56	m_scriptLoader->cancel();
		57	}
		58
		59	bool WorkerModuleScriptLoader::load(ScriptExecutionContext& context, URL&& sourceURL)
		60	{
		61	m_sourceURL = WTFMove(sourceURL);
		62
		63	ResourceRequest request { m_sourceURL };
		64
65	FetchOptions fetchOptions;
66	fetchOptions.mode = FetchOptions::Mode::Cors;
67	fetchOptions.cache = FetchOptions::Cache::Default;
68	fetchOptions.redirect = FetchOptions::Redirect::Follow;
69	fetchOptions.credentials = static_cast<WorkerScriptFetcher&>(scriptFetcher()).credentials();
70	auto contentSecurityPolicyEnforcement = context.shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceChildSrcDirective;
71
72	String taskMode = "loadModulesInWorkerOrWorkletMode"_s;
73	m_scriptLoader->loadAsynchronously(context, WTFMove(request), WTFMove(fetchOptions), contentSecurityPolicyEnforcement, ServiceWorkersMode::All, *this, WTFMove(taskMode));
74	return true;
75	}
76
77	void WorkerModuleScriptLoader::notifyFinished()
78	{
79	ASSERT(m_promise);
80
81	auto protectedThis = makeRef(*this);
82	if (m_client)
83	m_client->notifyFinished(*this, WTFMove(m_sourceURL), m_promise.releaseNonNull());
84	}
85
86	}

Line 0 a/Source/WebCore/bindings/js/WorkerScriptFetcher.h_sec1
- a/Source/WebCore/bindings/js/WorkerScriptFetcher.h +84 lines
		1	/*
		2	* Copyright (C) 2021 Apple Inc. All rights reserved.
		3	*
		4	* Redistribution and use in source and binary forms, with or without
		5	* modification, are permitted provided that the following conditions
		6	* are met:
		7	* 1. Redistributions of source code must retain the above copyright
		8	* notice, this list of conditions and the following disclaimer.
		9	* 2. Redistributions in binary form must reproduce the above copyright
		10	* notice, this list of conditions and the following disclaimer in the
		11	* documentation and/or other materials provided with the distribution.
		12	*
		13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
		14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
		15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
		17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
		23	* THE POSSIBILITY OF SUCH DAMAGE.
		24	*/
		25
		26	#pragma once
		27
		28	#include "LoadableScript.h"
		29	#include <JavaScriptCore/ScriptFetcher.h>
		30	#include <wtf/Optional.h>
		31	#include <wtf/text/WTFString.h>
		32
		33	namespace WebCore {
		34
		35	class CachedScript;
		36	class Document;
		37
		38	class WorkerScriptFetcher final : public JSC::ScriptFetcher {
		39	public:
		40	static Ref<WorkerScriptFetcher> create(FetchOptions::Credentials credentials)
		41	{
		42	return adoptRef(*new WorkerScriptFetcher(credentials));
		43	}
		44
		45	FetchOptions::Credentials credentials() const { return m_credentials; }
		46
		47	void notifyLoadCompleted(UniquedStringImpl& moduleKey)
		48	{
		49	m_moduleKey = &moduleKey;
		50	m_isLoaded = true;
		51	}
		52
		53	void notifyLoadFailed(LoadableScript::Error&& error)
		54	{
		55	m_error = WTFMove(error);
		56	m_isLoaded = true;
		57	}
		58
		59	void notifyLoadWasCanceled()
		60	{
		61	m_wasCanceled = true;
		62	m_isLoaded = true;
		63	}
		64
65	bool isLoaded() const { return m_isLoaded; }
66	Optional<LoadableScript::Error> error() const { return m_error; }
67	bool wasCanceled() const { return m_wasCanceled; }
68	UniquedStringImpl* moduleKey() const { return m_moduleKey.get(); }
69
70	protected:
71	WorkerScriptFetcher(FetchOptions::Credentials credentials)
72	: m_credentials(credentials)
73	{
74	}
75
76	private:
77	FetchOptions::Credentials m_credentials;
78	RefPtr<UniquedStringImpl> m_moduleKey;
79	Optional<LoadableScript::Error> m_error;
80	bool m_wasCanceled { false };
81	bool m_isLoaded { false };
82	};
83
84	} // namespace WebCore

Lines 88-103 void LoadableModuleScript::execute(ScriptElement& scriptElement) a/Source/WebCore/dom/LoadableModuleScript.cpp_sec1
- a/Source/WebCore/dom/LoadableModuleScript.cpp -12 lines
88	scriptElement.executeModuleScript(*this);	88	scriptElement.executeModuleScript(*this);
89	}	89	}
90		90
91	void LoadableModuleScript::load(Document& document, const URL& rootURL)
92	{
93	if (auto* frame = document.frame())
94	frame->script().loadModuleScript(*this, rootURL.string(), m_parameters.copyRef());
95	}
96
97	void LoadableModuleScript::load(Document& document, const ScriptSourceCode& sourceCode)
98	{
99	if (auto* frame = document.frame())
100	frame->script().loadModuleScript(*this, sourceCode);
101	}
102
103	}	91	}

Lines 50-64 class LoadableModuleScript final : public LoadableScript { a/Source/WebCore/dom/LoadableModuleScript.h_sec1
- a/Source/WebCore/dom/LoadableModuleScript.h -3 / +2 lines
50		50
51	void setError(Error&&);	51	void setError(Error&&);
52		52
53	void load(Document&, const URL& rootURL);
54	void load(Document&, const ScriptSourceCode&);
55
56	void notifyLoadCompleted(UniquedStringImpl&);	53	void notifyLoadCompleted(UniquedStringImpl&);
57	void notifyLoadFailed(LoadableScript::Error&&);	54	void notifyLoadFailed(LoadableScript::Error&&);
58	void notifyLoadWasCanceled();	55	void notifyLoadWasCanceled();
59		56
60	UniquedStringImpl* moduleKey() const { return m_moduleKey.get(); }	57	UniquedStringImpl* moduleKey() const { return m_moduleKey.get(); }
61		58
		59	ModuleFetchParameters& parameters() { return m_parameters.get(); }
		60
62	private:	61	private:
63	LoadableModuleScript(const String& nonce, const String& integrity, ReferrerPolicy, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree);	62	LoadableModuleScript(const String& nonce, const String& integrity, ReferrerPolicy, const String& crossOriginMode, const String& charset, const AtomString& initiatorName, bool isInUserAgentShadowTree);
64		63

Lines 101-110 ThreadableLoaderOptions ThreadableLoaderOptions::isolatedCopy() const a/Source/WebCore/loader/ThreadableLoader.cpp_sec1
- a/Source/WebCore/loader/ThreadableLoader.cpp -2 / +2 lines
101	}	101	}
102		102
103		103
104	RefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext& context, ThreadableLoaderClient& client, ResourceRequest&& request, const ThreadableLoaderOptions& options, String&& referrer)	104	RefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext& context, ThreadableLoaderClient& client, ResourceRequest&& request, const ThreadableLoaderOptions& options, String&& referrer, String&& taskMode)
105	{	105	{
106	if (is<WorkerGlobalScope>(context) \|\| (is<WorkletGlobalScope>(context) && downcast<WorkletGlobalScope>(context).workerOrWorkletThread()))	106	if (is<WorkerGlobalScope>(context) \|\| (is<WorkletGlobalScope>(context) && downcast<WorkletGlobalScope>(context).workerOrWorkletThread()))
107	return WorkerThreadableLoader::create(static_cast<WorkerOrWorkletGlobalScope&>(context), client, WorkerRunLoop::defaultMode(), WTFMove(request), options, WTFMove(referrer));	107	return WorkerThreadableLoader::create(static_cast<WorkerOrWorkletGlobalScope&>(context), client, WTFMove(taskMode), WTFMove(request), options, WTFMove(referrer));
108		108
109	Document* document = nullptr;	109	Document* document = nullptr;
110	if (is<WorkletGlobalScope>(context))	110	if (is<WorkletGlobalScope>(context))

Lines 73-79 WorkerMessagingProxy::~WorkerMessagingProxy() a/Source/WebCore/workers/WorkerMessagingProxy.cpp_sec1
- a/Source/WebCore/workers/WorkerMessagingProxy.cpp -2 / +2 lines
73	\|\| (is<WorkerGlobalScope>(m_scriptExecutionContext) && downcast<WorkerGlobalScope>(m_scriptExecutionContext).thread().thread() == &Thread::current()));	73	\|\| (is<WorkerGlobalScope>(m_scriptExecutionContext) && downcast<WorkerGlobalScope>(m_scriptExecutionContext).thread().thread() == &Thread::current()));
74	}	74	}
75		75
76	void WorkerMessagingProxy::startWorkerGlobalScope(const URL& scriptURL, const String& name, const String& userAgent, bool isOnline, const String& sourceCode, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicyResponseHeaders, bool shouldBypassMainWorldContentSecurityPolicy, MonotonicTime timeOrigin, ReferrerPolicy referrerPolicy, JSC::RuntimeFlags runtimeFlags)	76	void WorkerMessagingProxy::startWorkerGlobalScope(const URL& scriptURL, const String& name, const String& userAgent, bool isOnline, const String& sourceCode, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicyResponseHeaders, bool shouldBypassMainWorldContentSecurityPolicy, MonotonicTime timeOrigin, ReferrerPolicy referrerPolicy, WorkerType workerType, FetchRequestCredentials credentials, JSC::RuntimeFlags runtimeFlags)
77	{	77	{
78	// FIXME: This need to be revisited when we support nested worker one day	78	// FIXME: This need to be revisited when we support nested worker one day
79	ASSERT(m_scriptExecutionContext);	79	ASSERT(m_scriptExecutionContext);
Lines 89-95 void WorkerMessagingProxy::startWorkerGlobalScope(const URL& scriptURL, const St a/Source/WebCore/workers/WorkerMessagingProxy.cpp_sec2
89		89
90	SocketProvider* socketProvider = document.socketProvider();	90	SocketProvider* socketProvider = document.socketProvider();
91		91
92	WorkerParameters params = { scriptURL, name, identifier, userAgent, isOnline, contentSecurityPolicyResponseHeaders, shouldBypassMainWorldContentSecurityPolicy, timeOrigin, referrerPolicy, document.settingsValues() };	92	WorkerParameters params = { scriptURL, name, identifier, userAgent, isOnline, contentSecurityPolicyResponseHeaders, shouldBypassMainWorldContentSecurityPolicy, timeOrigin, referrerPolicy, workerType, credentials, document.settingsValues() };
93	auto thread = DedicatedWorkerThread::create(params, sourceCode, this, this, *this, startMode, document.topOrigin(), proxy, socketProvider, runtimeFlags);	93	auto thread = DedicatedWorkerThread::create(params, sourceCode, this, this, *this, startMode, document.topOrigin(), proxy, socketProvider, runtimeFlags);
94		94
95	workerThreadCreated(thread.get());	95	workerThreadCreated(thread.get());

Lines 31-36 a/Source/WebCore/workers/WorkerOrWorkletScriptController.h_sec1
- a/Source/WebCore/workers/WorkerOrWorkletScriptController.h +10 lines
31	#include <JavaScriptCore/JSRunLoopTimer.h>	31	#include <JavaScriptCore/JSRunLoopTimer.h>
32	#include <wtf/Forward.h>	32	#include <wtf/Forward.h>
33	#include <wtf/Lock.h>	33	#include <wtf/Lock.h>
		34	#include <wtf/MessageQueue.h>
34	#include <wtf/NakedPtr.h>	35	#include <wtf/NakedPtr.h>
35		36
36	namespace JSC {	37	namespace JSC {
Lines 44-52 class JSGlobalObject; a/Source/WebCore/workers/WorkerOrWorkletScriptController.h_sec2
44	namespace WebCore {	45	namespace WebCore {
45		46
46	class JSDOMGlobalObject;	47	class JSDOMGlobalObject;
		48	class LoadableModuleScript;
47	class ScriptSourceCode;	49	class ScriptSourceCode;
48	class WorkerConsoleClient;	50	class WorkerConsoleClient;
49	class WorkerOrWorkletGlobalScope;	51	class WorkerOrWorkletGlobalScope;
		52	class WorkerScriptFetcher;
50		53
51	class WorkerOrWorkletScriptController {	54	class WorkerOrWorkletScriptController {
52	WTF_MAKE_NONCOPYABLE(WorkerOrWorkletScriptController);	55	WTF_MAKE_NONCOPYABLE(WorkerOrWorkletScriptController);
Lines 94-99 class WorkerOrWorkletScriptController { a/Source/WebCore/workers/WorkerOrWorkletScriptController.h_sec3
94	void evaluate(const ScriptSourceCode&, String* returnedExceptionMessage = nullptr);	97	void evaluate(const ScriptSourceCode&, String* returnedExceptionMessage = nullptr);
95	void evaluate(const ScriptSourceCode&, NakedPtr<JSC::Exception>& returnedException, String* returnedExceptionMessage = nullptr);	98	void evaluate(const ScriptSourceCode&, NakedPtr<JSC::Exception>& returnedException, String* returnedExceptionMessage = nullptr);
96		99
		100	JSC::JSValue evaluateModule(JSC::JSModuleRecord&);
		101
		102	void linkAndEvaluateModule(WorkerScriptFetcher&, const ScriptSourceCode&, String* returnedExceptionMessage = nullptr);
		103	MessageQueueWaitResult loadModuleSynchronously(WorkerScriptFetcher&, const ScriptSourceCode&);
		104
		105	void loadAndEvaluateModule(const URL& moduleURL, FetchOptions::Credentials, CompletionHandler<void(Optional<Exception>&&)>&&);
		106
97	protected:	107	protected:
98	WorkerOrWorkletGlobalScope* globalScope() const { return m_globalScope; }	108	WorkerOrWorkletGlobalScope* globalScope() const { return m_globalScope; }
99		109

Lines 107-113 Optional<Exception> WorkerScriptLoader::loadSynchronously(ScriptExecutionContext a/Source/WebCore/workers/WorkerScriptLoader.cpp_sec1
- a/Source/WebCore/workers/WorkerScriptLoader.cpp -4 / +4 lines
107	return WTF::nullopt;	107	return WTF::nullopt;
108	}	108	}
109		109
110	void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext& scriptExecutionContext, ResourceRequest&& scriptRequest, FetchOptions&& fetchOptions, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, ServiceWorkersMode serviceWorkerMode, WorkerScriptLoaderClient& client)	110	void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext& scriptExecutionContext, ResourceRequest&& scriptRequest, FetchOptions&& fetchOptions, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, ServiceWorkersMode serviceWorkerMode, WorkerScriptLoaderClient& client, String&& taskMode)
111	{	111	{
112	m_client = &client;	112	m_client = &client;
113	m_url = scriptRequest.url();	113	m_url = scriptRequest.url();
Lines 123-130 void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext& scriptExecut a/Source/WebCore/workers/WorkerScriptLoader.cpp_sec2
123	ASSERT(fetchOptions.mode == FetchOptions::Mode::SameOrigin \|\| (fetchOptions.destination != FetchOptions::Destination::Serviceworker && fetchOptions.destination != FetchOptions::Destination::Worker));	123	ASSERT(fetchOptions.mode == FetchOptions::Mode::SameOrigin \|\| (fetchOptions.destination != FetchOptions::Destination::Serviceworker && fetchOptions.destination != FetchOptions::Destination::Worker));
124		124
125	ThreadableLoaderOptions options { WTFMove(fetchOptions) };	125	ThreadableLoaderOptions options { WTFMove(fetchOptions) };
126	// FIXME: We should add an option to set credential mode.
127	options.credentials = FetchOptions::Credentials::SameOrigin;
128	options.sendLoadCallbacks = SendCallbackPolicy::SendCallbacks;	126	options.sendLoadCallbacks = SendCallbackPolicy::SendCallbacks;
129	options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;	127	options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
130	if (fetchOptions.destination == FetchOptions::Destination::Serviceworker)	128	if (fetchOptions.destination == FetchOptions::Destination::Serviceworker)
Lines 143-149 void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext& scriptExecut a/Source/WebCore/workers/WorkerScriptLoader.cpp_sec3
143		141
144	// During create, callbacks may happen which remove the last reference to this object.	142	// During create, callbacks may happen which remove the last reference to this object.
145	Ref<WorkerScriptLoader> protectedThis(*this);	143	Ref<WorkerScriptLoader> protectedThis(*this);
146	m_threadableLoader = ThreadableLoader::create(scriptExecutionContext, this, WTFMove(request), options);	144	m_threadableLoader = ThreadableLoader::create(scriptExecutionContext, this, WTFMove(request), options, { }, WTFMove(taskMode));
147	}	145	}
148		146
149	const URL& WorkerScriptLoader::responseURL() const	147	const URL& WorkerScriptLoader::responseURL() const
Lines 190-195 void WorkerScriptLoader::didReceiveResponse(unsigned long identifier, const Reso a/Source/WebCore/workers/WorkerScriptLoader.cpp_sec4
190	m_certificateInfo = response.certificateInfo() ? *response.certificateInfo() : CertificateInfo();	188	m_certificateInfo = response.certificateInfo() ? *response.certificateInfo() : CertificateInfo();
191	m_responseMIMEType = response.mimeType();	189	m_responseMIMEType = response.mimeType();
192	m_responseEncoding = response.textEncodingName();	190	m_responseEncoding = response.textEncodingName();
		191	m_responseSource = response.source();
		192	m_isRedirected = response.isRedirected();
193	m_contentSecurityPolicy = ContentSecurityPolicyResponseHeaders { response };	193	m_contentSecurityPolicy = ContentSecurityPolicyResponseHeaders { response };
194	m_referrerPolicy = response.httpHeaderField(HTTPHeaderName::ReferrerPolicy);	194	m_referrerPolicy = response.httpHeaderField(HTTPHeaderName::ReferrerPolicy);
195	if (m_client)	195	if (m_client)

Lines 31-36 a/Source/WebCore/workers/WorkerScriptLoader.h_sec1
- a/Source/WebCore/workers/WorkerScriptLoader.h -2 / +6 lines
31	#include "FetchOptions.h"	31	#include "FetchOptions.h"
32	#include "ResourceError.h"	32	#include "ResourceError.h"
33	#include "ResourceRequest.h"	33	#include "ResourceRequest.h"
		34	#include "ResourceResponse.h"
34	#include "ThreadableLoader.h"	35	#include "ThreadableLoader.h"
35	#include "ThreadableLoaderClient.h"	36	#include "ThreadableLoaderClient.h"
36	#include <memory>	37	#include <memory>
Lines 43-49 a/Source/WebCore/workers/WorkerScriptLoader.h_sec2
43	namespace WebCore {	44	namespace WebCore {
44		45
45	class Exception;	46	class Exception;
46	class ResourceResponse;
47	class ScriptExecutionContext;	47	class ScriptExecutionContext;
48	class TextResourceDecoder;	48	class TextResourceDecoder;
49	class WorkerScriptLoaderClient;	49	class WorkerScriptLoaderClient;
Lines 58-64 class WorkerScriptLoader : public RefCounted<WorkerScriptLoader>, public Threada a/Source/WebCore/workers/WorkerScriptLoader.h_sec3
58	}	58	}
59		59
60	Optional<Exception> loadSynchronously(ScriptExecutionContext*, const URL&, FetchOptions::Mode, FetchOptions::Cache, ContentSecurityPolicyEnforcement, const String& initiatorIdentifier);	60	Optional<Exception> loadSynchronously(ScriptExecutionContext*, const URL&, FetchOptions::Mode, FetchOptions::Cache, ContentSecurityPolicyEnforcement, const String& initiatorIdentifier);
61	void loadAsynchronously(ScriptExecutionContext&, ResourceRequest&&, FetchOptions&&, ContentSecurityPolicyEnforcement, ServiceWorkersMode, WorkerScriptLoaderClient&);	61	void loadAsynchronously(ScriptExecutionContext&, ResourceRequest&&, FetchOptions&&, ContentSecurityPolicyEnforcement, ServiceWorkersMode, WorkerScriptLoaderClient&, String&& taskMode);
62		62
63	void notifyError();	63	void notifyError();
64		64
Lines 67-72 class WorkerScriptLoader : public RefCounted<WorkerScriptLoader>, public Threada a/Source/WebCore/workers/WorkerScriptLoader.h_sec4
67	const String& referrerPolicy() const { return m_referrerPolicy; }	67	const String& referrerPolicy() const { return m_referrerPolicy; }
68	const URL& url() const { return m_url; }	68	const URL& url() const { return m_url; }
69	const URL& responseURL() const;	69	const URL& responseURL() const;
		70	ResourceResponse::Source responseSource() const { return m_responseSource; }
		71	bool isRedirected() const { return m_isRedirected; }
70	const CertificateInfo& certificateInfo() const { return m_certificateInfo; }	72	const CertificateInfo& certificateInfo() const { return m_certificateInfo; }
71	const String& responseMIMEType() const { return m_responseMIMEType; }	73	const String& responseMIMEType() const { return m_responseMIMEType; }
72	bool failed() const { return m_failed; }	74	bool failed() const { return m_failed; }
Lines 107-112 class WorkerScriptLoader : public RefCounted<WorkerScriptLoader>, public Threada a/Source/WebCore/workers/WorkerScriptLoader.h_sec5
107	unsigned long m_identifier { 0 };	109	unsigned long m_identifier { 0 };
108	bool m_failed { false };	110	bool m_failed { false };
109	bool m_finishing { false };	111	bool m_finishing { false };
		112	bool m_isRedirected { false };
		113	ResourceResponse::Source m_responseSource { ResourceResponse::Source::Unknown };
110	ResourceError m_error;	114	ResourceError m_error;
111	};	115	};
112		116

Lines 110-116 void ServiceWorkerJob::fetchScriptWithContext(ScriptExecutionContext& context, F a/Source/WebCore/workers/service/ServiceWorkerJob.cpp_sec1
- a/Source/WebCore/workers/service/ServiceWorkerJob.cpp -1 / +2 lines
110	options.cache = cachePolicy;	110	options.cache = cachePolicy;
111	options.redirect = FetchOptions::Redirect::Error;	111	options.redirect = FetchOptions::Redirect::Error;
112	options.destination = FetchOptions::Destination::Serviceworker;	112	options.destination = FetchOptions::Destination::Serviceworker;
113	m_scriptLoader->loadAsynchronously(context, WTFMove(request), WTFMove(options), ContentSecurityPolicyEnforcement::DoNotEnforce, ServiceWorkersMode::None, *this);	113	options.credentials = FetchOptions::Credentials::SameOrigin;
		114	m_scriptLoader->loadAsynchronously(context, WTFMove(request), WTFMove(options), ContentSecurityPolicyEnforcement::DoNotEnforce, ServiceWorkersMode::None, *this, WorkerRunLoop::defaultMode());
114	}	115	}
115		116
116	ResourceError ServiceWorkerJob::validateServiceWorkerResponse(const ServiceWorkerJobData& jobData, const ResourceResponse& response)	117	ResourceError ServiceWorkerJob::validateServiceWorkerResponse(const ServiceWorkerJobData& jobData, const ResourceResponse& response)

Lines 73-80 class DummyServiceWorkerThreadProxy : public WorkerObjectProxy { a/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp_sec1
- a/Source/WebCore/workers/service/context/ServiceWorkerThread.cpp -1 / +2 lines
73	// FIXME: Use a valid WorkerObjectProxy	73	// FIXME: Use a valid WorkerObjectProxy
74	// FIXME: Use valid runtime flags	74	// FIXME: Use valid runtime flags
75		75
		76	// FIXME: Use a valid WorkerType and Credentails for module service workers.
76	ServiceWorkerThread::ServiceWorkerThread(const ServiceWorkerContextData& data, String&& userAgent, const Settings::Values& settingsValues, WorkerLoaderProxy& loaderProxy, WorkerDebuggerProxy& debuggerProxy, IDBClient::IDBConnectionProxy* idbConnectionProxy, SocketProvider* socketProvider)	77	ServiceWorkerThread::ServiceWorkerThread(const ServiceWorkerContextData& data, String&& userAgent, const Settings::Values& settingsValues, WorkerLoaderProxy& loaderProxy, WorkerDebuggerProxy& debuggerProxy, IDBClient::IDBConnectionProxy* idbConnectionProxy, SocketProvider* socketProvider)
77	: WorkerThread({ data.scriptURL, emptyString(), "serviceworker:" + Inspector::IdentifiersFactory::createIdentifier(), WTFMove(userAgent), platformStrategies()->loaderStrategy()->isOnLine(), data.contentSecurityPolicy, false, MonotonicTime::now(), { }, settingsValues }, data.script, loaderProxy, debuggerProxy, DummyServiceWorkerThreadProxy::shared(), WorkerThreadStartMode::Normal, data.registration.key.topOrigin().securityOrigin().get(), idbConnectionProxy, socketProvider, JSC::RuntimeFlags::createAllEnabled())	78	: WorkerThread({ data.scriptURL, emptyString(), "serviceworker:" + Inspector::IdentifiersFactory::createIdentifier(), WTFMove(userAgent), platformStrategies()->loaderStrategy()->isOnLine(), data.contentSecurityPolicy, false, MonotonicTime::now(), { }, WorkerType::Classic, FetchRequestCredentials::SameOrigin, settingsValues }, data.script, loaderProxy, debuggerProxy, DummyServiceWorkerThreadProxy::shared(), WorkerThreadStartMode::Normal, data.registration.key.topOrigin().securityOrigin().get(), idbConnectionProxy, socketProvider, JSC::RuntimeFlags::createAllEnabled())
78	, m_data(data.isolatedCopy())	79	, m_data(data.isolatedCopy())
79	, m_workerObjectProxy(DummyServiceWorkerThreadProxy::shared())	80	, m_workerObjectProxy(DummyServiceWorkerThreadProxy::shared())
80	, m_heartBeatTimeout(SWContextManager::singleton().connection()->shouldUseShortTimeout() ? heartBeatTimeoutForTest : heartBeatTimeout)	81	, m_heartBeatTimeout(SWContextManager::singleton().connection()->shouldUseShortTimeout() ? heartBeatTimeoutForTest : heartBeatTimeout)

Lines 158-165 ReferrerPolicy WorkletGlobalScope::referrerPolicy() const a/Source/WebCore/worklets/WorkletGlobalScope.cpp_sec1
- a/Source/WebCore/worklets/WorkletGlobalScope.cpp -3 / +2 lines
158	void WorkletGlobalScope::fetchAndInvokeScript(const URL& moduleURL, FetchRequestCredentials credentials, CompletionHandler<void(Optional<Exception>&&)>&& completionHandler)	158	void WorkletGlobalScope::fetchAndInvokeScript(const URL& moduleURL, FetchRequestCredentials credentials, CompletionHandler<void(Optional<Exception>&&)>&& completionHandler)
159	{	159	{
160	ASSERT(!isMainThread());	160	ASSERT(!isMainThread());
161	m_scriptFetchJobs.append({ moduleURL, credentials, WTFMove(completionHandler) });	161	script()->loadAndEvaluateModule(moduleURL, credentials, WTFMove(completionHandler));
162	processNextScriptFetchJobIfNeeded();
163	}	162	}
164		163
165	void WorkletGlobalScope::processNextScriptFetchJobIfNeeded()	164	void WorkletGlobalScope::processNextScriptFetchJobIfNeeded()
Lines 188-194 void WorkletGlobalScope::processNextScriptFetchJobIfNeeded() a/Source/WebCore/worklets/WorkletGlobalScope.cpp_sec2
188	auto contentSecurityPolicyEnforcement = shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceChildSrcDirective;	187	auto contentSecurityPolicyEnforcement = shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceChildSrcDirective;
189		188
190	m_scriptLoader = WorkerScriptLoader::create();	189	m_scriptLoader = WorkerScriptLoader::create();
191	m_scriptLoader->loadAsynchronously(this, WTFMove(request), WTFMove(fetchOptions), contentSecurityPolicyEnforcement, ServiceWorkersMode::All, this);	190	m_scriptLoader->loadAsynchronously(this, WTFMove(request), WTFMove(fetchOptions), contentSecurityPolicyEnforcement, ServiceWorkersMode::All, this, WorkerRunLoop::defaultMode());
192	}	191	}
193		192
194	void WorkletGlobalScope::didReceiveResponse(unsigned long, const ResourceResponse&)	193	void WorkletGlobalScope::didReceiveResponse(unsigned long, const ResourceResponse&)

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +9 lines
		1	2021-02-11 Yusuke Suzuki <ysuzuki@apple.com>
		2
		3	JS Modules in Workers
		4	https://bugs.webkit.org/show_bug.cgi?id=164860
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* TestExpectations:
		9
1	2021-02-10 Amir Mark Jr <amir_mark@apple.com>	10	2021-02-10 Amir Mark Jr <amir_mark@apple.com>
2		11
3	[MacOS] animations/keyframe-pseudo-shadow.html is flakey failing.	12	[MacOS] animations/keyframe-pseudo-shadow.html is flakey failing.

Lines 1-3 a/LayoutTests/imported/w3c/ChangeLog_sec1
- a/LayoutTests/imported/w3c/ChangeLog +35 lines
		1	2021-02-11 Yusuke Suzuki <ysuzuki@apple.com>
		2
		3	JS Modules in Workers
		4	https://bugs.webkit.org/show_bug.cgi?id=164860
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* web-platform-tests/html/semantics/scripting-1/the-script-element/json-module/non-object.tentative.any.worker-expected.txt:
		9	* web-platform-tests/html/semantics/scripting-1/the-script-element/microtasks/checkpoint-after-workerglobalscope-onerror-module-expected.txt:
		10	* web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker-importScripts-expected.txt:
		11	* web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/alpha/base-url-worker.sub-expected.txt:
		12	* web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-nothrow-worker-expected.txt:
		13	* web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-1-worker-expected.txt:
		14	* web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-worker-expected.txt:
		15	* web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-3-dynamic-worker-expected.txt:
		16	* web-platform-tests/service-workers/service-worker/import-module-scripts.https-expected.txt:
		17	* web-platform-tests/workers/baseurl/alpha/import-in-moduleworker-expected.txt:
		18	* web-platform-tests/workers/baseurl/alpha/importScripts-in-worker-expected.txt:
		19	* web-platform-tests/workers/baseurl/alpha/xhr-in-moduleworker-expected.txt:
		20	* web-platform-tests/workers/baseurl/alpha/xhr-in-worker-expected.txt:
		21	* web-platform-tests/workers/constructors/Worker/same-origin-expected.txt:
		22	* web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-expected.txt:
		23	* web-platform-tests/workers/interfaces/WorkerGlobalScope/location/redirect-module-expected.txt:
		24	* web-platform-tests/workers/modules/dedicated-worker-import-blob-url.any-expected.txt:
		25	* web-platform-tests/workers/modules/dedicated-worker-import-csp-expected.txt:
		26	* web-platform-tests/workers/modules/dedicated-worker-import-failure-expected.txt:
		27	* web-platform-tests/workers/modules/dedicated-worker-import-meta-expected.txt:
		28	* web-platform-tests/workers/modules/dedicated-worker-import-meta.html:
		29	* web-platform-tests/workers/modules/dedicated-worker-import-referrer-expected.txt:
		30	* web-platform-tests/workers/modules/dedicated-worker-import.any-expected.txt:
		31	* web-platform-tests/workers/modules/dedicated-worker-options-type-expected.txt:
		32	* web-platform-tests/workers/modules/dedicated-worker-parse-error-failure-expected.txt:
		33	* web-platform-tests/workers/name-property-expected.txt:
		34	* web-platform-tests/xhr/open-url-redirected-worker-origin-expected.txt:
		35
1	2021-02-10 Manuel Rego Casasnovas <rego@igalia.com>	36	2021-02-10 Manuel Rego Casasnovas <rego@igalia.com>
2		37
3	Add support for modifier keys in test_driver.send_keys()	38	Add support for modifier keys in test_driver.send_keys()

Lines 642-648 fast/dom/connected-subframe-counter-overflow.html [ Slow ] a/LayoutTests/TestExpectations_sec1
- a/LayoutTests/TestExpectations -2 lines
642	[ Debug ] http/tests/workers/worker-messageport-2.html [ Slow ]	642	[ Debug ] http/tests/workers/worker-messageport-2.html [ Slow ]
643		643
644	# Skip workers tests that are timing out or are SharedWorker related only	644	# Skip workers tests that are timing out or are SharedWorker related only
645	imported/w3c/web-platform-tests/workers/constructors/Worker/same-origin.html [ Skip ]
646	imported/w3c/web-platform-tests/workers/data-url-shared.html [ Skip ]	645	imported/w3c/web-platform-tests/workers/data-url-shared.html [ Skip ]
647	imported/w3c/web-platform-tests/workers/examples/onconnect.any.html [ Skip ]	646	imported/w3c/web-platform-tests/workers/examples/onconnect.any.html [ Skip ]
648	imported/w3c/web-platform-tests/workers/examples/onconnect.any.worker.html [ Skip ]	647	imported/w3c/web-platform-tests/workers/examples/onconnect.any.worker.html [ Skip ]
Lines 665-671 imported/w3c/web-platform-tests/workers/SharedWorker-replace-EventHandler.any.ht a/LayoutTests/TestExpectations_sec2
665	imported/w3c/web-platform-tests/workers/SharedWorker-replace-EventHandler.any.worker.html [ Skip ]	664	imported/w3c/web-platform-tests/workers/SharedWorker-replace-EventHandler.any.worker.html [ Skip ]
666	imported/w3c/web-platform-tests/workers/SharedWorker-script-error.html [ Skip ]	665	imported/w3c/web-platform-tests/workers/SharedWorker-script-error.html [ Skip ]
667	imported/w3c/web-platform-tests/workers/SharedWorker-simple.html [ Skip ]	666	imported/w3c/web-platform-tests/workers/SharedWorker-simple.html [ Skip ]
668	imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-referrer.html [ Skip ]
669	imported/w3c/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html [ Skip ]	667	imported/w3c/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html [ Skip ]
670		668
671	imported/w3c/web-platform-tests/workers/constructors/SharedWorker [ Skip ]	669	imported/w3c/web-platform-tests/workers/constructors/SharedWorker [ Skip ]

Lines 2-9 a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/import-module-scripts.https-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/import-module-scripts.https-expected.txt -4 / +4 lines
2	FAIL Static import. promise_test: Unhandled rejection with value: object "TypeError: SyntaxError: Unexpected token '*'. import call expects exactly one argument."	2	FAIL Static import. promise_test: Unhandled rejection with value: object "TypeError: SyntaxError: Unexpected token '*'. import call expects exactly one argument."
3	FAIL Nested static import. promise_test: Unhandled rejection with value: object "TypeError: SyntaxError: Unexpected token '*'. import call expects exactly one argument."	3	FAIL Nested static import. promise_test: Unhandled rejection with value: object "TypeError: SyntaxError: Unexpected token '*'. import call expects exactly one argument."
4	FAIL Static import and then dynamic import. promise_test: Unhandled rejection with value: object "TypeError: SyntaxError: Unexpected token '*'. import call expects exactly one argument."	4	FAIL Static import and then dynamic import. promise_test: Unhandled rejection with value: object "TypeError: SyntaxError: Unexpected token '*'. import call expects exactly one argument."
5	FAIL Dynamic import. assert_array_equals: value is "Failed to do dynamic import: Error: Could not import the module './export-on-load-script.js'.", expected array	5	PASS Dynamic import.
6	FAIL Nested dynamic import. assert_array_equals: value is "Failed to do dynamic import: Error: Could not import the module './export-on-dynamic-import-script.js'.", expected array	6	PASS Nested dynamic import.
7	FAIL Dynamic import and then static import. assert_array_equals: value is "Failed to do dynamic import: Error: Could not import the module './export-on-static-import-script.js'.", expected array	7	PASS Dynamic import and then static import.
8	FAIL eval(import()). assert_array_equals: value is "Failed to do dynamic import: Error: Could not import the module './export-on-load-script.js'.", expected array	8	PASS eval(import()).
9		9

Lines 1-13 a/LayoutTests/imported/w3c/web-platform-tests/workers/constructors/Worker/same-origin-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/constructors/Worker/same-origin-expected.txt -9 / +7 lines
1		1
2	Harness Error (TIMEOUT), message = null
3
4	PASS unsupported_scheme	2	PASS unsupported_scheme
5	FAIL data_url The operation is insecure.	3	FAIL data_url The operation is insecure.
6	TIMEOUT about_blank Test timed out	4	PASS about_blank
7	TIMEOUT example_invalid Test timed out	5	PASS example_invalid
8	TIMEOUT port_81 Test timed out	6	PASS port_81
9	TIMEOUT https_port_80 Test timed out	7	PASS https_port_80
10	TIMEOUT https_port_8000 Test timed out	8	PASS https_port_8000
11	TIMEOUT http_post_8012 Test timed out	9	PASS http_post_8012
12	TIMEOUT javascript_url Test timed out	10	PASS javascript_url
13		11

Lines 1-9 a/LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-failure-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/workers/modules/dedicated-worker-import-failure-expected.txt -3 / +3 lines
1	CONSOLE MESSAGE: SyntaxError: Unexpected string literal './non-existent-script.js'. import call expects exactly one argument.	1	CONSOLE MESSAGE: Importing a module script failed.
2		2
3	FAIL importScripts() on module worker should throw an exception. assert_equals: expected "TypeError" but got "LOADED"	3	PASS importScripts() on module worker should throw an exception.
4	PASS Worker construction for non-existent script should dispatch an ErrorEvent.	4	PASS Worker construction for non-existent script should dispatch an ErrorEvent.
5	PASS Static import for non-existent script should dispatch an ErrorEvent.	5	PASS Static import for non-existent script should dispatch an ErrorEvent.
6	FAIL Dynamic import for non-existent script should throw an exception. assert_equals: expected "TypeError" but got "Error"	6	PASS Dynamic import for non-existent script should throw an exception.
7	PASS Worker construction for an invalid URL should throw an exception.	7	PASS Worker construction for an invalid URL should throw an exception.
8	PASS Worker construction for a file URL should throw an exception.	8	PASS Worker construction for a file URL should throw an exception.
9		9