fix: enable worker threads in ELECTRON_RUN_AS_NODE (electron#20457)

codebytere · John Kleinschmidt · commit 03d16f37d2dc · 2019-10-08T11:59:28.000-04:00
diff --git a/patches/node/.patches b/patches/node/.patches
@@ -54,5 +54,6 @@ chore_read_nobrowserglobals_from_global_not_process.patch
 chore_use_v8_inspector_js_protocol_to_find_pdl_file.patch
 chore_split_createenvironment_into_createenvironment_and.patch
 fix_set_uptime_offset_in_correct_init_method.patch
+fix_enable_worker_threads.patch
 fsevents-stop-using-fsevents-to-watch-files.patch
 fsevents-regression-in-watching.patch
diff --git a/patches/node/fix_enable_worker_threads.patch b/patches/node/fix_enable_worker_threads.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Thu, 3 Oct 2019 19:03:30 +0200
+Subject: fix: enable worker_threads
+
+Electron sets NODE_USE_V8_PLATFORM to false, because Electron
+initializes the v8 platform itself and Node.js worker thread
+initialization relies on the platform it uses having been set inside
+code guarded by NODE_USE_V8_PLATFORM.
+
+This commit fixes this problem by changing node_worker to use the three-arg
+implementation of `NewIsolate` to prevent it trying to use a possibly-null ptr.
+
+diff --git a/src/node_worker.cc b/src/node_worker.cc
+index 8f97f5c351..2bfbb28e61 100644
+--- a/src/node_worker.cc
++++ b/src/node_worker.cc
+@@ -112,7 +112,10 @@ class WorkerThreadData {
+       array_buffer_allocator_(ArrayBufferAllocator::Create()) {
+     CHECK_EQ(uv_loop_init(&loop_), 0);
+ 
+-    Isolate* isolate = NewIsolate(array_buffer_allocator_.get(), &loop_);
++    Isolate* isolate = NewIsolate(
++        array_buffer_allocator_.get(),
++        &loop_,
++        w->platform_);
+     CHECK_NOT_NULL(isolate);
+ 
+     {
