mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
42 lines
2.2 KiB
Diff
42 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Mon, 5 Oct 2020 13:43:59 -0700
|
|
Subject: chore: expose v8 initialization isolate callbacks
|
|
|
|
This commit is necessary in order to ensure consistent behavior from
|
|
v8 Isolate callbacks in contexts which Node.js does not control. If
|
|
we're running with contextIsolation enabled, we should be falling back
|
|
to Blink's logic. This will be upstreamed in some form.
|
|
|
|
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
index f417dca0103ddfd8ce6e3b3a4d033ea42133604e..d0ee37d147243858d997be230c12ea3e41e6c873 100644
|
|
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
@@ -448,8 +448,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
|
|
return {true, std::move(stringified_source)};
|
|
}
|
|
|
|
-bool V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
|
|
- v8::Local<v8::String> source) {
|
|
+bool V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(
|
|
+ v8::Local<v8::Context> context,
|
|
+ v8::Local<v8::String> source) {
|
|
if (ExecutionContext* execution_context = ToExecutionContext(context)) {
|
|
if (ContentSecurityPolicy* policy =
|
|
execution_context->GetContentSecurityPolicy()) {
|
|
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
|
|
index 932c6aad3df51dd6790e55bf708703767843dc5e..6865fd33e62f766c5a162ded8627c332bf2ed173 100644
|
|
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
|
|
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
|
|
@@ -69,8 +69,8 @@ class CORE_EXPORT V8Initializer {
|
|
static void MessageHandlerInWorker(v8::Local<v8::Message>,
|
|
v8::Local<v8::Value>);
|
|
static bool WasmCodeGenerationCheckCallbackInMainThread(
|
|
- v8::Local<v8::Context> context,
|
|
- v8::Local<v8::String> source);
|
|
+ v8::Local<v8::Context> context,
|
|
+ v8::Local<v8::String> source);
|
|
};
|
|
|
|
} // namespace blink
|