diff --git a/engine/bindings/core/v8/ScriptController.cpp b/engine/bindings/core/v8/ScriptController.cpp index a020cb3f926..af3e490d95a 100644 --- a/engine/bindings/core/v8/ScriptController.cpp +++ b/engine/bindings/core/v8/ScriptController.cpp @@ -347,7 +347,8 @@ void ScriptController::executeModuleScript(Document& document, const String& sou V8ScriptModule module; module.resourceName = document.url().string(); module.textPosition = textPosition; - module.receiver = toV8(&document, context->Global(), m_isolate); + // FIXME: This should be the actual module object instead of the document. + module.moduleObject = toV8(&document, context->Global(), m_isolate); module.source = source; if (HTMLImport* parent = document.import()) { diff --git a/engine/bindings/core/v8/V8ScriptRunner.cpp b/engine/bindings/core/v8/V8ScriptRunner.cpp index 9f6d746bf73..f06e6971001 100644 --- a/engine/bindings/core/v8/V8ScriptRunner.cpp +++ b/engine/bindings/core/v8/V8ScriptRunner.cpp @@ -224,11 +224,11 @@ void V8ScriptRunner::runModule(v8::Isolate* isolate, ExecutionContext* context, v8::Handle scriptResult = script->Run(); auto arguments = module.resolvedDependencies; - arguments.append(module.receiver); + arguments.append(module.moduleObject); RELEASE_ASSERT(scriptResult->IsObject()); scriptResult.As()->CallAsFunction( - module.receiver, arguments.size(), arguments.data()); + v8::Null(isolate), arguments.size(), arguments.data()); crashIfV8IsDead(); } diff --git a/engine/bindings/core/v8/V8ScriptRunner.h b/engine/bindings/core/v8/V8ScriptRunner.h index 1e4a1857fe1..ba72f1a82e6 100644 --- a/engine/bindings/core/v8/V8ScriptRunner.h +++ b/engine/bindings/core/v8/V8ScriptRunner.h @@ -40,7 +40,7 @@ class ExecutionContext; struct V8ScriptModule { String resourceName; TextPosition textPosition; - v8::Handle receiver; + v8::Handle moduleObject; String source; Vector formalDependencies; Vector > resolvedDependencies;