ChangeLog

2017-01-26  Yusuke Suzuki  <utatane.tea@gmail.com>

        Implement dynamic-import for WebCore

        https://bugs.webkit.org/show_bug.cgi?id=166926

        Reviewed by NOBODY (OOPS!).

        This patch introduces browser side dynamic-import implementation.

        The dynamic-import is new ES feature which is now stage 3.

        The JSC shell already implements it.

        The dynamic-import allows us to kick module loading in a dynamic manner.

        For example, you can write,

            await module = import(`${HOST}/hello.js`);

        The dynamic `import` operator (this is not a function) returns a promise with

        module namespace object if the module loading succeeds. Otherwise, it returns

        a rejected promise.

        And importantly, this feature allows us to kick module loading from classic script.

        Previously, module loading can be only used from <script type="module"> tag. And

        all the module loading is done statically.

        * CMakeLists.txt:

        * bindings/js/CachedModuleScriptLoader.cpp:

        (WebCore::CachedModuleScriptLoader::load):

        * bindings/js/CachedScriptFetcher.cpp:

        (WebCore::CachedScriptFetcher::create):

        (WebCore::CachedScriptFetcher::requestModuleScript):

        requestModuleScript function is used only when loading a new module script.

        So, LoadableClassicScript should use requestScriptWithCache to load itself.

        We pass String() for cross origin mode for null cross origin attribute as

        specified.

        (WebCore::CachedScriptFetcher::requestScriptWithCache):

        * bindings/js/CachedScriptFetcher.h:

        (WebCore::CachedScriptFetcher::CachedScriptFetcher):

        * bindings/js/JSDOMWindowBase.cpp:

        (WebCore::JSDOMWindowBase::moduleLoaderImportModule):

        * bindings/js/JSDOMWindowBase.h:

        * bindings/js/JSLazyEventListener.cpp:

        (WebCore::JSLazyEventListener::initializeJSFunction):

        * bindings/js/ScriptController.cpp:

        (WebCore::ScriptController::executeScript):

        * bindings/js/ScriptModuleLoader.cpp:

        (WebCore::resolveModuleSpecifier):

        Extract the part of resolving module specifier to a static function to use

        it in ScriptModuleLoader::resolve and ScriptModuleLoader::importModule.

        (WebCore::ScriptModuleLoader::resolve):

        (WebCore::rejectPromise):

        (WebCore::ScriptModuleLoader::importModule):

        New hook moduleLoaderImportModule is implemented. This hook is called when

        `import` operator is used. This hook is responsible to

            1. resolve the module name to obtain module specifier. (like, resolve the

                relative URL to get absolute URL.)

            2. kick module loading with the resolved specifier.

        When resolving the module name, the referrer information is needed.

        For example, "./script.js" will be resolved to "http://example.com/script.js" if

        the referrer module specifier is "http://example.com/".

        If `import("./script.js")` is executed in the classic script

        src="http://example.com/test.js", it starts loading "http://example.com/script.js".

        So the information of the caller of `import` operator is necessary here.

        This appropriate referrer is propagated by SourceOrigin.

        * bindings/js/ScriptModuleLoader.h:

        * dom/InlineClassicScript.h:

        * dom/LoadableClassicScript.cpp:

        (WebCore::LoadableClassicScript::load):

        * dom/LoadableClassicScript.h:

        * dom/LoadableModuleScript.h:

        * dom/LoadableScript.h:

        (WebCore::LoadableScript::LoadableScript):

        (WebCore::LoadableScript::isClassicScript): Deleted.

        (WebCore::LoadableScript::isModuleScript): Deleted.

        * dom/ScriptElement.h:

        * dom/ScriptElementCachedScriptFetcher.cpp: Copied from Source/WebCore/dom/InlineClassicScript.h.

        (WebCore::ScriptElementCachedScriptFetcher::requestModuleScript):

        This requestModuleScript will be used when the script tag (or modules imported from the script tag) uses `import` operator.

        In classic scripts, `crossorigin` mode always becomes "omit" while module scripts

        propagate the original `crossorigin` value.

        * dom/ScriptElementCachedScriptFetcher.h: Copied from Source/WebCore/bindings/js/CachedScriptFetcher.h.

        (WebCore::ScriptElementCachedScriptFetcher::crossOriginMode):

        (WebCore::ScriptElementCachedScriptFetcher::ScriptElementCachedScriptFetcher):

2017-01-26  Antoine Quint  <graouts@apple.com>

        [Modern Media Controls] Hiding controls, changing their width and showing them again shows an incorrect layout

Source/WebCore/CMakeLists.txt

