Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(927)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp

Issue 1880933002: Begin to enable extension APIs in Extension Service Worker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8b55d51faf15338425df161d73919986ac2e1001..cd6f6410314db924db41fba89bb403daf7e0193a 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"
@@ -51,6 +52,7 @@
#include "core/workers/WorkerThread.h"
#include "platform/heap/ThreadState.h"
#include "public/platform/Platform.h"
+#include "wtf/Threading.h"
#include <v8.h>
namespace blink {
@@ -107,6 +109,17 @@ RawPtr<WorkerOrWorkletScriptController> WorkerOrWorkletScriptController::create(
return new WorkerOrWorkletScriptController(globalScope, isolate);
}
+void WorkerOrWorkletScriptController::registerExtensionIfNeeded(v8::Extension* extension)
+{
+ const V8Extensions& extensions = registeredExtensions();
+ for (size_t i = 0; i < extensions.size(); ++i) {
+ if (extensions[i] == extension)
+ return;
+ }
+ v8::RegisterExtension(extension);
+ registeredExtensions().append(extension);
+}
+
WorkerOrWorkletScriptController::WorkerOrWorkletScriptController(WorkerOrWorkletGlobalScope* globalScope, v8::Isolate* isolate)
: m_globalScope(globalScope)
, m_isolate(isolate)
@@ -156,7 +169,14 @@ bool WorkerOrWorkletScriptController::initializeContextIfNeeded()
if (isContextInitialized())
return true;
- v8::Local<v8::Context> context = v8::Context::New(m_isolate);
+ // Initialize V8 extensions before creating the context.
+ Vector<const char*> extensionNames;
+ const V8Extensions& extensions = registeredExtensions();
+ extensionNames.reserveInitialCapacity(extensions.size());
+ for (const auto* extension : extensions)
+ extensionNames.append(extension->name());
+ v8::ExtensionConfiguration extensionConfiguration(extensionNames.size(), extensionNames.data());
+ v8::Local<v8::Context> context = v8::Context::New(m_isolate, &extensionConfiguration);
if (context.IsEmpty())
return false;
@@ -192,6 +212,13 @@ bool WorkerOrWorkletScriptController::initializeContextIfNeeded()
return v8CallBoolean(globalObject->SetPrototype(context, jsGlobalScope));
}
+V8Extensions& WorkerOrWorkletScriptController::registeredExtensions()
+{
+ // Accessed from worker threads.
+ DEFINE_THREAD_SAFE_STATIC_LOCAL(V8Extensions, extensions, new V8Extensions);
+ return extensions;
+}
+
ScriptValue WorkerOrWorkletScriptController::evaluate(const CompressibleString& script, const String& fileName, const TextPosition& scriptStartPosition, CachedMetadataHandler* cacheHandler, V8CacheOptions v8CacheOptions)
{
if (!initializeContextIfNeeded())

Powered by Google App Engine
This is Rietveld 408576698