30fbeec036
* chore: bump chromium in DEPS to 130.0.6723.4 * chore: bump chromium in DEPS to 131.0.6724.0 * chore: update patches * chore: update libc++ filenames * 5844369: controlledframe: Disable Web Bluetooth for <webview> & <controlledframe> https://chromium-review.googlesource.com/c/chromium/src/+/5844369 * (multiple CLs): Use an opaque type for FrameTreeNode IDs 5807683: Use an opaque type for FrameTreeNode IDs, part 1 | https://chromium-review.googlesource.com/c/chromium/src/+/5807683 5829746: Use an opaque type for FrameTreeNode IDs, part 2 | https://chromium-review.googlesource.com/c/chromium/src/+/5829746 5836903: Use an opaque type for FrameTreeNode IDs, part 7 | https://chromium-review.googlesource.com/c/chromium/src/+/5836903 5837249: Use an opaque type for FrameTreeNode IDs, part 8 | https://chromium-review.googlesource.com/c/chromium/src/+/5837249 5836564: Use an opaque type for FrameTreeNode IDs, part 12 | https://chromium-review.googlesource.com/c/chromium/src/+/5836564 5837180: Use an opaque type for FrameTreeNode IDs, part 15 | https://chromium-review.googlesource.com/c/chromium/src/+/5837180 * 5822889: [task] Make GetForegroundTaskRunner non-virtual https://chromium-review.googlesource.com/c/v8/v8/+/5822889 * 5833297: Remove unused inner WebContents attach params https://chromium-review.googlesource.com/c/chromium/src/+/5833297 * 5806403: Shift PowerMonitor to non static https://chromium-review.googlesource.com/c/chromium/src/+/5806403 * 5666874: [3/N] Remove old OnPowerChange in PowerObserver https://chromium-review.googlesource.com/c/chromium/src/+/5666874 * 5829085: [v8] Differentiate between UserVisible and BestEffort task runners https://chromium-review.googlesource.com/c/chromium/src/+/5829085 * 5791112: [webrtc] Use `c/b/permissions/system` for system permissions https://chromium-review.googlesource.com/c/chromium/src/+/5791112 * 5825636: [Extensions] Create WebContentsObservers with ExtensionsBrowserClient https://chromium-review.googlesource.com/c/chromium/src/+/5825636 * fixup! (multiple CLs): Use an opaque type for FrameTreeNode IDs * fixup! 5791112: [webrtc] Use `c/b/permissions/system` for system permissions https://chromium-review.googlesource.com/c/chromium/src/+/5791112 * chore: bump chromium in DEPS to 131.0.6726.0 * chore: update patches * chore: update libc++ filenames * 5858119: Declutter: Allow opening to a specific feature https://chromium-review.googlesource.com/c/chromium/src/+/5858119 * fix: macOS SDK 15 error Not sure exactly what changed in the upgrade to macOS SDK 15, but it triggered a new error: ``` electron/shell/browser/ui/message_box_mac.mm:84:7: error: multiple methods named 'highlight:' found with mismatched result, parameter type or attributes ``` The `highlight:` selector a few lines down was ambiguous because the object type of the `NSArray` was not specified. Specifying `NSButton` as the element type makes the selector unambiguous for type checking. * 5854143: [File Download Access Prevention] Obfuscate download file for enterprise deep scan https://chromium-review.googlesource.com/c/chromium/src/+/5854143 * 5854811: Use kNotAllowedError instead of kSecurityError for Web MIDI https://chromium-review.googlesource.com/c/chromium/src/+/5854811 * chore: bump chromium in DEPS to 131.0.6728.0 * chore: update patches * disable invalid test * chore: bump chromium in DEPS to 131.0.6730.0 * chore: update patches * update build tools target commit for new macOS SDK * chore: update libc++ file names * chore: bump chromium in DEPS to 131.0.6732.0 * chore: bump chromium in DEPS to 131.0.6734.0 * 5856527: [UI] Use mojo enum for `WindowShowState` in ui/ https://chromium-review.googlesource.com/c/chromium/src/+/5856527 * chore: update build-tools sha to include macOD 15.0 SDK --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: alice <alice@makenotion.com>
145 lines
5 KiB
C++
145 lines
5 KiB
C++
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/javascript_environment.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <unordered_set>
|
|
#include <utility>
|
|
|
|
#include "base/allocator/partition_alloc_features.h"
|
|
#include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc.h"
|
|
#include "base/bits.h"
|
|
#include "base/command_line.h"
|
|
#include "base/feature_list.h"
|
|
#include "base/task/current_thread.h"
|
|
#include "base/task/single_thread_task_runner.h"
|
|
#include "base/task/thread_pool/initialization_util.h"
|
|
#include "gin/array_buffer.h"
|
|
#include "gin/v8_initializer.h"
|
|
#include "shell/browser/microtasks_runner.h"
|
|
#include "shell/common/gin_helper/cleaned_up_at_exit.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "third_party/blink/public/common/switches.h"
|
|
#include "third_party/electron_node/src/node_wasm_web_api.h"
|
|
|
|
namespace {
|
|
v8::Isolate* g_isolate;
|
|
}
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
gin::IsolateHolder CreateIsolateHolder(v8::Isolate* isolate) {
|
|
std::unique_ptr<v8::Isolate::CreateParams> create_params =
|
|
gin::IsolateHolder::getDefaultIsolateParams();
|
|
// Align behavior with V8 Isolate default for Node.js.
|
|
// This is necessary for important aspects of Node.js
|
|
// including heap and cpu profilers to function properly.
|
|
|
|
return gin::IsolateHolder(base::SingleThreadTaskRunner::GetCurrentDefault(),
|
|
gin::IsolateHolder::kSingleThread,
|
|
gin::IsolateHolder::IsolateType::kUtility,
|
|
std::move(create_params),
|
|
gin::IsolateHolder::IsolateCreationMode::kNormal,
|
|
nullptr, nullptr, isolate);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop,
|
|
bool setup_wasm_streaming)
|
|
: isolate_holder_{CreateIsolateHolder(
|
|
Initialize(event_loop, setup_wasm_streaming))},
|
|
isolate_{isolate_holder_.isolate()},
|
|
locker_{isolate_} {
|
|
isolate_->Enter();
|
|
|
|
v8::HandleScope scope(isolate_);
|
|
auto context = node::NewContext(isolate_);
|
|
CHECK(!context.IsEmpty());
|
|
|
|
context->Enter();
|
|
}
|
|
|
|
JavascriptEnvironment::~JavascriptEnvironment() {
|
|
DCHECK_NE(platform_, nullptr);
|
|
|
|
{
|
|
v8::HandleScope scope(isolate_);
|
|
isolate_->GetCurrentContext()->Exit();
|
|
}
|
|
isolate_->Exit();
|
|
g_isolate = nullptr;
|
|
|
|
platform_->UnregisterIsolate(isolate_);
|
|
}
|
|
|
|
v8::Isolate* JavascriptEnvironment::Initialize(uv_loop_t* event_loop,
|
|
bool setup_wasm_streaming) {
|
|
auto* cmd = base::CommandLine::ForCurrentProcess();
|
|
// --js-flags.
|
|
std::string js_flags = "--no-freeze-flags-after-init ";
|
|
js_flags.append(cmd->GetSwitchValueASCII(blink::switches::kJavaScriptFlags));
|
|
v8::V8::SetFlagsFromString(js_flags.c_str(), js_flags.size());
|
|
|
|
// The V8Platform of gin relies on Chromium's task schedule, which has not
|
|
// been started at this point, so we have to rely on Node's V8Platform.
|
|
auto* tracing_agent = node::CreateAgent();
|
|
auto* tracing_controller = tracing_agent->GetTracingController();
|
|
node::tracing::TraceEventHelper::SetAgent(tracing_agent);
|
|
platform_ = node::MultiIsolatePlatform::Create(
|
|
base::RecommendedMaxNumberOfThreadsInThreadGroup(3, 8, 0.1, 0),
|
|
tracing_controller, gin::V8Platform::GetCurrentPageAllocator());
|
|
|
|
v8::V8::InitializePlatform(platform_.get());
|
|
gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
|
|
gin::ArrayBufferAllocator::SharedInstance(),
|
|
nullptr /* external_reference_table */,
|
|
js_flags, nullptr /* fatal_error_callback */,
|
|
nullptr /* oom_error_callback */,
|
|
false /* create_v8_platform */);
|
|
|
|
v8::Isolate* isolate = v8::Isolate::Allocate();
|
|
platform_->RegisterIsolate(isolate, event_loop);
|
|
|
|
// This is done here because V8 checks for the callback in NewContext.
|
|
// Our setup order doesn't allow for calling SetupIsolateForNode
|
|
// before NewContext without polluting JavaScriptEnvironment with
|
|
// Node.js logic and so we conditionally do it here to keep
|
|
// concerns separate.
|
|
if (setup_wasm_streaming) {
|
|
isolate->SetWasmStreamingCallback(
|
|
node::wasm_web_api::StartStreamingCompilation);
|
|
}
|
|
|
|
g_isolate = isolate;
|
|
|
|
return isolate;
|
|
}
|
|
|
|
// static
|
|
v8::Isolate* JavascriptEnvironment::GetIsolate() {
|
|
CHECK(g_isolate);
|
|
return g_isolate;
|
|
}
|
|
|
|
void JavascriptEnvironment::CreateMicrotasksRunner() {
|
|
DCHECK(!microtasks_runner_);
|
|
microtasks_runner_ = std::make_unique<MicrotasksRunner>(isolate());
|
|
base::CurrentThread::Get()->AddTaskObserver(microtasks_runner_.get());
|
|
}
|
|
|
|
void JavascriptEnvironment::DestroyMicrotasksRunner() {
|
|
DCHECK(microtasks_runner_);
|
|
{
|
|
v8::HandleScope scope(isolate_);
|
|
gin_helper::CleanedUpAtExit::DoCleanup();
|
|
}
|
|
base::CurrentThread::Get()->RemoveTaskObserver(microtasks_runner_.get());
|
|
}
|
|
|
|
} // namespace electron
|