3da598015b
* chore: bump chromium in DEPS to 100.0.4880.0 * resolve conflicts * chore: update patches * fix patch * PIP20: add a new DocumentOverlayWindowViews subtype https://chromium-review.googlesource.com/c/chromium/src/+/3252789 * Clean up PictureInPictureWindowManager::EnterPictureInPicture() https://chromium-review.googlesource.com/c/chromium/src/+/3424145 * Remove StoragePartitionId. https://chromium-review.googlesource.com/c/chromium/src/+/2811120 * Remove FLoC code https://chromium-review.googlesource.com/c/chromium/src/+/3424359 * media: Make AddSupportedKeySystems() Async https://chromium-review.googlesource.com/c/chromium/src/+/3430502 * [Extensions] Move some l10n file util methods to //extensions/browser https://chromium-review.googlesource.com/c/chromium/src/+/3408192 * chore: IWYU * Reland "webhid: Grant permissions for policy-allowed devices" https://chromium-review.googlesource.com/c/chromium/src/+/3444147 * Migrate base::Value::GetList() to base::Value::GetListDeprecated(): 2/N. https://chromium-review.googlesource.com/c/chromium/src/+/3435727 https://chromium-review.googlesource.com/c/chromium/src/+/3440910 https://chromium-review.googlesource.com/c/chromium/src/+/3440088 * [text blink period] Cache blink period instead of fetching from defaults https://chromium-review.googlesource.com/c/chromium/src/+/3419059 * chore: update picture-in-picture.patch https://chromium-review.googlesource.com/c/chromium/src/+/3252789 * ci: update to Xcode 13.2.1 https://chromium-review.googlesource.com/c/chromium/src/+/3437552 * chore: bump chromium in DEPS to 100.0.4882.1 * chore: update patches * chore: bump chromium in DEPS to 100.0.4884.0 * chore: update patches * chore: bump chromium in DEPS to 100.0.4886.0 * chore: update patches * Refactor DownloadManager to use StoragePartitionConfig https://chromium-review.googlesource.com/c/chromium/src/+/3222011 * Remove ToWebInputElement() in favor of new WebNode::DynamicTo<> helpers. https://chromium-review.googlesource.com/c/chromium/src/+/3433852 * refactor: autofill to use the color pipeline https://bugs.chromium.org/p/chromium/issues/detail?id=1249558 https://bugs.chromium.org/p/chromium/issues/detail?id=1003612 * [ProcessSingleton] Add many more trace events to cover all scenarios https://chromium-review.googlesource.com/c/chromium/src/+/3429325 * fixup! PIP20: add a new DocumentOverlayWindowViews subtype * chore: bump chromium in DEPS to 100.0.4888.0 * chore: update patches * chore: update picture-in-picture.patch * fixup! refactor: autofill to use the color pipeline * ci: fixup fix sync (cherry picked from commit c1e3e395465739bce5ca8e1c5ec1f5bd72b99ebd) * chore: bump chromium in DEPS to 100.0.4889.0 * chore: update patches * chore: fix feat_add_data_transfer_to_requestsingleinstancelock.patch * fixup! PIP20: add a new DocumentOverlayWindowViews subtype * Remove remaining NativeTheme::GetSystemColor() machinery. https://chromium-review.googlesource.com/c/chromium/src/+/3421719 * ci: fetch proper esbuild for macos * ci: fixup fetch proper esbuild for macos * fix: failing Node.js test on outdated CurrentValueSerializerFormatVersion * chore: bump chromium in DEPS to 100.0.4892.0 * 3460365: Set V8 fatal error callbacks during Isolate initialization https://chromium-review.googlesource.com/c/chromium/src/+/3460365 * 3454343: PIP20: use permanent top controls https://chromium-review.googlesource.com/c/chromium/src/+/3454343 * 3465574: Move most of GTK color mixers to ui/color/. https://chromium-review.googlesource.com/c/chromium/src/+/3465574 * chore: fixup patch indices * 3445327: [locales] Remove locales reference https://chromium-review.googlesource.com/c/chromium/src/+/3445327 * 3456548: [DBB][#7] Blue border falls back to all tab if cropped-to zero pixels https://chromium-review.googlesource.com/c/chromium/src/+/3456548 * 3441196: Convert GuestView's remaining legacy IPC messages to Mojo https://chromium-review.googlesource.com/c/chromium/src/+/3441196 * 3455491: Don't include run_loop.h in thread_task_runner_handle.h https://chromium-review.googlesource.com/c/chromium/src/+/3455491 * fixup! 3454343: PIP20: use permanent top controls * 3442501: Add missing includes of //base/observer_list.h https://chromium-review.googlesource.com/c/chromium/src/+/3442501 * 3437552: mac: Deploy a new hermetic build of Xcode 13.2.1 13C100 https://chromium-review.googlesource.com/c/chromium/src/+/3437552 * chore: bump chromium in DEPS to 100.0.4894.0 * fixup! 3460365: Set V8 fatal error callbacks during Isolate initialization * chore: update patches * 3425231: Use DnsOverHttpsConfig where appropriate https://chromium-review.googlesource.com/c/chromium/src/+/3425231 * test: disable test-heapsnapshot-near-heap-limit-worker.js As a result of CLs linked in https://bugs.chromium.org/p/v8/issues/detail?id=12503, heap snapshotting near the heap limit DCHECKS in Node.js specs. This will likely require a larger refactor in Node.js so i've disabled the test for now and opened an upstream issue on node-v8 issue at https://github.com/nodejs/node-v8/issues/218. * Port all usage of NativeTheme color IDs to color pipeline https://bugs.chromium.org/p/chromium/issues/detail?id=1249558 * chore: update patches after rebase * ci: use gen2 machine for more disk space * ci: don't try to make root volume writeable * ci: use older xcode/macos for tests * fix: html fullscreen transitions stacking (cherry picked from commit 5e10965cdd7b2a024def5fc568912cefd0f05b44) * ci: speed up woa testing (cherry picked from commit 75c33c48b032137794f5734348a9ee3daa60d9de) (cherry picked from commit e81996234029669663bf0daaababd34684dcbb17) * ci: disable flaky tests on WOA * ci: run remote tests separately to isolate issue there * tests: disable node test parallel/test-worker-debug for now * revert: fix: html fullscreen transitions stacking * tests: disable flaky test on macOS arm64 * fixup circleci config so build tools can find xcode version * make sure the workspace is clean before job runs (cherry picked from commit 75f713c9748ac1a356846c39f268886130554fd6) * tests: disable flaky test on Linux * ci: debug why windows i32 is crashing * Revert "ci: debug why windows i32 is crashing" This reverts commit 4c4bba87ea76f16ef3b304dadff59ad4d366f60f. Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
388 lines
13 KiB
C++
388 lines
13 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/partition_alloc.h"
|
|
#include "base/command_line.h"
|
|
#include "base/feature_list.h"
|
|
#include "base/task/current_thread.h"
|
|
#include "base/task/thread_pool/initialization_util.h"
|
|
#include "base/threading/thread_task_runner_handle.h"
|
|
#include "base/trace_event/trace_event.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"
|
|
|
|
namespace {
|
|
v8::Isolate* g_isolate;
|
|
}
|
|
|
|
namespace gin {
|
|
|
|
class ConvertableToTraceFormatWrapper final
|
|
: public base::trace_event::ConvertableToTraceFormat {
|
|
public:
|
|
explicit ConvertableToTraceFormatWrapper(
|
|
std::unique_ptr<v8::ConvertableToTraceFormat> inner)
|
|
: inner_(std::move(inner)) {}
|
|
~ConvertableToTraceFormatWrapper() override = default;
|
|
|
|
// disable copy
|
|
ConvertableToTraceFormatWrapper(const ConvertableToTraceFormatWrapper&) =
|
|
delete;
|
|
ConvertableToTraceFormatWrapper& operator=(
|
|
const ConvertableToTraceFormatWrapper&) = delete;
|
|
|
|
void AppendAsTraceFormat(std::string* out) const final {
|
|
inner_->AppendAsTraceFormat(out);
|
|
}
|
|
|
|
private:
|
|
std::unique_ptr<v8::ConvertableToTraceFormat> inner_;
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
// Allow std::unique_ptr<v8::ConvertableToTraceFormat> to be a valid
|
|
// initialization value for trace macros.
|
|
template <>
|
|
struct base::trace_event::TraceValue::Helper<
|
|
std::unique_ptr<v8::ConvertableToTraceFormat>> {
|
|
static constexpr unsigned char kType = TRACE_VALUE_TYPE_CONVERTABLE;
|
|
static inline void SetValue(
|
|
TraceValue* v,
|
|
std::unique_ptr<v8::ConvertableToTraceFormat> value) {
|
|
// NOTE: |as_convertable| is an owning pointer, so using new here
|
|
// is acceptable.
|
|
v->as_convertable =
|
|
new gin::ConvertableToTraceFormatWrapper(std::move(value));
|
|
}
|
|
};
|
|
|
|
namespace electron {
|
|
|
|
class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
|
|
public:
|
|
enum InitializationPolicy { kZeroInitialize, kDontInitialize };
|
|
|
|
ArrayBufferAllocator() {
|
|
// Ref.
|
|
// https://source.chromium.org/chromium/chromium/src/+/master:third_party/blink/renderer/platform/wtf/allocator/partitions.cc;l=94;drc=062c315a858a87f834e16a144c2c8e9591af2beb
|
|
allocator_->init({base::PartitionOptions::AlignedAlloc::kDisallowed,
|
|
base::PartitionOptions::ThreadCache::kDisabled,
|
|
base::PartitionOptions::Quarantine::kAllowed,
|
|
base::PartitionOptions::Cookie::kAllowed,
|
|
base::PartitionOptions::BackupRefPtr::kDisabled,
|
|
base::PartitionOptions::UseConfigurablePool::kNo});
|
|
}
|
|
|
|
// Allocate() methods return null to signal allocation failure to V8, which
|
|
// should respond by throwing a RangeError, per
|
|
// http://www.ecma-international.org/ecma-262/6.0/#sec-createbytedatablock.
|
|
void* Allocate(size_t size) override {
|
|
void* result = AllocateMemoryOrNull(size, kZeroInitialize);
|
|
return result;
|
|
}
|
|
|
|
void* AllocateUninitialized(size_t size) override {
|
|
void* result = AllocateMemoryOrNull(size, kDontInitialize);
|
|
return result;
|
|
}
|
|
|
|
void Free(void* data, size_t size) override {
|
|
allocator_->root()->Free(data);
|
|
}
|
|
|
|
private:
|
|
static void* AllocateMemoryOrNull(size_t size, InitializationPolicy policy) {
|
|
return AllocateMemoryWithFlags(size, policy,
|
|
base::PartitionAllocReturnNull);
|
|
}
|
|
|
|
static void* AllocateMemoryWithFlags(size_t size,
|
|
InitializationPolicy policy,
|
|
int flags) {
|
|
// The array buffer contents are sometimes expected to be 16-byte aligned in
|
|
// order to get the best optimization of SSE, especially in case of audio
|
|
// and video buffers. Hence, align the given size up to 16-byte boundary.
|
|
// Technically speaking, 16-byte aligned size doesn't mean 16-byte aligned
|
|
// address, but this heuristics works with the current implementation of
|
|
// PartitionAlloc (and PartitionAlloc doesn't support a better way for now).
|
|
if (base::kAlignment <
|
|
16) { // base::kAlignment is a compile-time constant.
|
|
size_t aligned_size = base::bits::AlignUp(size, 16);
|
|
if (size == 0) {
|
|
aligned_size = 16;
|
|
}
|
|
if (aligned_size >= size) { // Only when no overflow
|
|
size = aligned_size;
|
|
}
|
|
}
|
|
|
|
if (policy == kZeroInitialize) {
|
|
flags |= base::PartitionAllocZeroFill;
|
|
}
|
|
void* data = allocator_->root()->AllocFlags(flags, size, "Electron");
|
|
if (base::kAlignment < 16) {
|
|
char* ptr = reinterpret_cast<char*>(data);
|
|
DCHECK_EQ(base::bits::AlignUp(ptr, 16), ptr)
|
|
<< "Pointer " << ptr << " not 16B aligned for size " << size;
|
|
}
|
|
return data;
|
|
}
|
|
|
|
static base::NoDestructor<base::PartitionAllocator> allocator_;
|
|
};
|
|
|
|
base::NoDestructor<base::PartitionAllocator> ArrayBufferAllocator::allocator_{};
|
|
|
|
JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop)
|
|
: isolate_(Initialize(event_loop)),
|
|
isolate_holder_(base::ThreadTaskRunnerHandle::Get(),
|
|
gin::IsolateHolder::kSingleThread,
|
|
gin::IsolateHolder::kAllowAtomicsWait,
|
|
gin::IsolateHolder::IsolateType::kUtility,
|
|
gin::IsolateHolder::IsolateCreationMode::kNormal,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
isolate_),
|
|
locker_(isolate_) {
|
|
isolate_->Enter();
|
|
v8::HandleScope scope(isolate_);
|
|
auto context = node::NewContext(isolate_);
|
|
context_ = v8::Global<v8::Context>(isolate_, context);
|
|
context->Enter();
|
|
}
|
|
|
|
JavascriptEnvironment::~JavascriptEnvironment() {
|
|
DCHECK_NE(platform_, nullptr);
|
|
platform_->DrainTasks(isolate_);
|
|
|
|
{
|
|
v8::Locker locker(isolate_);
|
|
v8::HandleScope scope(isolate_);
|
|
context_.Get(isolate_)->Exit();
|
|
}
|
|
isolate_->Exit();
|
|
g_isolate = nullptr;
|
|
|
|
platform_->UnregisterIsolate(isolate_);
|
|
}
|
|
|
|
class EnabledStateObserverImpl final
|
|
: public base::trace_event::TraceLog::EnabledStateObserver {
|
|
public:
|
|
EnabledStateObserverImpl() {
|
|
base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(this);
|
|
}
|
|
|
|
~EnabledStateObserverImpl() override {
|
|
base::trace_event::TraceLog::GetInstance()->RemoveEnabledStateObserver(
|
|
this);
|
|
}
|
|
|
|
// disable copy
|
|
EnabledStateObserverImpl(const EnabledStateObserverImpl&) = delete;
|
|
EnabledStateObserverImpl& operator=(const EnabledStateObserverImpl&) = delete;
|
|
|
|
void OnTraceLogEnabled() final {
|
|
base::AutoLock lock(mutex_);
|
|
for (auto* o : observers_) {
|
|
o->OnTraceEnabled();
|
|
}
|
|
}
|
|
|
|
void OnTraceLogDisabled() final {
|
|
base::AutoLock lock(mutex_);
|
|
for (auto* o : observers_) {
|
|
o->OnTraceDisabled();
|
|
}
|
|
}
|
|
|
|
void AddObserver(v8::TracingController::TraceStateObserver* observer) {
|
|
{
|
|
base::AutoLock lock(mutex_);
|
|
DCHECK(!observers_.count(observer));
|
|
observers_.insert(observer);
|
|
}
|
|
|
|
// Fire the observer if recording is already in progress.
|
|
if (base::trace_event::TraceLog::GetInstance()->IsEnabled())
|
|
observer->OnTraceEnabled();
|
|
}
|
|
|
|
void RemoveObserver(v8::TracingController::TraceStateObserver* observer) {
|
|
base::AutoLock lock(mutex_);
|
|
DCHECK_EQ(observers_.count(observer), 1lu);
|
|
observers_.erase(observer);
|
|
}
|
|
|
|
private:
|
|
base::Lock mutex_;
|
|
std::unordered_set<v8::TracingController::TraceStateObserver*> observers_;
|
|
};
|
|
|
|
base::LazyInstance<EnabledStateObserverImpl>::Leaky g_trace_state_dispatcher =
|
|
LAZY_INSTANCE_INITIALIZER;
|
|
|
|
class TracingControllerImpl : public node::tracing::TracingController {
|
|
public:
|
|
TracingControllerImpl() = default;
|
|
~TracingControllerImpl() override = default;
|
|
|
|
// disable copy
|
|
TracingControllerImpl(const TracingControllerImpl&) = delete;
|
|
TracingControllerImpl& operator=(const TracingControllerImpl&) = delete;
|
|
|
|
// TracingController implementation.
|
|
const uint8_t* GetCategoryGroupEnabled(const char* name) override {
|
|
return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(name);
|
|
}
|
|
uint64_t AddTraceEvent(
|
|
char phase,
|
|
const uint8_t* category_enabled_flag,
|
|
const char* name,
|
|
const char* scope,
|
|
uint64_t id,
|
|
uint64_t bind_id,
|
|
int32_t num_args,
|
|
const char** arg_names,
|
|
const uint8_t* arg_types,
|
|
const uint64_t* arg_values,
|
|
std::unique_ptr<v8::ConvertableToTraceFormat>* arg_convertables,
|
|
unsigned int flags) override {
|
|
base::trace_event::TraceArguments args(
|
|
num_args, arg_names, arg_types,
|
|
reinterpret_cast<const unsigned long long*>( // NOLINT(runtime/int)
|
|
arg_values),
|
|
arg_convertables);
|
|
DCHECK_LE(num_args, 2);
|
|
base::trace_event::TraceEventHandle handle =
|
|
TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_BIND_ID(
|
|
phase, category_enabled_flag, name, scope, id, bind_id, &args,
|
|
flags);
|
|
uint64_t result;
|
|
memcpy(&result, &handle, sizeof(result));
|
|
return result;
|
|
}
|
|
uint64_t AddTraceEventWithTimestamp(
|
|
char phase,
|
|
const uint8_t* category_enabled_flag,
|
|
const char* name,
|
|
const char* scope,
|
|
uint64_t id,
|
|
uint64_t bind_id,
|
|
int32_t num_args,
|
|
const char** arg_names,
|
|
const uint8_t* arg_types,
|
|
const uint64_t* arg_values,
|
|
std::unique_ptr<v8::ConvertableToTraceFormat>* arg_convertables,
|
|
unsigned int flags,
|
|
int64_t timestampMicroseconds) override {
|
|
base::trace_event::TraceArguments args(
|
|
num_args, arg_names, arg_types,
|
|
reinterpret_cast<const unsigned long long*>( // NOLINT(runtime/int)
|
|
arg_values),
|
|
arg_convertables);
|
|
DCHECK_LE(num_args, 2);
|
|
base::TimeTicks timestamp =
|
|
base::TimeTicks() + base::Microseconds(timestampMicroseconds);
|
|
base::trace_event::TraceEventHandle handle =
|
|
TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(
|
|
phase, category_enabled_flag, name, scope, id, bind_id,
|
|
TRACE_EVENT_API_CURRENT_THREAD_ID, timestamp, &args, flags);
|
|
uint64_t result;
|
|
memcpy(&result, &handle, sizeof(result));
|
|
return result;
|
|
}
|
|
void UpdateTraceEventDuration(const uint8_t* category_enabled_flag,
|
|
const char* name,
|
|
uint64_t handle) override {
|
|
base::trace_event::TraceEventHandle traceEventHandle;
|
|
memcpy(&traceEventHandle, &handle, sizeof(handle));
|
|
TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(category_enabled_flag, name,
|
|
traceEventHandle);
|
|
}
|
|
void AddTraceStateObserver(TraceStateObserver* observer) override {
|
|
g_trace_state_dispatcher.Get().AddObserver(observer);
|
|
}
|
|
void RemoveTraceStateObserver(TraceStateObserver* observer) override {
|
|
g_trace_state_dispatcher.Get().RemoveObserver(observer);
|
|
}
|
|
};
|
|
|
|
v8::Isolate* JavascriptEnvironment::Initialize(uv_loop_t* event_loop) {
|
|
auto* cmd = base::CommandLine::ForCurrentProcess();
|
|
|
|
// --js-flags.
|
|
std::string js_flags =
|
|
cmd->GetSwitchValueASCII(blink::switches::kJavaScriptFlags);
|
|
if (!js_flags.empty())
|
|
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 = new TracingControllerImpl();
|
|
node::tracing::TraceEventHelper::SetAgent(tracing_agent);
|
|
platform_ = node::CreatePlatform(
|
|
base::RecommendedMaxNumberOfThreadsInThreadGroup(3, 8, 0.1, 0),
|
|
tracing_controller, gin::V8Platform::PageAllocator());
|
|
|
|
v8::V8::InitializePlatform(platform_);
|
|
gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode,
|
|
new ArrayBufferAllocator(),
|
|
nullptr /* external_reference_table */,
|
|
js_flags, false /* create_v8_platform */);
|
|
|
|
v8::Isolate* isolate = v8::Isolate::Allocate();
|
|
platform_->RegisterIsolate(isolate, event_loop);
|
|
g_isolate = isolate;
|
|
|
|
return isolate;
|
|
}
|
|
|
|
// static
|
|
v8::Isolate* JavascriptEnvironment::GetIsolate() {
|
|
CHECK(g_isolate);
|
|
return g_isolate;
|
|
}
|
|
|
|
void JavascriptEnvironment::OnMessageLoopCreated() {
|
|
DCHECK(!microtasks_runner_);
|
|
microtasks_runner_ = std::make_unique<MicrotasksRunner>(isolate());
|
|
base::CurrentThread::Get()->AddTaskObserver(microtasks_runner_.get());
|
|
}
|
|
|
|
void JavascriptEnvironment::OnMessageLoopDestroying() {
|
|
DCHECK(microtasks_runner_);
|
|
{
|
|
v8::Locker locker(isolate_);
|
|
v8::HandleScope scope(isolate_);
|
|
gin_helper::CleanedUpAtExit::DoCleanup();
|
|
}
|
|
base::CurrentThread::Get()->RemoveTaskObserver(microtasks_runner_.get());
|
|
}
|
|
|
|
NodeEnvironment::NodeEnvironment(node::Environment* env) : env_(env) {}
|
|
|
|
NodeEnvironment::~NodeEnvironment() {
|
|
auto* isolate_data = env_->isolate_data();
|
|
node::FreeEnvironment(env_);
|
|
node::FreeIsolateData(isolate_data);
|
|
}
|
|
|
|
} // namespace electron
|