Changeset 211313 in webkit


Ignore:
Timestamp:
Jan 27, 2017 4:47:30 PM (7 years ago)
Author:
Yusuke Suzuki
Message:

Merge CachedModuleScript and LoadableModuleScript
https://bugs.webkit.org/show_bug.cgi?id=167500

Reviewed by Darin Adler.

CachedModuleScript becomes duplicate with LoadableModuleScript.
And CachedModuleScript does not offer any meaningful functionality
to LoadableModuleScript.
This patch merges CachedModuleScript to LoadableModuleScript.

No behavior change.

  • CMakeLists.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/CachedModuleScript.cpp: Removed.
  • bindings/js/CachedModuleScript.h: Removed.
  • bindings/js/CachedModuleScriptClient.h: Removed.
  • bindings/js/JSBindingsAllInOne.cpp:
  • bindings/js/ScriptController.cpp:

(WebCore::ScriptController::loadModuleScriptInWorld):
(WebCore::ScriptController::loadModuleScript):
(WebCore::ScriptController::linkAndEvaluateModuleScriptInWorld):
(WebCore::ScriptController::linkAndEvaluateModuleScript):
(WebCore::ScriptController::setupModuleScriptHandlers):

  • bindings/js/ScriptController.h:
  • dom/LoadableModuleScript.cpp:

(WebCore::LoadableModuleScript::create):
(WebCore::LoadableModuleScript::LoadableModuleScript):
(WebCore::LoadableModuleScript::~LoadableModuleScript):
(WebCore::LoadableModuleScript::isLoaded):
(WebCore::LoadableModuleScript::error):
(WebCore::LoadableModuleScript::wasCanceled):
(WebCore::LoadableModuleScript::notifyLoadCompleted):
(WebCore::LoadableModuleScript::notifyLoadFailed):
(WebCore::LoadableModuleScript::notifyLoadWasCanceled):
(WebCore::LoadableModuleScript::execute):
(WebCore::LoadableModuleScript::load):
(WebCore::LoadableModuleScript::notifyFinished): Deleted.

  • dom/LoadableModuleScript.h:
  • dom/ScriptElement.cpp:

(WebCore::ScriptElement::executeModuleScript):

  • dom/ScriptElement.h:
