Implement ModuleScript::RunScript()

third_party/WebKit/Source/core/dom/ModulatorImpl.cpp

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/ModulatorImpl.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ModuleMap.h"
 #include "core/dom/ModuleScript.h"
@@ skipping 116 matching lines @@
   ScriptState::Scope scope(script_state_.Get());
   return script_module.Instantiate(script_state_.Get());
 }
 
 Vector<String> ModulatorImpl::ModuleRequestsFromScriptModule(
     ScriptModule script_module) {
   ScriptState::Scope scope(script_state_.Get());
   return script_module.ModuleRequests(script_state_.Get());
 }
 
-void ModulatorImpl::ExecuteModule(ScriptModule script_module) {
+void ModulatorImpl::ExecuteModule(const ModuleScript* module_script) {
+  // https://html.spec.whatwg.org/#run-a-module-script

[hiroshige, 2017/04/13 23:55:19]

TODO: Add a comment for Step 1:
"Let settings be the settings object of s."
(== |this|)

Where is Step 2?
"Check if we can run script with settings. If this returns "do not run" then
abort these steps."

[kouhei (in TOK), 2017/04/17 07:31:53]

We need to check
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/core/dom/Execu...

[hiroshige, 2017/04/26 00:50:03]

Done.

   ScriptState::Scope scope(script_state_.Get());
-  script_module.Evaluate(script_state_.Get());
+
+  // 3. "If s's instantiation state is "errored", then report the exception
+  //     given by s's instantiation error for s and abort these steps."
+  if (module_script->InstantiationState() ==
+      ModuleInstantiationState::kErrored) {
+    v8::Isolate* isolate = script_state_->GetIsolate();
+    V8ThrowException::ThrowException(
+        isolate, module_script->CreateInstantiationError(isolate));

[hiroshige, 2017/04/13 23:55:19]

Note: this code path is totally not tested and thus doesn't work.

[hiroshige, 2017/04/26 00:50:03]

Is tested with a layout test errored.html in
https://codereview.chromium.org/2810013002/ and looks working.

+    return;
+  }
+
+  // 4. "Assert: s's instantiation state is "instantiated" (and thus its
+  //     module record is not null)."
+  CHECK_EQ(module_script->InstantiationState(),
+           ModuleInstantiationState::kInstantiated);
+
+  // 5. "Let record be s's module record."
+  const ScriptModule& record = module_script->Record();
+  CHECK(!record.IsNull());
+
+  // 6.--9.?
+  record.Evaluate(script_state_.Get());
 }
 
 DEFINE_TRACE(ModulatorImpl) {
   Modulator::Trace(visitor);
   visitor->Trace(execution_context_);
   visitor->Trace(fetcher_);
   visitor->Trace(map_);
   visitor->Trace(loader_registry_);
   visitor->Trace(tree_linker_registry_);
   visitor->Trace(script_module_resolver_);
 }
 
 DEFINE_TRACE_WRAPPERS(ModulatorImpl) {
   visitor->TraceWrappers(map_);
 }
 
 }  // namespace blink