Chromium Code Reviews| Index: third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp |
| diff --git a/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp |
| index 5d73eba912b751c4202c91332a6d521c214e076a..f1b0761b5277ed1922b120b7a0c70488ec7a395a 100644 |
| --- a/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp |
| +++ b/third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp |
| @@ -31,6 +31,7 @@ |
| #include "bindings/core/v8/WorkerOrWorkletScriptController.h" |
| #include "bindings/core/v8/ScriptCallStack.h" |
| +#include "bindings/core/v8/ScriptController.h" |
| #include "bindings/core/v8/ScriptSourceCode.h" |
| #include "bindings/core/v8/ScriptValue.h" |
| #include "bindings/core/v8/V8DedicatedWorkerGlobalScope.h" |
| @@ -165,8 +166,18 @@ bool WorkerOrWorkletScriptController::initializeContextIfNeeded() |
| v8::Local<v8::ObjectTemplate> globalTemplate = globalInterfaceTemplate->InstanceTemplate(); |
| v8::Local<v8::Context> context; |
| { |
| + // Initialize V8 extensions before creating the context. |
| + Vector<const char*> extensionNames; |
| + if (m_globalScope->isServiceWorkerGlobalScope() && Platform::current()->allowScriptExtensionForServiceWorker(static_cast<WorkerGlobalScope*>(m_globalScope.get())->url())) { |
|
dcheng
2016/05/12 17:17:33
toWorkerGlobalScope(m_globalScope.get())
rather t
lazyboy
2016/05/17 05:13:09
Done.
|
| + const V8Extensions& extensions = ScriptController::registeredExtensions(); |
| + extensionNames.reserveInitialCapacity(extensions.size()); |
| + for (const auto* extension : extensions) |
| + extensionNames.append(extension->name()); |
| + } |
| + v8::ExtensionConfiguration extensionConfiguration(extensionNames.size(), extensionNames.data()); |
| + |
| V8PerIsolateData::UseCounterDisabledScope useCounterDisabled(V8PerIsolateData::from(m_isolate)); |
| - context = v8::Context::New(m_isolate, nullptr, globalTemplate); |
| + context = v8::Context::New(m_isolate, &extensionConfiguration, globalTemplate); |
| } |
| if (context.IsEmpty()) |
| return false; |