Location:
trunk/Source/WebCore
Files:
3 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r211283 r211313  
    10681068    animation/WebAnimation.cpp
    10691069
    1070     bindings/js/CachedModuleScript.cpp
    10711070    bindings/js/CachedModuleScriptLoader.cpp
    10721071    bindings/js/CachedScriptFetcher.cpp
  • trunk/Source/WebCore/ChangeLog

    r211309 r211313  
     12017-01-27  Yusuke Suzuki  <utatane.tea@gmail.com>
     2
     3        Merge CachedModuleScript and LoadableModuleScript
     4        https://bugs.webkit.org/show_bug.cgi?id=167500
     5
     6        Reviewed by Darin Adler.
     7
     8        CachedModuleScript becomes duplicate with LoadableModuleScript.
     9        And CachedModuleScript does not offer any meaningful functionality
     10        to LoadableModuleScript.
     11        This patch merges CachedModuleScript to LoadableModuleScript.
     12
     13        No behavior change.
     14
     15        * CMakeLists.txt:
     16        * WebCore.xcodeproj/project.pbxproj:
     17        * bindings/js/CachedModuleScript.cpp: Removed.
     18        * bindings/js/CachedModuleScript.h: Removed.
     19        * bindings/js/CachedModuleScriptClient.h: Removed.
     20        * bindings/js/JSBindingsAllInOne.cpp:
     21        * bindings/js/ScriptController.cpp:
     22        (WebCore::ScriptController::loadModuleScriptInWorld):
     23        (WebCore::ScriptController::loadModuleScript):
     24        (WebCore::ScriptController::linkAndEvaluateModuleScriptInWorld):
     25        (WebCore::ScriptController::linkAndEvaluateModuleScript):
     26        (WebCore::ScriptController::setupModuleScriptHandlers):
     27        * bindings/js/ScriptController.h:
     28        * dom/LoadableModuleScript.cpp:
     29        (WebCore::LoadableModuleScript::create):
     30        (WebCore::LoadableModuleScript::LoadableModuleScript):
     31        (WebCore::LoadableModuleScript::~LoadableModuleScript):
     32        (WebCore::LoadableModuleScript::isLoaded):
     33        (WebCore::LoadableModuleScript::error):
     34        (WebCore::LoadableModuleScript::wasCanceled):
     35        (WebCore::LoadableModuleScript::notifyLoadCompleted):
     36        (WebCore::LoadableModuleScript::notifyLoadFailed):
     37        (WebCore::LoadableModuleScript::notifyLoadWasCanceled):
     38        (WebCore::LoadableModuleScript::execute):
     39        (WebCore::LoadableModuleScript::load):
     40        (WebCore::LoadableModuleScript::notifyFinished): Deleted.
     41        * dom/LoadableModuleScript.h:
     42        * dom/ScriptElement.cpp:
     43        (WebCore::ScriptElement::executeModuleScript):
     44        * dom/ScriptElement.h:
     45
    1462017-01-27  Michael Saboff  <msaboff@apple.com>
    247
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r211294 r211313  
    63046304                E30592671E27A3D100D57C98 /* CachedScriptFetcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E30592651E27A3C600D57C98 /* CachedScriptFetcher.cpp */; };
    63056305                E30592681E27A3D100D57C98 /* CachedScriptFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E30592661E27A3C600D57C98 /* CachedScriptFetcher.h */; settings = {ATTRIBUTES = (Private, ); }; };
    6306                 E307DECC1D81E4B300141CAF /* CachedModuleScript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E307DEC91D81E46E00141CAF /* CachedModuleScript.cpp */; };
    6307                 E307DECD1D81E4B600141CAF /* CachedModuleScript.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DECA1D81E46E00141CAF /* CachedModuleScript.h */; settings = {ATTRIBUTES = (Private, ); }; };
    6308                 E307DECE1D81E4BA00141CAF /* CachedModuleScriptClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DECB1D81E49500141CAF /* CachedModuleScriptClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
    63096306                E307DECF1D81E4C300141CAF /* CachedModuleScriptLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E307DEC61D81E44800141CAF /* CachedModuleScriptLoader.cpp */; };
    63106307                E307DED01D81E4C700141CAF /* CachedModuleScriptLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E307DEC71D81E44800141CAF /* CachedModuleScriptLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    1436114358                E307DEC71D81E44800141CAF /* CachedModuleScriptLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedModuleScriptLoader.h; sourceTree = "<group>"; };
    1436214359                E307DEC81D81E44800141CAF /* CachedModuleScriptLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedModuleScriptLoaderClient.h; sourceTree = "<group>"; };
    14363                 E307DEC91D81E46E00141CAF /* CachedModuleScript.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedModuleScript.cpp; sourceTree = "<group>"; };
    14364                 E307DECA1D81E46E00141CAF /* CachedModuleScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedModuleScript.h; sourceTree = "<group>"; };
    14365                 E307DECB1D81E49500141CAF /* CachedModuleScriptClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedModuleScriptClient.h; sourceTree = "<group>"; };
    1436614360                E307DED21D81E4ED00141CAF /* LoadableModuleScript.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoadableModuleScript.cpp; sourceTree = "<group>"; };
    1436714361                E307DED31D81E4ED00141CAF /* LoadableModuleScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoadableModuleScript.h; sourceTree = "<group>"; };
     
    2213522129                                14DFB33F0A7DF7630018F769 /* Derived Sources */,
    2213622130                                2DFA488E1DB541C200362B99 /* BufferSource.h */,
    22137                                 E307DEC91D81E46E00141CAF /* CachedModuleScript.cpp */,
    22138                                 E307DECA1D81E46E00141CAF /* CachedModuleScript.h */,
    22139                                 E307DECB1D81E49500141CAF /* CachedModuleScriptClient.h */,
    2214022131                                E307DEC61D81E44800141CAF /* CachedModuleScriptLoader.cpp */,
    2214122132                                E307DEC71D81E44800141CAF /* CachedModuleScriptLoader.h */,
     
    2517025161                                BCB16C1C0979C3BD00467741 /* CachedImage.h in Headers */,
    2517125162                                319FBD5F15D2F464009640A6 /* CachedImageClient.h in Headers */,
    25172                                 E307DECD1D81E4B600141CAF /* CachedModuleScript.h in Headers */,
    25173                                 E307DECE1D81E4BA00141CAF /* CachedModuleScriptClient.h in Headers */,
    2517425163                                E307DED01D81E4C700141CAF /* CachedModuleScriptLoader.h in Headers */,
    2517525164                                E307DED11D81E4CB00141CAF /* CachedModuleScriptLoaderClient.h in Headers */,
     
    2908029069                                51C0AA410F2AA15E001648C2 /* CachedFrame.cpp in Sources */,
    2908129070                                BCB16C1B0979C3BD00467741 /* CachedImage.cpp in Sources */,
    29082                                 E307DECC1D81E4B300141CAF /* CachedModuleScript.cpp in Sources */,
    2908329071                                E307DECF1D81E4C300141CAF /* CachedModuleScriptLoader.cpp in Sources */,
    2908429072                                5101846A0B08602A004A825F /* CachedPage.cpp in Sources */,
  • trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp

    r210780 r211313  
    2626// This all-in-one cpp file cuts down on template bloat to allow us to build our Windows release build.
    2727
    28 #include "CachedModuleScript.cpp"
    2928#include "CachedModuleScriptLoader.cpp"
    3029#include "CallbackFunction.cpp"
  • trunk/Source/WebCore/bindings/js/ScriptController.cpp

    r211280 r211313  
    2323
    2424#include "BridgeJSC.h"
    25 #include "CachedModuleScript.h"
    2625#include "CachedScriptFetcher.h"
    2726#include "CommonVM.h"
     
    3736#include "JSDocument.h"
    3837#include "JSMainThreadExecState.h"
     38#include "LoadableModuleScript.h"
    3939#include "MainFrame.h"
    4040#include "MemoryPressureHandler.h"
     
    187187}
    188188
    189 void ScriptController::loadModuleScriptInWorld(CachedModuleScript& moduleScript, const String& moduleName, CachedScriptFetcher& scriptFetcher, DOMWrapperWorld& world)
     189void ScriptController::loadModuleScriptInWorld(LoadableModuleScript& moduleScript, const String& moduleName, DOMWrapperWorld& world)
    190190{
    191191    JSLockHolder lock(world.vm());
     
    194194    auto& state = *shell.window()->globalExec();
    195195
    196     auto& promise = JSMainThreadExecState::loadModule(state, moduleName, JSC::JSScriptFetcher::create(state.vm(), { &scriptFetcher }));
     196    auto& promise = JSMainThreadExecState::loadModule(state, moduleName, JSC::JSScriptFetcher::create(state.vm(), { &moduleScript }));
    197197    setupModuleScriptHandlers(moduleScript, promise, world);
    198198}
    199199
    200 void ScriptController::loadModuleScript(CachedModuleScript& moduleScript, const String& moduleName, CachedScriptFetcher& scriptFetcher)
    201 {
    202     loadModuleScriptInWorld(moduleScript, moduleName, scriptFetcher, mainThreadNormalWorld());
    203 }
    204 
    205 void ScriptController::loadModuleScriptInWorld(CachedModuleScript& moduleScript, const ScriptSourceCode& sourceCode, CachedScriptFetcher& scriptFetcher, DOMWrapperWorld& world)
     200void ScriptController::loadModuleScript(LoadableModuleScript& moduleScript, const String& moduleName)
     201{
     202    loadModuleScriptInWorld(moduleScript, moduleName, mainThreadNormalWorld());
     203}
     204
     205void ScriptController::loadModuleScriptInWorld(LoadableModuleScript& moduleScript, const ScriptSourceCode& sourceCode, DOMWrapperWorld& world)
    206206{
    207207    JSLockHolder lock(world.vm());
     
    210210    auto& state = *shell.window()->globalExec();
    211211
    212     auto& promise = JSMainThreadExecState::loadModule(state, sourceCode.jsSourceCode(), JSC::JSScriptFetcher::create(state.vm(), { &scriptFetcher }));
     212    auto& promise = JSMainThreadExecState::loadModule(state, sourceCode.jsSourceCode(), JSC::JSScriptFetcher::create(state.vm(), { &moduleScript }));
    213213    setupModuleScriptHandlers(moduleScript, promise, world);
    214214}
    215215
    216 void ScriptController::loadModuleScript(CachedModuleScript& moduleScript, const ScriptSourceCode& sourceCode, CachedScriptFetcher& scriptFetcher)
    217 {
    218     loadModuleScriptInWorld(moduleScript, sourceCode, scriptFetcher, mainThreadNormalWorld());
    219 }
    220 
    221 JSC::JSValue ScriptController::linkAndEvaluateModuleScriptInWorld(CachedModuleScript& moduleScript, DOMWrapperWorld& world)
     216void ScriptController::loadModuleScript(LoadableModuleScript& moduleScript, const ScriptSourceCode& sourceCode)
     217{
     218    loadModuleScriptInWorld(moduleScript, sourceCode, mainThreadNormalWorld());
     219}
     220
     221JSC::JSValue ScriptController::linkAndEvaluateModuleScriptInWorld(LoadableModuleScript& moduleScript, DOMWrapperWorld& world)
    222222{
    223223    JSLockHolder lock(world.vm());
     
    241241}
    242242
    243 JSC::JSValue ScriptController::linkAndEvaluateModuleScript(CachedModuleScript& moduleScript)
     243JSC::JSValue ScriptController::linkAndEvaluateModuleScript(LoadableModuleScript& moduleScript)
    244244{
    245245    return linkAndEvaluateModuleScriptInWorld(moduleScript, mainThreadNormalWorld());
     
    369369}
    370370
    371 void ScriptController::setupModuleScriptHandlers(CachedModuleScript& moduleScriptRef, JSInternalPromise& promise, DOMWrapperWorld& world)
     371void ScriptController::setupModuleScriptHandlers(LoadableModuleScript& moduleScriptRef, JSInternalPromise& promise, DOMWrapperWorld& world)
    372372{
    373373    auto& shell = *windowShell(world);
     
    381381    JSC::PrivateName moduleLoaderFetchingIsCanceledSymbol = m_moduleLoaderFetchingIsCanceledSymbol;
    382382
    383     RefPtr<CachedModuleScript> moduleScript(&moduleScriptRef);
     383    RefPtr<LoadableModuleScript> moduleScript(&moduleScriptRef);
    384384
    385385    auto& fulfillHandler = *JSNativeStdFunction::create(state.vm(), shell.window(), 1, String(), [moduleScript](ExecState* exec) {
  • trunk/Source/WebCore/bindings/js/ScriptController.h

    r210627 r211313  
    5252namespace WebCore {
    5353
    54 class CachedModuleScript;
    5554class CachedScriptFetcher;
    5655class Frame;
    5756class HTMLDocument;
    5857class HTMLPlugInElement;
     58class LoadableModuleScript;
    5959class SecurityOrigin;
    6060class ScriptSourceCode;
     
    115115    JSC::JSValue evaluateInWorld(const ScriptSourceCode&, DOMWrapperWorld&, ExceptionDetails* = nullptr);
    116116
    117     void loadModuleScriptInWorld(CachedModuleScript&, const String& moduleName, CachedScriptFetcher&, DOMWrapperWorld&);
    118     void loadModuleScript(CachedModuleScript&, const String& moduleName, CachedScriptFetcher&);
    119     void loadModuleScriptInWorld(CachedModuleScript&, const ScriptSourceCode&, CachedScriptFetcher&, DOMWrapperWorld&);
    120     void loadModuleScript(CachedModuleScript&, const ScriptSourceCode&, CachedScriptFetcher&);
    121 
    122     JSC::JSValue linkAndEvaluateModuleScriptInWorld(CachedModuleScript& , DOMWrapperWorld&);
    123     JSC::JSValue linkAndEvaluateModuleScript(CachedModuleScript&);
     117    void loadModuleScriptInWorld(LoadableModuleScript&, const String& moduleName, DOMWrapperWorld&);
     118    void loadModuleScript(LoadableModuleScript&, const String& moduleName);
     119    void loadModuleScriptInWorld(LoadableModuleScript&, const ScriptSourceCode&, DOMWrapperWorld&);
     120    void loadModuleScript(LoadableModuleScript&, const ScriptSourceCode&);
     121
     122    JSC::JSValue linkAndEvaluateModuleScriptInWorld(LoadableModuleScript& , DOMWrapperWorld&);
     123    JSC::JSValue linkAndEvaluateModuleScript(LoadableModuleScript&);
    124124
    125125    JSC::JSValue evaluateModule(const URL&, JSC::JSModuleRecord&, DOMWrapperWorld&);
     
    182182private:
    183183    WEBCORE_EXPORT JSDOMWindowShell* initScript(DOMWrapperWorld&);
    184     void setupModuleScriptHandlers(CachedModuleScript&, JSC::JSInternalPromise&, DOMWrapperWorld&);
     184    void setupModuleScriptHandlers(LoadableModuleScript&, JSC::JSInternalPromise&, DOMWrapperWorld&);
    185185
    186186    void disconnectPlatformScriptObjects();
  • trunk/Source/WebCore/dom/LoadableModuleScript.cpp

    r210585 r211313  
    2727#include "LoadableModuleScript.h"
    2828
     29#include "Document.h"
     30#include "Frame.h"
     31#include "ScriptController.h"
    2932#include "ScriptElement.h"
    3033
     
    3336Ref<LoadableModuleScript> LoadableModuleScript::create(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree)
    3437{
    35     return adoptRef(*new LoadableModuleScript(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree, CachedModuleScript::create()));
     38    return adoptRef(*new LoadableModuleScript(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree));
    3639}
    3740
    38 LoadableModuleScript::LoadableModuleScript(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree, Ref<CachedModuleScript>&& moduleScript)
     41LoadableModuleScript::LoadableModuleScript(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree)
    3942    : LoadableScript(nonce, crossOriginMode, charset, initiatorName, isInUserAgentShadowTree)
    40     , m_moduleScript(WTFMove(moduleScript))
    4143{
    42     m_moduleScript->addClient(*this);
    4344}
    4445
    4546LoadableModuleScript::~LoadableModuleScript()
    4647{
    47     m_moduleScript->removeClient(*this);
    4848}
    4949
    5050bool LoadableModuleScript::isLoaded() const
    5151{
    52     return m_moduleScript->isLoaded();
     52    return m_isLoaded;
    5353}
    5454
    5555std::optional<LoadableScript::Error> LoadableModuleScript::error() const
    5656{
    57     return m_moduleScript->error();
     57    return m_error;
    5858}
    5959
    6060bool LoadableModuleScript::wasCanceled() const
    6161{
    62     return m_moduleScript->wasCanceled();
     62    return m_wasCanceled;
    6363}
    6464
    65 void LoadableModuleScript::notifyFinished(CachedModuleScript&)
     65void LoadableModuleScript::notifyLoadCompleted(UniquedStringImpl& moduleKey)
    6666{
     67    m_moduleKey = &moduleKey;
     68    m_isLoaded = true;
     69    notifyClientFinished();
     70}
     71
     72void LoadableModuleScript::notifyLoadFailed(LoadableScript::Error&& error)
     73{
     74    m_error = WTFMove(error);
     75    m_isLoaded = true;
     76    notifyClientFinished();
     77}
     78
     79void LoadableModuleScript::notifyLoadWasCanceled()
     80{
     81    m_wasCanceled = true;
     82    m_isLoaded = true;
    6783    notifyClientFinished();
    6884}
     
    7086void LoadableModuleScript::execute(ScriptElement& scriptElement)
    7187{
    72     scriptElement.executeModuleScript(m_moduleScript.get());
     88    scriptElement.executeModuleScript(*this);
    7389}
    7490
    7591void LoadableModuleScript::load(Document& document, const URL& rootURL)
    7692{
    77     m_moduleScript->load(document, rootURL, *this);
     93    if (auto* frame = document.frame())
     94        frame->script().loadModuleScript(*this, rootURL.string());
    7895}
    7996
    8097void LoadableModuleScript::load(Document& document, const ScriptSourceCode& sourceCode)
    8198{
    82     m_moduleScript->load(document, sourceCode, *this);
     99    if (auto* frame = document.frame())
     100        frame->script().loadModuleScript(*this, sourceCode);
    83101}
    84102
  • trunk/Source/WebCore/dom/LoadableModuleScript.h

    r211280 r211313  
    2626#pragma once
    2727
    28 #include "CachedModuleScript.h"
    29 #include "CachedModuleScriptClient.h"
    3028#include "LoadableScript.h"
    3129#include <wtf/TypeCasts.h>
     
    3331namespace WebCore {
    3432
    35 class LoadableModuleScript final : public LoadableScript, private CachedModuleScriptClient {
     33class ScriptSourceCode;
     34
     35class LoadableModuleScript final : public LoadableScript {
    3636public:
    3737    virtual ~LoadableModuleScript();
     
    4242    std::optional<Error> error() const final;
    4343    bool wasCanceled() const final;
    44 
    45     CachedModuleScript& moduleScript() { return m_moduleScript.get(); }
    4644
    4745    bool isClassicScript() const final { return false; }
     
    5553    void load(Document&, const ScriptSourceCode&);
    5654
     55    void notifyLoadCompleted(UniquedStringImpl&);
     56    void notifyLoadFailed(LoadableScript::Error&&);
     57    void notifyLoadWasCanceled();
     58
     59    UniquedStringImpl* moduleKey() const { return m_moduleKey.get(); }
     60
    5761private:
    58     LoadableModuleScript(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree, Ref<CachedModuleScript>&&);
     62    LoadableModuleScript(const String& nonce, const String& crossOriginMode, const String& charset, const AtomicString& initiatorName, bool isInUserAgentShadowTree);
    5963
    60     void notifyFinished(CachedModuleScript&) final;
    61 
    62     Ref<CachedModuleScript> m_moduleScript;
     64    RefPtr<UniquedStringImpl> m_moduleKey;
     65    std::optional<LoadableScript::Error> m_error;
     66    bool m_wasCanceled { false };
     67    bool m_isLoaded { false };
    6368};
    6469
  • trunk/Source/WebCore/dom/ScriptElement.cpp

    r211078 r211313  
    2525#include "ScriptElement.h"
    2626
    27 #include "CachedModuleScript.h"
    2827#include "CachedResourceLoader.h"
    2928#include "CachedResourceRequest.h"
     
    391390}
    392391
    393 void ScriptElement::executeModuleScript(CachedModuleScript& moduleScript)
     392void ScriptElement::executeModuleScript(LoadableModuleScript& loadableModuleScript)
    394393{
    395394    // https://html.spec.whatwg.org/multipage/scripting.html#execute-the-script-block
    396395
    397     ASSERT(!moduleScript.error());
     396    ASSERT(!loadableModuleScript.error());
    398397
    399398    auto& document = m_element.document();
     
    405404    CurrentScriptIncrementer currentScriptIncrementer(document, m_element);
    406405
    407     frame->script().linkAndEvaluateModuleScript(moduleScript);
     406    frame->script().linkAndEvaluateModuleScript(loadableModuleScript);
    408407}
    409408
  • trunk/Source/WebCore/dom/ScriptElement.h

    r211280 r211313  
    3131namespace WebCore {
    3232
    33 class CachedModuleScript;
    3433class CachedScript;
    3534class ContainerNode;
    3635class Element;
     36class LoadableModuleScript;
    3737class PendingScript;
    3838class ScriptSourceCode;
     
    5252    WEBCORE_EXPORT String scriptContent() const;
    5353    void executeClassicScript(const ScriptSourceCode&);
    54     void executeModuleScript(CachedModuleScript&);
     54    void executeModuleScript(LoadableModuleScript&);
    5555
    5656    void executePendingScript(PendingScript&);
Note: See TracChangeset for help on using the changeset viewer.