@@set(WebCore_SOURCES

    dom/Range.cpp

    dom/ScopedEventQueue.cpp

    dom/ScriptElement.cpp

1478 dom/ScriptElementCachedScriptFetcher.cpp

    dom/ScriptExecutionContext.cpp

    dom/ScriptRunner.cpp

    dom/ScriptableDocumentParser.cpp

Source/WebCore/bindings/js/CachedModuleScriptLoader.cpp

@@CachedModuleScriptLoader::~CachedModuleScriptLoader()

bool CachedModuleScriptLoader::load(Document& document, const URL& sourceURL)

{

    ASSERT(!m_cachedScript);

64 m_cachedScript = m_scriptFetcher->requestScript~~WithCache~~(document, sourceURL);

64 m_cachedScript = m_scriptFetcher->requestModuleScript(document, sourceURL);

    if (!m_cachedScript)

        return false;

Source/WebCore/bindings/js/CachedScriptFetcher.cpp

namespace WebCore {

37 CachedResourceHandle<CachedScript> CachedScriptFetcher::requestScriptWithCache(Document& document, const URL& sourceURL) const

Ref<CachedScriptFetcher> CachedScriptFetcher::create(const String& charset)

{

    return adoptRef(*new CachedScriptFetcher(charset));

}

CachedResourceHandle<CachedScript> CachedScriptFetcher::requestModuleScript(Document& document, const URL& sourceURL) const

{

    return requestScriptWithCache(document, sourceURL, String());

}

CachedResourceHandle<CachedScript> CachedScriptFetcher::requestScriptWithCache(Document& document, const URL& sourceURL, const String& crossOriginMode) const

{

    auto* settings = document.settings();

    if (settings && !settings->isScriptEnabled())

@@CachedResourceHandle<CachedScript> CachedScriptFetcher::requestScriptWithCache(D

    options.contentSecurityPolicyImposition = hasKnownNonce ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;

    CachedResourceRequest request(ResourceRequest(sourceURL), options);

49 request.setAsPotentiallyCrossOrigin(m_crossOriginMode, document);

59 request.setAsPotentiallyCrossOrigin(crossOriginMode, document);

    request.upgradeInsecureRequestIfNeeded(document);

    request.setCharset(m_charset);

53 request.setInitiator(m_initiatorName);

63 if (!m_initiatorName.isNull())

64 request.setInitiator(m_initiatorName);

    return document.cachedResourceLoader().requestScript(WTFMove(request));

}

Source/WebCore/bindings/js/CachedScriptFetcher.h

@@class URL;

class CachedScriptFetcher : public JSC::ScriptFetcher {

public:

40 CachedResourceHandle<CachedScript> requestScriptWithCache(Document&, const URL& sourceURL) const;

    virtual CachedResourceHandle<CachedScript> requestModuleScript(Document&, const URL& sourceURL) const;

    static Ref<CachedScriptFetcher> create(const String& charset);

4143

4244protected:

43 CachedScriptFetcher(const String& nonc~~e, const String& crossOriginMod~~e, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree)

45 CachedScriptFetcher(const String& nonce, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree)

4446 : m_nonce(nonce)

45 , m_crossOriginMode(crossOriginMode)

        , m_charset(charset)

        , m_initiatorName(initiatorName)

        , m_isInUserAgentShadowTree(isInUserAgentShadowTree)

    {

    }

    CachedScriptFetcher(const String& charset)

        : m_charset(charset)

    {

    }

    CachedResourceHandle<CachedScript> requestScriptWithCache(Document&, const URL& sourceURL, const String& crossOriginMode) const;

5260private:

5361 String m_nonce;

54 String m_crossOriginMode;

    String m_charset;

    AtomicString m_initiatorName;

    bool m_isInUserAgentShadowTree { false };

Source/WebCore/bindings/js/JSDOMWindowBase.cpp

@@const GlobalObjectMethodTable JSDOMWindowBase::s_globalObjectMethodTable = {

    &javaScriptRuntimeFlags,

    &queueTaskToEventLoop,

    &shouldInterruptScriptBeforeTimeout,

67 nul~~lptr~~,

67 &moduleLoaderImportModule,

    &moduleLoaderResolve,

    &moduleLoaderFetch,

    nullptr,

@@JSC::JSValue JSDOMWindowBase::moduleLoaderEvaluate(JSC::JSGlobalObject* globalOb

    return JSC::jsUndefined();

}

JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderImportModule(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSModuleLoader* moduleLoader, JSC::JSString* moduleName, const JSC::SourceOrigin& sourceOrigin)

{

    JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);

    if (RefPtr<Document> document = thisObject->wrapped().document())

        return document->moduleLoader()->importModule(globalObject, exec, moduleLoader, moduleName, sourceOrigin);

    JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);

    return deferred->reject(exec, jsUndefined());

}

334343} // namespace WebCore

Source/WebCore/bindings/js/JSDOMWindowBase.h

@@namespace WebCore {

        static JSC::JSInternalPromise* moduleLoaderResolve(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue, JSC::JSValue);

        static JSC::JSInternalPromise* moduleLoaderFetch(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue);

        static JSC::JSValue moduleLoaderEvaluate(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue, JSC::JSValue, JSC::JSValue);

82 static JSC::JSInternalPromise* moduleLoaderImportModule(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSString*, const JSC::SourceOrigin&);

        RefPtr<DOMWindow> m_wrapped;

        JSDOMWindowShell* m_shell;

Source/WebCore/bindings/js/JSLazyEventListener.cpp

#include "config.h"

#include "JSLazyEventListener.h"

23#include "CachedScriptFetcher.h"

#include "ContentSecurityPolicy.h"

#include "Frame.h"

#include "JSNode.h"

@@JSObject* JSLazyEventListener::initializeJSFunction(ScriptExecutionContext* exec

    JSObject* jsFunction = constructFunctionSkippingEvalEnabledCheck(

        exec, exec->lexicalGlobalObject(), args, Identifier::fromString(exec, m_functionName),

115 SourceOrigin { m_sourceURL }, m_sourceURL, m_sourcePosition, overrideLineNumber);

116 SourceOrigin { m_sourceURL, CachedScriptFetcher::create(document.charset()) }, m_sourceURL, m_sourcePosition, overrideLineNumber);

    if (UNLIKELY(scope.exception())) {

        reportCurrentException(exec);

Source/WebCore/bindings/js/ScriptController.cpp

@@bool ScriptController::canExecuteScripts(ReasonForCallingCanExecuteScripts reaso

JSValue ScriptController::executeScript(const String& script, bool forceUserGesture, ExceptionDetails* exceptionDetails)

{

    UserGestureIndicator gestureIndicator(forceUserGesture ? std::optional<ProcessingUserGestureState>(ProcessingUserGesture) : std::nullopt);

678 return executeScript(ScriptSourceCode(script, m_frame.document()->url()), exceptionDetails);

678 return executeScript(ScriptSourceCode(script, m_frame.document()->url(), TextPosition(), JSC::SourceProviderSourceType::Program, CachedScriptFetcher::create(m_frame.document()->charset())), exceptionDetails);

}

JSValue ScriptController::executeScript(const ScriptSourceCode& sourceCode, ExceptionDetails* exceptionDetails)

Source/WebCore/bindings/js/ScriptModuleLoader.cpp

#include "CachedModuleScriptLoader.h"

#include "CachedScript.h"

31#include "CachedScriptFetcher.h"

#include "Document.h"

#include "Frame.h"

#include "JSDOMBinding.h"

#include "MIMETypeRegistry.h"

#include "ScriptController.h"

#include "ScriptSourceCode.h"

39#include <runtime/Completion.h>

#include <runtime/JSInternalPromise.h>

#include <runtime/JSInternalPromiseDeferred.h>

#include <runtime/JSModuleRecord.h>

@@static bool isRootModule(JSC::JSValue importerModuleKey)

    return importerModuleKey.isSymbol() || importerModuleKey.isUndefined();

}

static Expected<URL, ASCIILiteral> resolveModuleSpecifier(Document& document, const String& specifier, const URL& baseURL)

{

    // https://html.spec.whatwg.org/multipage/webappapis.html#resolve-a-module-specifier

    // 1. Apply the URL parser to specifier. If the result is not failure, return the result.

    URL absoluteURL(URL(), specifier);

    if (absoluteURL.isValid())

        return absoluteURL;

    // 2. If specifier does not start with the character U+002F SOLIDUS (/), the two-character sequence U+002E FULL STOP, U+002F SOLIDUS (./),

    //    or the three-character sequence U+002E FULL STOP, U+002E FULL STOP, U+002F SOLIDUS (../), return failure and abort these steps.

    if (!specifier.startsWith('/') && !specifier.startsWith("./") && !specifier.startsWith("../"))

        return makeUnexpected(ASCIILiteral("Module specifier does not start with \"/\", \"./\", or \"../\"."));

    // 3. Return the result of applying the URL parser to specifier with script's base URL as the base URL.

    auto result = document.completeURL(specifier, baseURL);

    if (!result.isValid())

        return makeUnexpected(ASCIILiteral("Module name does not resolve to a valid URL."));

    return result;

}

JSC::JSInternalPromise* ScriptModuleLoader::resolve(JSC::JSGlobalObject* jsGlobalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSValue moduleNameValue, JSC::JSValue importerModuleKey, JSC::JSValue)

{

    auto& globalObject = *JSC::jsCast<JSDOMGlobalObject*>(jsGlobalObject);

@@JSC::JSInternalPromise* ScriptModuleLoader::resolve(JSC::JSGlobalObject* jsGloba

        return jsPromise.promise();

    }

78 // https://html.spec.whatwg.org/multipage/webappapis.html#resolve-a-module-specifier

79

80101 if (!moduleNameValue.isString()) {

81 promise->reject(TypeError, ASCIILiteral("Module sp~~ecifier~~ is not Symbol or String."));

102 promise->reject(TypeError, ASCIILiteral("Importer module key is not a Symbol or a String."));

        return jsPromise.promise();

    }

    String specifier = asString(moduleNameValue)->value(exec);

    // 1. Apply the URL parser to specifier. If the result is not failure, return the result.

    URL absoluteURL(URL(), specifier);

    if (absoluteURL.isValid()) {

        promise->resolve<IDLDOMString>(absoluteURL.string());

        return jsPromise.promise();

    }

    // 2. If specifier does not start with the character U+002F SOLIDUS (/), the two-character sequence U+002E FULL STOP, U+002F SOLIDUS (./),

    //    or the three-character sequence U+002E FULL STOP, U+002E FULL STOP, U+002F SOLIDUS (../), return failure and abort these steps.

    if (!specifier.startsWith('/') && !specifier.startsWith("./") && !specifier.startsWith("../")) {

        promise->reject(TypeError, ASCIILiteral("Module specifier does not start with \"/\", \"./\", or \"../\"."));

        return jsPromise.promise();

    }

    // 3. Return the result of applying the URL parser to specifier with script's base URL as the base URL.

    URL completedURL;

107 URL baseURL;

105108 if (isRootModule(importerModuleKey))

106 completedURL = m_document.completeURL(specifier);

107 else if (importerModuleKey.isString()) {

        baseURL = m_document.baseURL();

    else {

        ASSERT(importerModuleKey.isString());

108112 URL importerModuleRequestURL(URL(), asString(importerModuleKey)->value(exec));

        if (!importerModuleRequestURL.isValid()) {

            promise->reject(TypeError, ASCIILiteral("Importer module key is an invalid URL."));

            return jsPromise.promise();

        }

        URL importerModuleResponseURL = m_requestURLToResponseURLMap.get(importerModuleRequestURL);

        if (!importerModuleResponseURL.isValid()) {

            promise->reject(TypeError, ASCIILiteral("Importer module has an invalid response URL."));

            return jsPromise.promise();

        }

113 ASSERT_WITH_MESSAGE(!importerModuleRequestURL.isValid(), "Invalid module referrer never starts importing dependent modules.");

119114

        completedURL = m_document.completeURL(specifier, importerModuleResponseURL);

    } else {

        promise->reject(TypeError, ASCIILiteral("Importer module key is not Symbol or String."));

        return jsPromise.promise();

        auto iterator = m_requestURLToResponseURLMap.find(importerModuleRequestURL);

        ASSERT_WITH_MESSAGE(iterator != m_requestURLToResponseURLMap.end(), "Module referrer must register itself to the map before starting importing dependent modules.");

        baseURL = iterator->value;

124118 }

125119

126 if (!completedURL.isValid()) {

127 promise->reject(TypeError, ASCIILiteral("Module name constructs an invalid URL."));

    auto result = resolveModuleSpecifier(m_document, specifier, baseURL);

    if (!result) {

        promise->reject(TypeError, result.error());

        return jsPromise.promise();

    }

131 promise->resolve<IDLDOMString>(~~comp~~le~~tedURL.~~string());

126 promise->resolve<IDLDOMString>(result->string());

    return jsPromise.promise();

}

@@JSC::JSValue ScriptModuleLoader::evaluate(JSC::JSGlobalObject*, JSC::ExecState*

    return JSC::jsUndefined();

}

static JSC::JSInternalPromise* rejectPromise(JSC::ExecState& state, JSDOMGlobalObject& globalObject, ExceptionCode ec, ASCIILiteral message)

{

    auto& jsPromise = *JSC::JSInternalPromiseDeferred::create(&state, &globalObject);

    auto deferred = DeferredPromise::create(globalObject, jsPromise);

    deferred->reject(ec, WTFMove(message));

    return jsPromise.promise();

}

JSC::JSInternalPromise* ScriptModuleLoader::importModule(JSC::JSGlobalObject* jsGlobalObject, JSC::ExecState* exec, JSC::JSModuleLoader*, JSC::JSString* moduleName, const JSC::SourceOrigin& sourceOrigin)

{

    auto& state = *exec;

    JSC::VM& vm = exec->vm();

    auto& globalObject = *JSC::jsCast<JSDOMGlobalObject*>(jsGlobalObject);

    // FIXME: setTimeout and setInterval with "string()" should propagate SourceOrigin.

    // https://webkit.org/b/167097

    ASSERT_WITH_MESSAGE(!sourceOrigin.isNull(), "If SourceOrigin is null, this function is not invoked.");

    if (!sourceOrigin.fetcher())

        return rejectPromise(state, globalObject, TypeError, ASCIILiteral("Could not use import operator in this context."));

    URL baseURL(URL(), sourceOrigin.string());

    if (!baseURL.isValid())

        return rejectPromise(state, globalObject, TypeError, ASCIILiteral("Importer module key is not Symbol or String."));

    auto specifier = moduleName->value(exec);

    auto result = resolveModuleSpecifier(m_document, specifier, baseURL);

    if (!result)

        return rejectPromise(state, globalObject, TypeError, result.error());

    return JSC::importModule(exec, JSC::Identifier::fromString(&vm, result->string()), JSC::JSScriptFetcher::create(vm, sourceOrigin.fetcher() ));

}

void ScriptModuleLoader::notifyFinished(CachedModuleScriptLoader& loader, RefPtr<DeferredPromise> promise)

{

    // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script

Source/WebCore/bindings/js/ScriptModuleLoader.h

@@class ExecState;

class JSGlobalObject;

class JSInternalPromise;

class JSModuleLoader;

41class SourceOrigin;

}

@@class ScriptModuleLoader final : private CachedModuleScriptLoaderClient {

    JSC::JSInternalPromise* resolve(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue moduleName, JSC::JSValue importerModuleKey, JSC::JSValue scriptFetcher);

    JSC::JSInternalPromise* fetch(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue moduleKey, JSC::JSValue scriptFetcher);

    JSC::JSValue evaluate(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSValue moduleKey, JSC::JSValue moduleRecord, JSC::JSValue scriptFetcher);

61 JSC::JSInternalPromise* importModule(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSModuleLoader*, JSC::JSString*, const JSC::SourceOrigin&);

private:

    void notifyFinished(CachedModuleScriptLoader&, RefPtr<DeferredPromise>) final;

Source/WebCore/dom/InlineClassicScript.h

#pragma once

28 #include "CachedScriptFetcher.h"

28#include "ScriptElementCachedScriptFetcher.h"

namespace WebCore {

class ScriptElement;

34 class InlineClassicScript final : public CachedScriptFetcher {

34class InlineClassicScript final : public ScriptElementCachedScriptFetcher {

public:

    static Ref<InlineClassicScript> create(ScriptElement&);

    bool isClassicScript() const final { return true; }

    bool isModuleScript() const final { return false; }

3841private:

3942 InlineClassicScript(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree)

40 : CachedScriptFetcher(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree)

43 : ScriptElementCachedScriptFetcher(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree)

    {

    }

};

Source/WebCore/dom/LoadableClassicScript.cpp

@@void LoadableClassicScript::execute(ScriptElement& scriptElement)

bool LoadableClassicScript::load(Document& document, const URL& sourceURL)

{

    ASSERT(!m_cachedScript);

113 m_cachedScript = requestScriptWithCache(document, sourceURL);

113 m_cachedScript = requestScriptWithCache(document, sourceURL, crossOriginMode());

    if (!m_cachedScript)

        return false;

    m_cachedScript->addClient(*this);

Source/WebCore/dom/LoadableClassicScript.h

@@class LoadableClassicScript final : public LoadableScript, private CachedResourc

    bool wasCanceled() const final;

    CachedScript& cachedScript() { return *m_cachedScript; }

50

5051 bool isClassicScript() const final { return true; }

52 bool isModuleScript() const final { return false; }

    void execute(ScriptElement&) final;

Source/WebCore/dom/LoadableModuleScript.h

@@class LoadableModuleScript final : public LoadableScript, private CachedModuleSc

    bool wasCanceled() const final;

    CachedModuleScript& moduleScript() { return m_moduleScript.get(); }

46

47 bool isClassicScript() const final { return false; }

    bool isModuleScript() const final { return true; }

    void execute(ScriptElement&) final;

Source/WebCore/dom/LoadableScript.h

#pragma once

28 #include "CachedScriptFetcher.h"

28#include "ScriptElementCachedScriptFetcher.h"

#include <runtime/ConsoleTypes.h>

#include <wtf/HashCountedSet.h>

#include <wtf/RefCounted.h>

@@namespace WebCore {

class LoadableScriptClient;

class ScriptElement;

39 class LoadableScript : public CachedScriptFetcher {

39class LoadableScript : public ScriptElementCachedScriptFetcher {

public:

    enum class ErrorType {

        CachedScript,

@@class LoadableScript : public CachedScriptFetcher {

    void addClient(LoadableScriptClient&);

    void removeClient(LoadableScriptClient&);

    virtual bool isClassicScript() const { return false; }

    virtual bool isModuleScript() const { return false; }

7269protected:

7370 LoadableScript(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree)

74 : CachedScriptFetcher(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree)

71 : ScriptElementCachedScriptFetcher(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree)

    {

    }

Source/WebCore/dom/ScriptElement.h

@@class ScriptElement {

    bool ignoresLoadRequest() const;

    bool isScriptForEventSupported() const;

98 CachedResourceHandle<CachedScript> requestScriptWithCache(const URL&, const String& nonceAttribute, const String& crossoriginAttribute);

99

    bool requestClassicScript(const String& sourceURL);

    bool requestModuleScript(const TextPosition& scriptStartPosition);

Source/WebCore/dom/ScriptElementCachedScriptFetcher.cpp

/*

 * Copyright (C) 2017 Yusuke Suzuki <utatane.tea@gmail.com>

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

#include "config.h"

#include "ScriptElementCachedScriptFetcher.h"

#include "Element.h"

#include "ScriptElement.h"

namespace WebCore {

CachedResourceHandle<CachedScript> ScriptElementCachedScriptFetcher::requestModuleScript(Document& document, const URL& sourceURL) const

{

    // https://github.com/tc39/proposal-dynamic-import/blob/master/HTML Integration.md

    // If the fetcher is not module script, credential mode is always "omit".

    String crossOriginMode = m_crossOriginMode;

    if (isClassicScript())

        crossOriginMode = ASCIILiteral("omit");

    return requestScriptWithCache(document, sourceURL, crossOriginMode);

}

}

Source/WebCore/dom/ScriptElementCachedScriptFetcher.h

/*

 * Copyright (C) 2017 Yusuke Suzuki <utatane.tea@gmail.com>

 *

 * 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 "CachedScriptFetcher.h"

namespace WebCore {

class ScriptElementCachedScriptFetcher : public CachedScriptFetcher {

public:

    virtual CachedResourceHandle<CachedScript> requestModuleScript(Document&, const URL& sourceURL) const;

    virtual bool isClassicScript() const = 0;

    virtual bool isModuleScript() const = 0;

    const String& crossOriginMode() const { return m_crossOriginMode; }

protected:

    ScriptElementCachedScriptFetcher(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree)

        : CachedScriptFetcher(nonce, charset, initiatorName, isInUserAgentShadowTree)

        , m_crossOriginMode(crossOriginMode)

    {

    }

private:

    String m_crossOriginMode;

};

} // namespace WebCore

LayoutTests/ChangeLog

2017-01-26  Yusuke Suzuki  <utatane.tea@gmail.com>

        Implement dynamic-import for WebCore

        https://bugs.webkit.org/show_bug.cgi?id=166926

        Reviewed by NOBODY (OOPS!).

        * http/tests/misc/import-absolute-url-expected.txt: Added.

        * http/tests/misc/import-absolute-url.html: Added.

        * http/tests/security/contentSecurityPolicy/1.1/import-scriptnonce-expected.txt: Added.

        * http/tests/security/contentSecurityPolicy/1.1/import-scriptnonce.html: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed1.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed2.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed3.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed4.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed5.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed6.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked1.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked2.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked3.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked4.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked5.js: Added.

        * http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked6.js: Added.

        * http/tests/security/import-module-crossorigin-loads-error-expected.txt: Added.

        * http/tests/security/import-module-crossorigin-loads-error-src-expected.txt: Added.

        * http/tests/security/import-module-crossorigin-loads-error-src.html: Added.

        * http/tests/security/import-module-crossorigin-loads-error.html: Added.

        * http/tests/security/import-module-crossorigin-loads-expected.txt: Added.

        * http/tests/security/import-module-crossorigin-loads-src-expected.txt: Added.

        * http/tests/security/import-module-crossorigin-loads-src.html: Added.

        * http/tests/security/import-module-crossorigin-loads.html: Added.

        * http/tests/security/import-script-crossorigin-loads-error-expected.txt: Added.

        * http/tests/security/import-script-crossorigin-loads-error.html: Added.

        * http/tests/security/import-script-crossorigin-loads-omit-expected.txt: Added.

        * http/tests/security/import-script-crossorigin-loads-omit.html: Added.

        * http/tests/security/resources/cors-deny.php: Added.

        * http/tests/security/resources/import-module-crossorigin-loads-error-src.js: Added.

        (import.string_appeared_here.then):

        * http/tests/security/resources/import-module-crossorigin-loads-src.js: Added.

        (import.string_appeared_here.then):

        * js/dom/modules/import-execution-order-expected.txt: Added.

        * js/dom/modules/import-execution-order.html: Copied from LayoutTests/js/dom/modules/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html.

        * js/dom/modules/import-from-handler-expected.txt: Added.

        * js/dom/modules/import-from-handler.html: Copied from LayoutTests/js/dom/modules/module-src-simple.html.

        * js/dom/modules/import-from-javascript-url-expected.txt: Added.

        * js/dom/modules/import-from-javascript-url.html: Copied from LayoutTests/js/dom/modules/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html.

        * js/dom/modules/import-from-loaded-classic-expected.txt: Added.

        * js/dom/modules/import-from-loaded-classic.html: Copied from LayoutTests/js/dom/modules/module-src-simple.html.

        * js/dom/modules/import-from-loaded-module-expected.txt: Added.

        * js/dom/modules/import-from-loaded-module.html: Copied from LayoutTests/js/dom/modules/module-src-simple.html.

        * js/dom/modules/import-from-module-expected.txt: Added.

        * js/dom/modules/import-from-module.html: Copied from LayoutTests/js/dom/modules/module-src-simple.html.

        * js/dom/modules/import-incorrect-relative-specifier-expected.txt: Added.

        * js/dom/modules/import-incorrect-relative-specifier.html: Copied from LayoutTests/js/dom/modules/module-src-simple.html.

        * js/dom/modules/import-simple-expected.txt: Added.

        * js/dom/modules/import-simple.html: Copied from LayoutTests/js/dom/modules/module-src-simple.html.

        * js/dom/modules/module-document-write-src.html:

        * js/dom/modules/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html:

        * js/dom/modules/module-execution-order-mixed-with-classic-scripts.html:

        * js/dom/modules/module-execution-order-mixed.html:

        * js/dom/modules/module-inline-dynamic.html:

        * js/dom/modules/module-inline-simple.html:

        * js/dom/modules/module-load-event-with-src.html:

        * js/dom/modules/module-load-same-module-from-different-entry-point-dynamic.html:

        * js/dom/modules/module-load-same-module-from-different-entry-point-in-src.html:

        * js/dom/modules/module-load-same-module-from-different-entry-point.html:

        * js/dom/modules/module-not-found-error-event-with-src-and-import.html:

        * js/dom/modules/module-src-current-script.html:

        * js/dom/modules/module-src-dynamic.html:

        * js/dom/modules/module-src-simple.html:

        * js/dom/modules/module-type-case-insensitive.html:

        * js/dom/modules/module-will-fire-beforeload.html:

        * js/dom/modules/nomodule-dynamic-classic-src.html:

        * js/dom/modules/nomodule-has-no-effect-on-module-inline.html:

        * js/dom/modules/nomodule-has-no-effect-on-module-src.html:

        * js/dom/modules/nomodule-prevents-execution-classic-script-src.html:

        * js/dom/modules/nomodule-reflect.html:

        * js/dom/modules/resources/error-classic-script.js: Renamed from LayoutTests/js/dom/modules/script-tests/error-classic-script.js.

        * js/dom/modules/resources/import-from-loaded-classic-finish.js: Added.

        * js/dom/modules/resources/import-from-loaded-classic.js: Added.

        * js/dom/modules/resources/import-from-loaded-module-finish.js: Added.

        * js/dom/modules/resources/import-from-loaded-module.js: Added.

        * js/dom/modules/resources/module-document-write-src.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-document-write-src.js.

        * js/dom/modules/resources/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js.

        * js/dom/modules/resources/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js.

        * js/dom/modules/resources/module-execution-order-mixed-2.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-2.js.

        * js/dom/modules/resources/module-execution-order-mixed-cappuccino.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-cappuccino.js.

        * js/dom/modules/resources/module-execution-order-mixed-cocoa.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-cocoa.js.

        * js/dom/modules/resources/module-execution-order-mixed-matcha.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-matcha.js.

        * js/dom/modules/resources/module-execution-order-mixed-with-classic-scripts-2.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-with-classic-scripts-2.js.

        * js/dom/modules/resources/module-execution-order-mixed-with-classic-scripts-cappuccino.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-with-classic-scripts-cappuccino.js.

        * js/dom/modules/resources/module-execution-order-mixed-with-classic-scripts-cocoa.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-with-classic-scripts-cocoa.js.

        * js/dom/modules/resources/module-execution-order-mixed-with-classic-scripts-matcha.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-with-classic-scripts-matcha.js.

        * js/dom/modules/resources/module-execution-order-mixed-with-classic-scripts.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-with-classic-scripts.js.

        * js/dom/modules/resources/module-execution-order-mixed.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed.js.

        * js/dom/modules/resources/module-inline-dynamic.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-inline-dynamic.js.

        * js/dom/modules/resources/module-inline-simple.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-inline-simple.js.

        * js/dom/modules/resources/module-load-event-with-src.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-load-event-with-src.js.

        * js/dom/modules/resources/module-load-same-module-from-different-entry-point.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-load-same-module-from-different-entry-point.js.

        * js/dom/modules/resources/module-not-found-error-event-with-src-and-import.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-not-found-error-event-with-src-and-import.js.

        * js/dom/modules/resources/module-src-current-script.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-src-current-script.js.

        * js/dom/modules/resources/module-src-dynamic-cocoa.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-src-dynamic-cocoa.js.

        * js/dom/modules/resources/module-src-dynamic.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-src-dynamic.js.

        * js/dom/modules/resources/module-src-simple-cocoa.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-src-simple-cocoa.js.

        * js/dom/modules/resources/module-src-simple.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-src-simple.js.

        * js/dom/modules/resources/module-will-fire-beforeload.js: Renamed from LayoutTests/js/dom/modules/script-tests/module-will-fire-beforeload.js.

2017-01-26  Antoine Quint  <graouts@apple.com>

        [Modern Media Controls] Hiding controls, changing their width and showing them again shows an incorrect layout

LayoutTests/http/tests/misc/import-absolute-url-expected.txt

Test modules with absolute URLs.

http://127.0.0.1:8000/misc/resources/module-absolute-url2.js

http://127.0.0.1:8000/misc/resources/module-absolute-url.js

PASS successfullyParsed is true

TEST COMPLETE

LayoutTests/http/tests/misc/import-absolute-url.html

<!DOCTYPE HTML>

<html>

<head>

<meta charset="UTF-8">

<script src="../../js-test-resources/js-test-pre.js"></script>

</head>

<body>

Test modules with absolute URLs.<hr>

<div id="console"></div>

<script>

var jsTestIsAsync = true;

</script>

<script>

import("http://127.0.0.1:8000/misc/resources/module-absolute-url.js").then(finishJSTest);

</script>

<script src="../../js-test-resources/js-test-post.js"></script>

</body>

</html>

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/import-scriptnonce-expected.txt

CONSOLE MESSAGE: line 37: Refused to execute a script because its hash, its nonce, or 'unsafe-inline' does not appear in the script-src directive of the Content Security Policy.

CONSOLE MESSAGE: line 43: Refused to execute a script because its hash, its nonce, or 'unsafe-inline' does not appear in the script-src directive of the Content Security Policy.

CONSOLE MESSAGE: line 49: Refused to execute a script because its hash, its nonce, or 'unsafe-inline' does not appear in the script-src directive of the Content Security Policy.

CONSOLE MESSAGE: line 55: Refused to execute a script because its hash, its nonce, or 'unsafe-inline' does not appear in the script-src directive of the Content Security Policy.

CONSOLE MESSAGE: line 61: Refused to execute a script because its hash, its nonce, or 'unsafe-inline' does not appear in the script-src directive of the Content Security Policy.

CONSOLE MESSAGE: line 67: Refused to execute a script because its hash, its nonce, or 'unsafe-inline' does not appear in the script-src directive of the Content Security Policy.

ALERT: 1,2,3,4,5,6

This tests the effect of a script-nonce value.

PASS

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/import-scriptnonce.html

<!DOCTYPE html>

<html>

    <head>

        <meta http-equiv="Content-Security-Policy" content="script-src 'nonce-noncynonce' 'nonce-noncy+/=nonce'">

        <script nonce="noncynonce">

        if (window.testRunner) {

            testRunner.dumpAsText();

            testRunner.waitUntilDone();

        }

        var array = [];

        var count = 0;

        function ok(num)

        {

            array.push(num);

            if (array.length === 6) {

                alert(array.sort().toString());

                done("PASS");

            }

        }

        function error(num)

        {

            alert(`FAIL (#{num})`);

        }

        function done(msg) {

            document.querySelector("pre").innerHTML = msg;

            if (window.testRunner)

                testRunner.notifyDone();

        }

        </script>

        <script type="module" nonce="noncynonce">

            import("./resources/import-scriptnonce-allowed1.js");

        </script>

        <script type="module" nonce="noncynonce noncynonce">

            import("./resources/import-scriptnonce-blocked1.js");

        </script>

        <script type="module" nonce="noncynonce">

            import("./resources/import-scriptnonce-allowed2.js");

        </script>

        <script type="module">

            import("./resources/import-scriptnonce-blocked2.js");

        </script>

        <script type="module" nonce="noncy+/=nonce">

            import("./resources/import-scriptnonce-allowed3.js");

        </script>

        <script type="module" nonce="noncynonceno?">

            import("./resources/import-scriptnonce-blocked3.js");

        </script>

        <script nonce="noncynonce">

            import("./resources/import-scriptnonce-allowed4.js");

        </script>

        <script nonce="noncynonce noncynonce">

            import("./resources/import-scriptnonce-blocked4.js");

        </script>

        <script nonce="noncynonce">

            import("./resources/import-scriptnonce-allowed5.js");

        </script>

        <script>

            import("./resources/import-scriptnonce-blocked5.js");

        </script>

        <script nonce="noncy+/=nonce">

            import("./resources/import-scriptnonce-allowed6.js");

        </script>

        <script nonce="noncynonceno?">

            import("./resources/import-scriptnonce-blocked6.js");

        </script>

    </head>

    <body>

        <p>

            This tests the effect of a script-nonce value.

        </p>

        <pre></pre>

    </body>

</html>

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed1.js

1ok(1);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed2.js

1ok(2);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed3.js

1ok(3);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed4.js

1ok(4);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed5.js

1ok(5);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-allowed6.js

1ok(6);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked1.js

1error(1);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked2.js

1error(2);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked3.js

1error(3);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked4.js

1error(4);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked5.js

1error(5);

LayoutTests/http/tests/security/contentSecurityPolicy/1.1/resources/import-scriptnonce-blocked6.js

1error(6);

LayoutTests/http/tests/security/import-module-crossorigin-loads-error-expected.txt

CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.

This test passes if the module script does not load.

PASS

LayoutTests/http/tests/security/import-module-crossorigin-loads-error-src-expected.txt

CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.

This test passes if the module script does not load.

PASS

LayoutTests/http/tests/security/import-module-crossorigin-loads-error-src.html

<body>

<p>This test passes if the module script does not load.</p>

<pre></pre>

<script>

if (window.testRunner) {

    testRunner.dumpAsText();

    testRunner.waitUntilDone();

}

function done(msg) {

    document.querySelector("pre").innerHTML = msg;

    if (window.testRunner)

        testRunner.notifyDone();

}

</script>

<script type="module" src="./resources/import-module-crossorigin-loads-error-src.js"></script>

LayoutTests/http/tests/security/import-module-crossorigin-loads-error.html

<body>

<p>This test passes if the module script does not load.</p>

<pre></pre>

<script>

if (window.testRunner) {

    testRunner.dumpAsText();

    testRunner.waitUntilDone();

}

function done(msg) {

    document.querySelector("pre").innerHTML = msg;

    if (window.testRunner)

        testRunner.notifyDone();

}

</script>

<script type="module">

import("http://localhost:8000/security/resources/cors-deny.php?credentials=true").then(

    function() { done("FAIL");},

    function() { done("PASS"); });

</script>

LayoutTests/http/tests/security/import-module-crossorigin-loads-expected.txt

ALERT: script ran.

This test passes if the module script loads.

PASS

LayoutTests/http/tests/security/import-module-crossorigin-loads-src-expected.txt

ALERT: script ran.

This test passes if the module script loads.

PASS

LayoutTests/http/tests/security/import-module-crossorigin-loads-src.html

<body>

<p>This test passes if the module script loads.</p>

<pre></pre>

<script>

if (window.testRunner) {

    testRunner.dumpAsText();

    testRunner.waitUntilDone();

}

function done(msg) {

    document.querySelector("pre").innerHTML = msg;

    if (window.testRunner)

        testRunner.notifyDone();

}

</script>

<script type="module" src="./resources/import-module-crossorigin-loads-src.js"></script>

LayoutTests/http/tests/security/import-module-crossorigin-loads.html

<body>

<p>This test passes if the module script loads.</p>

<pre></pre>

<script>

if (window.testRunner) {

    testRunner.dumpAsText();

    testRunner.waitUntilDone();

}

function done(msg) {

    document.querySelector("pre").innerHTML = msg;

    if (window.testRunner)

        testRunner.notifyDone();

}

</script>

<script type="module">

// Executed with "omit".

// https://github.com/tc39/proposal-dynamic-import/blob/master/HTML%20Integration.md

import("http://localhost:8000/security/resources/cors-script.php?credentials=false").then(

    function() { done("PASS");},

    function() { done("FAIL"); });

</script>

LayoutTests/http/tests/security/import-script-crossorigin-loads-error-expected.txt

CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.

This test passes if the module script does not load.

PASS

LayoutTests/http/tests/security/import-script-crossorigin-loads-error.html

<body>

<p>This test passes if the module script does not load.</p>

<pre></pre>

<script crossorigin="use-credentials">

if (window.testRunner) {

    testRunner.dumpAsText();

    testRunner.waitUntilDone();

}

function done(msg) {

    document.querySelector("pre").innerHTML = msg;

    if (window.testRunner)

        testRunner.notifyDone();

}

// Executed with "omit".

// https://github.com/tc39/proposal-dynamic-import/blob/master/HTML%20Integration.md

import("http://localhost:8000/security/resources/cors-deny.php?credentials=true").then(

    function() { done("FAIL");},

    function() { done("PASS"); });

</script>

LayoutTests/http/tests/security/import-script-crossorigin-loads-omit-expected.txt

ALERT: script ran.

This test passes if the module script loads.

PASS

LayoutTests/http/tests/security/import-script-crossorigin-loads-omit.html

<body>

<p>This test passes if the module script loads.</p>

<pre></pre>

<script crossorigin="use-credentials">

if (window.testRunner) {

    testRunner.dumpAsText();

    testRunner.waitUntilDone();

}

function done(msg) {

    document.querySelector("pre").innerHTML = msg;

    if (window.testRunner)

        testRunner.notifyDone();

}

// Executed with "omit".

// https://github.com/tc39/proposal-dynamic-import/blob/master/HTML%20Integration.md

import("http://localhost:8000/security/resources/cors-script.php?credentials=false").then(

    function() { done("PASS");},

    function() { done("FAIL"); });

</script>

LayoutTests/http/tests/security/resources/cors-deny.php

<?php

header("Access-Control-Allow-Origin: http://example.org/");

header("Content-Type: application/javascript");

if (isset($_GET["credentials"])) {

    if (strtolower($_GET["credentials"]) == "true")

        header("Access-Control-Allow-Credentials: true");

    else

        header("Access-Control-Allow-Credentials: false");

}

if (strtolower($_GET["fail"]) == "true")

    echo "throw({toString: function(){ return 'SomeError' }});";

else

    echo "alert('script ran.');";

?>

LayoutTests/http/tests/security/resources/import-module-crossorigin-loads-error-src.js

import("http://localhost:8000/security/resources/cors-deny.php?credentials=true").then(

    function() { done("FAIL");},

    function() { done("PASS"); });

LayoutTests/http/tests/security/resources/import-module-crossorigin-loads-src.js

// Executed with "omit".

// https://github.com/tc39/proposal-dynamic-import/blob/master/HTML%20Integration.md

import("http://localhost:8000/security/resources/cors-script.php?credentials=false").then(

    function() { done("PASS");},

    function() { done("FAIL"); });

LayoutTests/js/dom/modules/import-execution-order-expected.txt

Test import execution order.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

Module is not executed yet.

PASS count++ is 0

PASS count++ is 1

PASS count++ is 2

PASS count++ is 3

PASS count++ is 4

PASS count++ is 5

PASS count++ is 6

PASS successfullyParsed is true

TEST COMPLETE

LayoutTests/js/dom/modules/import-execution-order.html

<!DOCTYPE HTML>

<html>

<head>

<script src="../../../resources/js-test-pre.js"></script>

</head>

<body>

<script>

description('Test import execution order.');

window.count = 0;

// Module will be executed asynchronously.

window.jsTestIsAsync = true;

debug('Module is not executed yet.');

</script>

<script src="../../../resources/js-test-post.js"></script>

<script>

(async function () {

    await import(`./resources/module-execution-order-mixed.js`);

    shouldBe("count++", "4");

    await import(`./resources/module-execution-order-mixed-2.js`);

    shouldBe("count++", "6");

    finishJSTest();

}());

</script>

</body>

</html>

LayoutTests/js/dom/modules/import-from-handler-expected.txt

Test import from handler.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

Module is not executed yet.

Module execution is confined in the module environment.

PASS typeof cocoa is "undefined"

PASS typeof exportedCocoa is "object"

PASS exportedCocoa.taste() is "nice"

PASS successfullyParsed is true

TEST COMPLETE

MODULE

LayoutTests/js/dom/modules/import-from-handler.html

<!DOCTYPE HTML>

<html>

<head>

<script src="../../../resources/js-test-pre.js"></script>

</head>

<body>

<script>

description('Test import from handler.');

// Module will be executed asynchronously.

window.jsTestIsAsync = true;

</script>

<script>

</script>

<script src="../../../resources/js-test-post.js"></script>

<a id="target" onclick="(import(`./resources/module-src-simple.js`)).then(() => finishJSTest())">MODULE</a>

<script type="module">

debug('Module is not executed yet.');

let anchor = document.getElementById('target');

anchor.dispatchEvent(new MouseEvent('click'));

</script>

</body>

</html>

LayoutTests/js/dom/modules/import-from-javascript-url-expected.txt

Test import from javascript URL.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

Module is not executed yet.

Module execution is confined in the module environment.

PASS typeof cocoa is "undefined"

PASS typeof exportedCocoa is "object"

PASS exportedCocoa.taste() is "nice"

PASS successfullyParsed is true

TEST COMPLETE

MODULE

LayoutTests/js/dom/modules/import-from-javascript-url.html

<!DOCTYPE HTML>

<html>

<head>

<script src="../../../resources/js-test-pre.js"></script>

</head>

<body>

<script>

description('Test import from javascript URL.');

// Module will be executed asynchronously.

window.jsTestIsAsync = true;

</script>

<script>

</script>

<script src="../../../resources/js-test-post.js"></script>

<a id="target" href="javascript:void((import(`./resources/module-src-simple.js`)).then(() => finishJSTest()))">MODULE</a>

<script type="module">

debug('Module is not executed yet.');

let anchor = document.getElementById('target');

anchor.dispatchEvent(new MouseEvent('click'));

</script>

</body>

</html>

LayoutTests/js/dom/modules/import-from-loaded-classic-expected.txt

Test import from loaded classic.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

import from loaded classic

import from loaded classic finish

PASS successfullyParsed is true

TEST COMPLETE

LayoutTests/js/dom/modules/import-from-loaded-classic.html

<!DOCTYPE HTML>

<html>

<head>

<script src="../../../resources/js-test-pre.js"></script>

</head>

<body>

<script>

description('Test import from loaded classic.');

// Module will be executed asynchronously.

window.jsTestIsAsync = true;

</script>

<script>

</script>

<script src="../../../resources/js-test-post.js"></script>

<script src="./resources/import-from-loaded-classic.js"></script>

</body>

</html>

LayoutTests/js/dom/modules/import-from-loaded-module-expected.txt

Test import from loaded module.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

import from loaded module

import from loaded module finish

PASS successfullyParsed is true

TEST COMPLETE

LayoutTests/js/dom/modules/import-from-loaded-module.html

<!DOCTYPE HTML>

<html>

<head>

<script src="../../../resources/js-test-pre.js"></script>

</head>

<body>

<script>

description('Test import from loaded module.');

// Module will be executed asynchronously.

window.jsTestIsAsync = true;

</script>

<script>

</script>

<script src="../../../resources/js-test-post.js"></script>

<script type="module" src="./resources/import-from-loaded-module.js"></script>

</body>

</html>

LayoutTests/js/dom/modules/import-from-module-expected.txt

Test import from module script.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

Module is not executed yet.

Module execution is confined in the module environment.

PASS typeof cocoa is "undefined"

PASS typeof exportedCocoa is "object"

PASS exportedCocoa.taste() is "nice"

PASS successfullyParsed is true

TEST COMPLETE

LayoutTests/js/dom/modules/import-from-module.html

<!DOCTYPE HTML>

<html>

<head>

<script src="../../../resources/js-test-pre.js"></script>

</head>

<body>

<script>

description('Test import from module script.');

// Module will be executed asynchronously.

window.jsTestIsAsync = true;

</script>

<script>

</script>

<script src="../../../resources/js-test-post.js"></script>

<script type="module">

(async function() {

    debug('Module is not executed yet.');

    await import(`./resources/module-src-simple.js`);

    finishJSTest();

}());

</script>

</body>

</html>

LayoutTests/js/dom/modules/import-incorrect-relative-specifier-expected.txt

Test import rejects the incorrect relative specifiers.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

PASS import("incorrect") rejected promise  with TypeError: Module specifier does not start with "/", "./", or "../"..

PASS import("$hello") rejected promise  with TypeError: Module specifier does not start with "/", "./", or "../"..

PASS import(".../test") rejected promise  with TypeError: Module specifier does not start with "/", "./", or "../"..

PASS successfullyParsed is true

TEST COMPLETE

LayoutTests/js/dom/modules/import-incorrect-relative-specifier.html

<!DOCTYPE HTML>

<html>

<head>

<script src="../../../resources/js-test-pre.js"></script>

</head>

<body>

<script>

description('Test import rejects the incorrect relative specifiers.');

// Module will be executed asynchronously.

window.jsTestIsAsync = true;

</script>

<script src="../../../resources/js-test-post.js"></script>

<script>

(async function () {

    await shouldReject(`import("incorrect")`);

    await shouldReject(`import("$hello")`);

    await shouldReject(`import(".../test")`);

    finishJSTest();

}());

</script>

</body>

</html>

LayoutTests/js/dom/modules/import-simple-expected.txt

Test import simple.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

Module is not executed yet.

Module execution is confined in the module environment.

PASS typeof cocoa is "undefined"

PASS typeof exportedCocoa is "object"

PASS exportedCocoa.taste() is "nice"

PASS successfullyParsed is true

TEST COMPLETE

LayoutTests/js/dom/modules/import-simple.html

<!DOCTYPE HTML>

<html>

<head>

<script src="../../../resources/js-test-pre.js"></script>

</head>

<body>

<script>

description('Test import simple.');

// Module will be executed asynchronously.

window.jsTestIsAsync = true;

</script>

<script>

</script>

<script src="../../../resources/js-test-post.js"></script>

<script>

(async function() {

    debug('Module is not executed yet.');

    await import(`./resources/module-src-simple.js`);

    finishJSTest();

}());

</script>

</body>

</html>

LayoutTests/js/dom/modules/module-document-write-src.html

debug('Module is not executed yet.');

</script>

<script src="../../../resources/js-test-post.js"></script>

17 <script type="module" src="sc~~ript-test~~s/module-document-write-src.js"></script>

17<script type="module" src="resources/module-document-write-src.js"></script>

1818</body>

1919</html>

LayoutTests/js/dom/modules/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.html

</script>

<script src="../../../resources/js-test-post.js"></script>

<script type="module">

18 import "./sc~~ript-test~~s/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js"

18import "./resources/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js"

testFailed("executed");

</script>

</body>

LayoutTests/js/dom/modules/module-execution-order-mixed-with-classic-scripts.html

<script>

shouldBe("count++", "1");

</script>

23 <script type="module" src="sc~~ript-test~~s/module-execution-order-mixed-with-classic-scripts.js"></script>

23<script type="module" src="resources/module-execution-order-mixed-with-classic-scripts.js"></script>

<script>

shouldBe("count++", "2");

</script>

<script>

shouldBe("count++", "3");

</script>

33 <script type="module" src="sc~~ript-test~~s/module-execution-order-mixed-with-classic-scripts-2.js"></script>

33<script type="module" src="resources/module-execution-order-mixed-with-classic-scripts-2.js"></script>

<script>

shouldBe("count++", "4");

</script>

LayoutTests/js/dom/modules/module-execution-order-mixed.html

debug('Module is not executed yet.');

</script>

<script src="../../../resources/js-test-post.js"></script>

17 <script type="module" src="sc~~ript-test~~s/module-execution-order-mixed.js"></script>

17<script type="module" src="resources/module-execution-order-mixed.js"></script>

<script type="module">

shouldBe("count++", "4");

</script>

21 <script type="module" src="sc~~ript-test~~s/module-execution-order-mixed-2.js"></script>

21<script type="module" src="resources/module-execution-order-mixed-2.js"></script>

<script type="module">

shouldBe("count++", "6");

finishJSTest();

LayoutTests/js/dom/modules/module-inline-dynamic.html

(function () {

    var element = document.createElement("script");

    element.textContent = `

19 import Cocoa from "./sc~~ript-test~~s/module-inline-dynamic.js";

19 import Cocoa from "./resources/module-inline-dynamic.js";

        var cocoa = new Cocoa();

        debug("Module execution is confined in the module environment.");

LayoutTests/js/dom/modules/module-inline-simple.html

</script>

<script src="../../../resources/js-test-post.js"></script>

<script type="module">

18 import Cocoa from "./sc~~ript-test~~s/module-inline-simple.js";

18import Cocoa from "./resources/module-inline-simple.js";

var cocoa = new Cocoa();

debug("Module execution is confined in the module environment.");

LayoutTests/js/dom/modules/module-load-event-with-src.html

}

</script>

<script src="../../../resources/js-test-post.js"></script>

19 <script type="module" onload="onLoad()" src="sc~~ript-test~~s/module-load-event-with-src.js"></script>

19<script type="module" onload="onLoad()" src="resources/module-load-event-with-src.js"></script>

2020</body>

2121</html>

LayoutTests/js/dom/modules/module-load-same-module-from-different-entry-point-dynamic.html

</script>

<script src="../../../resources/js-test-post.js"></script>

<script type="module">

23 import "./sc~~ript-test~~s/module-load-same-module-from-different-entry-point.js"

23import "./resources/module-load-same-module-from-different-entry-point.js"

debug('Executing the module.');

shouldBe(`window.moduleExecutedCount`, `1`);

var element = document.createElement("script");

element.type = "module";

28 element.innerText = `import "./sc~~ript-test~~s/module-load-same-module-from-different-entry-point.js"`;

28element.innerText = `import "./resources/module-load-same-module-from-different-entry-point.js"`;

element.onload = onLoad;

document.body.appendChild(element);

</script>

LayoutTests/js/dom/modules/module-load-same-module-from-different-entry-point-in-src.html

</script>

<script src="../../../resources/js-test-post.js"></script>

25 <script type="module" src="./sc~~ript-test~~s/module-load-same-module-from-different-entry-point.js" onload="onLoad()"></script>

26 <script type="module" src="./sc~~ript-test~~s/module-load-same-module-from-different-entry-point.js" onload="onLoad()"></script>

25<script type="module" src="./resources/module-load-same-module-from-different-entry-point.js" onload="onLoad()"></script>

26<script type="module" src="./resources/module-load-same-module-from-different-entry-point.js" onload="onLoad()"></script>

<script type="module">

finish();

</script>

LayoutTests/js/dom/modules/module-load-same-module-from-different-entry-point.html

</script>

<script src="../../../resources/js-test-post.js"></script>

<script type="module" onload="onLoad()">

27 import "./sc~~ript-test~~s/module-load-same-module-from-different-entry-point.js"

27import "./resources/module-load-same-module-from-different-entry-point.js"

debug('Executing the module.');

window.firstModuleIsExecuted = true;

</script>

<script type="module" onload="onLoad()">

32 import "./sc~~ript-test~~s/module-load-same-module-from-different-entry-point.js"

32import "./resources/module-load-same-module-from-different-entry-point.js"

debug('Executing the module.');

window.secondModuleIsExecuted = true;

</script>

LayoutTests/js/dom/modules/module-not-found-error-event-with-src-and-import.html

}

</script>

<script src="../../../resources/js-test-post.js"></script>

19 <script type="module" src="sc~~ript-test~~s/module-not-found-error-event-with-src-and-import.js" onerror="onError()"></script>

19<script type="module" src="resources/module-not-found-error-event-with-src-and-import.js" onerror="onError()"></script>

<script type="module">

shouldNotBe(`error`, `null`);

shouldBe(`error.type`, `"error"`);

LayoutTests/js/dom/modules/module-src-current-script.html

debug('Module is not executed yet.');

</script>

<script src="../../../resources/js-test-post.js"></script>

17 <script type="module" src="./sc~~ript-test~~s/module-src-current-script.js"></script>

17<script type="module" src="./resources/module-src-current-script.js"></script>

1818</body>

1919</html>

LayoutTests/js/dom/modules/module-src-dynamic.html

(function () {

    var element = document.createElement('script');

    element.type = 'module';

19 element.src = './sc~~ript-test~~s/module-src-dynamic.js';

19 element.src = './resources/module-src-dynamic.js';

    document.body.appendChild(element);

}());

</script>

LayoutTests/js/dom/modules/module-src-simple.html

debug('Module is not executed yet.');

</script>

<script src="../../../resources/js-test-post.js"></script>

17 <script type="module" src="./sc~~ript-test~~s/module-src-simple.js"></script>

17<script type="module" src="./resources/module-src-simple.js"></script>

1818</body>

1919</html>

LayoutTests/js/dom/modules/module-type-case-insensitive.html

<script src="../../../resources/js-test-post.js"></script>

<script type="MoDuLe">

29 import Cocoa from "./sc~~ript-test~~s/module-inline-simple.js";

29import Cocoa from "./resources/module-inline-simple.js";

window.resolve1();

</script>

<script type="MODULE">

34 import Cocoa from "./sc~~ript-test~~s/module-inline-simple.js";

34import Cocoa from "./resources/module-inline-simple.js";

window.resolve2();

</script>

LayoutTests/js/dom/modules/module-will-fire-beforeload.html

debug('Module is not executed yet.');

</script>

<script src="../../../resources/js-test-post.js"></script>

14 <script type="module" onbeforeload="finishJSTest()" src="sc~~ript-test~~s/module-will-fire-beforeload.js"></script>

14<script type="module" onbeforeload="finishJSTest()" src="resources/module-will-fire-beforeload.js"></script>

1515</body>

1616</html>

LayoutTests/js/dom/modules/nomodule-dynamic-classic-src.html

(function () {

    var element = document.createElement('script');

    element.noModule = true;

19 element.src = './sc~~ript-test~~s/error-classic-script.js';

19 element.src = './resources/error-classic-script.js';

    document.body.appendChild(element);

    setTimeout(function () {

        shouldBeFalse(`executed`);

LayoutTests/js/dom/modules/nomodule-has-no-effect-on-module-inline.html

</script>

<script src="../../../resources/js-test-post.js"></script>

<script nomodule type="module">

18 import Cocoa from "./sc~~ript-test~~s/module-inline-simple.js";

18import Cocoa from "./resources/module-inline-simple.js";

var cocoa = new Cocoa();

debug("Module execution is confined in the module environment.");

LayoutTests/js/dom/modules/nomodule-has-no-effect-on-module-src.html

debug('Module is not executed yet.');

</script>

<script src="../../../resources/js-test-post.js"></script>

17 <script nomodule type="module" src="./sc~~ript-test~~s/module-src-simple.js"></script>

17<script nomodule type="module" src="./resources/module-src-simple.js"></script>

1818</body>

1919</html>

LayoutTests/js/dom/modules/nomodule-prevents-execution-classic-script-src.html

description('Test nomodule prevents execution of classic script.');

window.executed = false;

</script>

11 <script nomodule src="./sc~~ript-test~~s/module-src-simple.js"></script>

11<script nomodule src="./resources/module-src-simple.js"></script>

<script>

shouldBeFalse(`executed`);

</script>

LayoutTests/js/dom/modules/nomodule-reflect.html

window.jsTestIsAsync = true;

</script>

<script src="../../../resources/js-test-post.js"></script>

16 <script id="target" src="./sc~~ript-test~~s/error-classic-script.js" nomodule></script>

16<script id="target" src="./resources/error-classic-script.js" nomodule></script>

<script id="target2">

window.executed2 = true;

</script>

LayoutTests/js/dom/modules/resources/error-classic-script.js

window.executed = true;

testFailed("error");

LayoutTests/js/dom/modules/resources/import-from-loaded-classic-finish.js

1debug("import from loaded classic finish");

2finishJSTest();

LayoutTests/js/dom/modules/resources/import-from-loaded-classic.js

1debug("import from loaded classic");

2(import("./import-from-loaded-classic-finish.js"));

LayoutTests/js/dom/modules/resources/import-from-loaded-module-finish.js

1debug("import from loaded module finish");

2finishJSTest();

LayoutTests/js/dom/modules/resources/import-from-loaded-module.js

1debug("import from loaded module");

2(import("./import-from-loaded-module-finish.js"));

LayoutTests/js/dom/modules/resources/module-document-write-src.js

1document.write("TEST FAILED");

2finishJSTest();

LayoutTests/js/dom/modules/resources/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js

1debug("Executing the dependent module");

2throw new Error("out");

LayoutTests/js/dom/modules/resources/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js

1import "./module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js"

2testFailed("executed");

LayoutTests/js/dom/modules/resources/module-execution-order-mixed-2.js

1shouldBe("count++", "5");

LayoutTests/js/dom/modules/resources/module-execution-order-mixed-cappuccino.js

import "./module-execution-order-mixed-matcha.js"

shouldBe("count++", "2");

LayoutTests/js/dom/modules/resources/module-execution-order-mixed-cocoa.js

import "./module-execution-order-mixed-matcha.js";

shouldBe("count++", "1");

LayoutTests/js/dom/modules/resources/module-execution-order-mixed-matcha.js

1shouldBe("count++", "0");

LayoutTests/js/dom/modules/resources/module-execution-order-mixed-with-classic-scripts-2.js

1shouldBe("count++", "11");

LayoutTests/js/dom/modules/resources/module-execution-order-mixed-with-classic-scripts-cappuccino.js

import "./module-execution-order-mixed-with-classic-scripts-matcha.js"

shouldBe("count++", "8");

LayoutTests/js/dom/modules/resources/module-execution-order-mixed-with-classic-scripts-cocoa.js

import "./module-execution-order-mixed-with-classic-scripts-matcha.js";

shouldBe("count++", "7");

LayoutTests/js/dom/modules/resources/module-execution-order-mixed-with-classic-scripts-matcha.js

1shouldBe("count++", "6");

LayoutTests/js/dom/modules/resources/module-execution-order-mixed-with-classic-scripts.js

import "./module-execution-order-mixed-with-classic-scripts-cocoa.js"

import "./module-execution-order-mixed-with-classic-scripts-cappuccino.js"

shouldBe("count++", "9");

LayoutTests/js/dom/modules/resources/module-execution-order-mixed.js

import "./module-execution-order-mixed-cocoa.js"

import "./module-execution-order-mixed-cappuccino.js"

shouldBe("count++", "3");

LayoutTests/js/dom/modules/resources/module-inline-dynamic.js

export default class Cocoa {

    taste() {

        return "awesome";

    }

};

LayoutTests/js/dom/modules/resources/module-inline-simple.js

export default class Cocoa {

    taste() {

        return "awesome";

    }

};

LayoutTests/js/dom/modules/resources/module-load-event-with-src.js

1debug('Executing a module with src attribute.');

2window.moduleExecuted = true;

LayoutTests/js/dom/modules/resources/module-load-same-module-from-different-entry-point.js

1debug('Executing module-load-same-module-from-different-entry-point.js.');

2window.moduleExecutedCount++;

LayoutTests/js/dom/modules/resources/module-not-found-error-event-with-src-and-import.js

1import "./not-found.js"

LayoutTests/js/dom/modules/resources/module-src-current-script.js

debug("Module execution is confined in the module environment.");

shouldBe("document.currentScript", "null");

finishJSTest();

LayoutTests/js/dom/modules/resources/module-src-dynamic-cocoa.js

class Cocoa {

    taste() {

        return "nice";

    }

}

export default Cocoa;

LayoutTests/js/dom/modules/resources/module-src-dynamic.js

import Cocoa from "./module-src-dynamic-cocoa.js";

var cocoa = new Cocoa();

debug("Module execution is confined in the module environment.");

shouldBeEqualToString("typeof cocoa", "undefined");

window.exportedCocoa = cocoa;

shouldBeEqualToString("typeof exportedCocoa", "object");

shouldBeEqualToString("exportedCocoa.taste()", "nice");

finishJSTest();

LayoutTests/js/dom/modules/resources/module-src-simple-cocoa.js

class Cocoa {

    taste() {

        return "nice";

    }

}

export default Cocoa;

LayoutTests/js/dom/modules/resources/module-src-simple.js

import Cocoa from "./module-src-simple-cocoa.js";

var cocoa = new Cocoa();

debug("Module execution is confined in the module environment.");

shouldBeEqualToString("typeof cocoa", "undefined");

window.exportedCocoa = cocoa;

shouldBeEqualToString("typeof exportedCocoa", "object");

shouldBeEqualToString("exportedCocoa.taste()", "nice");

finishJSTest();

LayoutTests/js/dom/modules/resources/module-will-fire-beforeload.js

1testFailed("executed");

LayoutTests/js/dom/modules/script-tests/error-classic-script.js

window.executed = true;

testFailed("error");

LayoutTests/js/dom/modules/script-tests/module-document-write-src.js

1 document.write("TEST FAILED");

2 finishJSTest();

LayoutTests/js/dom/modules/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js

1 debug("Executing the dependent module");

2 throw new Error("out");

LayoutTests/js/dom/modules/script-tests/module-execution-error-inside-dependent-module-should-be-propagated-to-onerror.js

1 import "./module-execution-error-inside-dependent-module-should-be-propagated-to-onerror-throw.js"

2 testFailed("executed");

LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-2.js

1 shouldBe("count++", "5");

LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-cappuccino.js

import "./module-execution-order-mixed-matcha.js"

shouldBe("count++", "2");

LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-cocoa.js

import "./module-execution-order-mixed-matcha.js";

shouldBe("count++", "1");

LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-matcha.js

1 shouldBe("count++", "0");

LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-with-classic-scripts-2.js

1 shouldBe("count++", "11");

LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-with-classic-scripts-cappuccino.js

import "./module-execution-order-mixed-with-classic-scripts-matcha.js"

shouldBe("count++", "8");

LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-with-classic-scripts-cocoa.js

import "./module-execution-order-mixed-with-classic-scripts-matcha.js";

shouldBe("count++", "7");

LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-with-classic-scripts-matcha.js

1 shouldBe("count++", "6");

LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed-with-classic-scripts.js

import "./module-execution-order-mixed-with-classic-scripts-cocoa.js"

import "./module-execution-order-mixed-with-classic-scripts-cappuccino.js"

shouldBe("count++", "9");

LayoutTests/js/dom/modules/script-tests/module-execution-order-mixed.js

import "./module-execution-order-mixed-cocoa.js"

import "./module-execution-order-mixed-cappuccino.js"

shouldBe("count++", "3");

LayoutTests/js/dom/modules/script-tests/module-inline-dynamic.js

export default class Cocoa {

    taste() {

        return "awesome";

    }

};

LayoutTests/js/dom/modules/script-tests/module-inline-simple.js

export default class Cocoa {

    taste() {

        return "awesome";

    }

};

LayoutTests/js/dom/modules/script-tests/module-load-event-with-src.js

1 debug('Executing a module with src attribute.');

2 window.moduleExecuted = true;

LayoutTests/js/dom/modules/script-tests/module-load-same-module-from-different-entry-point.js

1 debug('Executing module-load-same-module-from-different-entry-point.js.');

2 window.moduleExecutedCount++;

LayoutTests/js/dom/modules/script-tests/module-not-found-error-event-with-src-and-import.js

1 import "./not-found.js"

LayoutTests/js/dom/modules/script-tests/module-src-current-script.js

debug("Module execution is confined in the module environment.");

shouldBe("document.currentScript", "null");

finishJSTest();

LayoutTests/js/dom/modules/script-tests/module-src-dynamic-cocoa.js

class Cocoa {

    taste() {

        return "nice";

    }

}

export default Cocoa;

LayoutTests/js/dom/modules/script-tests/module-src-dynamic.js

import Cocoa from "./module-src-dynamic-cocoa.js";

var cocoa = new Cocoa();

debug("Module execution is confined in the module environment.");

shouldBeEqualToString("typeof cocoa", "undefined");

window.exportedCocoa = cocoa;

shouldBeEqualToString("typeof exportedCocoa", "object");

shouldBeEqualToString("exportedCocoa.taste()", "nice");

finishJSTest();

LayoutTests/js/dom/modules/script-tests/module-src-simple-cocoa.js

class Cocoa {

    taste() {

        return "nice";

    }

}

export default Cocoa;

LayoutTests/js/dom/modules/script-tests/module-src-simple.js

import Cocoa from "./module-src-simple-cocoa.js";

var cocoa = new Cocoa();

debug("Module execution is confined in the module environment.");

shouldBeEqualToString("typeof cocoa", "undefined");

window.exportedCocoa = cocoa;

shouldBeEqualToString("typeof exportedCocoa", "object");

shouldBeEqualToString("exportedCocoa.taste()", "nice");

finishJSTest();

LayoutTests/js/dom/modules/script-tests/module-will-fire-beforeload.js

1 testFailed("executed");