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 b4830c5fea60f280168c1089055a37f059dbb475..589ffb00a01e074a77c91c74bda110a6eadfda81 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp |
@@ -30,6 +30,8 @@ |
#include "bindings/core/v8/V8Binding.h" |
+#include "bindings/core/v8/IsolatedScriptController.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" |
@@ -43,7 +45,6 @@ |
#include "bindings/core/v8/V8WorkerGlobalScope.h" |
#include "bindings/core/v8/V8XPathNSResolver.h" |
#include "bindings/core/v8/WindowProxy.h" |
-#include "bindings/core/v8/WorkerScriptController.h" |
#include "bindings/core/v8/custom/V8CustomXPathNSResolver.h" |
#include "core/dom/Document.h" |
#include "core/dom/Element.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) |
@@ -777,12 +777,12 @@ v8::Local<v8::Context> toV8Context(ExecutionContext* context, DOMWrapperWorld& w |
if (LocalFrame* frame = toDocument(context)->frame()) |
return toV8Context(frame, world); |
} else if (context->isWorkerGlobalScope()) { |
- if (WorkerScriptController* script = toWorkerGlobalScope(context)->script()) { |
+ if (IsolatedScriptController* script = toWorkerGlobalScope(context)->script()) { |
if (script->scriptState()->contextIsValid()) |
return script->scriptState()->context(); |
} |
} |
- return v8::Local<v8::Context>(); |
+ return ModuleProxy::moduleProxy().toV8ContextForModules(context); |
} |
v8::Local<v8::Context> toV8Context(Frame* frame, DOMWrapperWorld& world) |