Index: third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp |
index d816d9b2a9353a8a749c8640f7e20a034d9c1352..69d705b16744aed88874bdb4d2c9e3a43a8708ff 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp |
@@ -30,6 +30,7 @@ |
#include "bindings/core/v8/V8Binding.h" |
+#include "bindings/core/v8/ModuleProxy.h" |
#include "bindings/core/v8/ScriptController.h" |
#include "bindings/core/v8/V8AbstractEventListener.h" |
#include "bindings/core/v8/V8ArrayBufferView.h" |
@@ -712,8 +713,7 @@ ExecutionContext* toExecutionContext(v8::Local<v8::Context> context) |
v8::Local<v8::Object> workerWrapper = V8WorkerGlobalScope::findInstanceInPrototypeChain(global, context->GetIsolate()); |
if (!workerWrapper.IsEmpty()) |
return V8WorkerGlobalScope::toImpl(workerWrapper)->executionContext(); |
- // FIXME: Is this line of code reachable? |
- return 0; |
+ return ModuleProxy::moduleProxy().toExecutionContextForModules(context); |
} |
ExecutionContext* currentExecutionContext(v8::Isolate* isolate) |
@@ -782,7 +782,7 @@ v8::Local<v8::Context> toV8Context(ExecutionContext* context, DOMWrapperWorld& w |
return script->scriptState()->context(); |
} |
} |
- return v8::Local<v8::Context>(); |
+ return ModuleProxy::moduleProxy().toV8ContextForModules(context); |
} |
v8::Local<v8::Context> toV8Context(Frame* frame, DOMWrapperWorld& world) |