github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: wasm code generation in the renderer (#26063)

Browse Source
This commit is contained in:
Shelley Vohr
2020-10-20 18:34:33 -07:00
committed by GitHub
parent b3d89bd3bf
commit 8a052c5537
5 changed files with 141 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
shell/common/node_bindings.cc
View File

@@ -32,6 +32,7 @@
#include "shell/common/gin_helper/microtasks_scope.h"
#include "shell/common/mac/main_application_bundle.h"
#include "shell/common/node_includes.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_initializer.h" // nogncheck
#define ELECTRON_BUILTIN_MODULES(V) \
V(electron_browser_app) \
@@ -225,9 +226,18 @@ void SetNodeOptions(base::Environment* env) {
bool AllowWasmCodeGenerationCallback(v8::Local<v8::Context> context,
v8::Local<v8::String>) {
v8::Local<v8::Value> wasm_code_gen = context->GetEmbedderData(
node::ContextEmbedderIndex::kAllowWasmCodeGeneration);
return wasm_code_gen->IsUndefined() || wasm_code_gen->IsTrue();
// If we're running with contextIsolation enabled in the renderer process,
// fall back to Blink's logic.
v8::Isolate* isolate = context->GetIsolate();
if (node::Environment::GetCurrent(isolate) == nullptr) {
if (gin_helper::Locker::IsBrowserProcess())
return false;
return blink::V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(
context, v8::String::Empty(isolate));
}
return node::Environment::AllowWasmCodeGenerationCallback(
context, v8::String::Empty(isolate));
}
} // namespace