Enable module scripts in ScriptLoader

third_party/WebKit/Source/core/dom/ModuleScript.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/ModuleScript.h"
 
+#include "bindings/core/v8/V8Binding.h"
+#include "bindings/core/v8/V8ThrowException.h"
+#include "core/dom/Modulator.h"
+
 namespace blink {
 
 void ModuleScript::SetInstantiationError(v8::Isolate* isolate,
                                          v8::Local<v8::Value> error) {
   DCHECK_EQ(instantiation_state_, ModuleInstantiationState::kUninstantiated);
   instantiation_state_ = ModuleInstantiationState::kErrored;
 
   DCHECK(!error.IsEmpty());
   instantiation_error_.Set(isolate, error);
 }
@@ skipping 16 matching lines @@
 }
 
 bool ModuleScript::CheckMIMETypeBeforeRunScript(Document* context_document,
                                                 const SecurityOrigin*) const {
   // We don't check MIME type here because we check the MIME type in
   // ModuleScriptLoader::WasModuleLoadSuccessful().
   return true;
 }
 
 void ModuleScript::RunScript(LocalFrame* frame, const SecurityOrigin*) const {
-  // TODO(hiroshige): Implement this once Modulator::ExecuteModule() is landed.
-  NOTREACHED();
+  // FOXME: What if the isolate is different from the isolate used for
+  // m_record's compilation?
+  fprintf(stderr, "ModuleScript: isNull=%d state=%d\n", record_.IsNull(),
+          InstantiationState());
+
+  Modulator::From(ToScriptStateForMainWorld(frame))->ExecuteModule(this);

[hiroshige, 2017/04/12 19:57:05]

I think we should have |m_modulator| in ModuleScript and have
CHECK_EQ(Modulator::From(ToScriptStateForMainWorld(frame)), m_modulator);
here.

 }
 
 String ModuleScript::InlineSourceTextForCSP() const {
   // Currently we don't support inline module scripts.
   // TODO(hiroshige): Implement this.
   NOTREACHED();
   return String();
 }
 
 }  // namespace blink