a006cf681b
* chore: bump chromium in DEPS to 91.0.4435.3 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 * chore: update patches * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 * chore: update patches * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 * chore: remove deleted file from chromium_src list * chore: fix lint * update patches * chore: bump chromium in DEPS to 91.0.4438.0 * chore: bump chromium in DEPS to 91.0.4439.0 * chore: bump chromium in DEPS to 91.0.4440.0 * chore: bump chromium in DEPS to 91.0.4441.0 * chore: bump chromium in DEPS to 91.0.4442.0 * chore: bump chromium in DEPS to 91.0.4443.0 * chore: bump chromium in DEPS to 91.0.4445.0 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: update patches * fixup gn check * Merge branch 'master' into roller/chromium/master * update to xcode 12.4.0 Needed because of8008deb41c
* 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 * chore: bump chromium in DEPS to 91.0.4448.0 * Update patches * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * only include mac notifications on mac * add additional skipping of atk toolchain check * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 * Fixup 2721718: Move HostID to extensions::mojom::HostID * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() * update node headers * chore: bump chromium in DEPS to 91.0.4449.0 * Revert "chore: bump chromium in DEPS to 91.0.4449.0" This reverts commitbccafa0289
. * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build * fix StrCat issue * incantations for WebContentsPreferences::GetPreloadPath wide strings * bump nan * fix GetAsString maybe? * windows build fixes * more windows build fix * SetAppUserModelID -> wstring * upgrade nan dep in tests * lint * wstrings are cross-platform * linter * only bind setAppUserModelId on windows * fix a messed up merge * well that was an odyssey * backport fcdf35e from v8 to fix nan crash * disable typedarrays-test.js * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 * use PartitionAllocator for ArrayBuffers in the main process * fix patches * chore: omit some unnecessary conversions * refactor: make LoginItemSettings::path a wstring * refactor: make ShowTaskDialog take a wstr * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b
. Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
369 lines
12 KiB
C++
369 lines
12 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_allocator/partition_alloc.h"
|
|
#include "base/command_line.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 "content/public/common/content_switches.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 "tracing/trace_event.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;
|
|
void AppendAsTraceFormat(std::string* out) const final {
|
|
inner_->AppendAsTraceFormat(out);
|
|
}
|
|
|
|
private:
|
|
std::unique_ptr<v8::ConvertableToTraceFormat> inner_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(ConvertableToTraceFormatWrapper);
|
|
};
|
|
|
|
} // 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::Alignment::kRegular,
|
|
base::PartitionOptions::ThreadCache::kDisabled,
|
|
base::PartitionOptions::Quarantine::kAllowed,
|
|
base::PartitionOptions::RefCount::kDisabled});
|
|
}
|
|
|
|
// 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* Realloc(void* data, size_t size) override {
|
|
return allocator_->root()->Realloc(data, size, "Electron");
|
|
}
|
|
|
|
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,
|
|
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() {
|
|
{
|
|
v8::Locker locker(isolate_);
|
|
v8::HandleScope scope(isolate_);
|
|
context_.Get(isolate_)->Exit();
|
|
}
|
|
isolate_->Exit();
|
|
g_isolate = nullptr;
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
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_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(EnabledStateObserverImpl);
|
|
};
|
|
|
|
base::LazyInstance<EnabledStateObserverImpl>::Leaky g_trace_state_dispatcher =
|
|
LAZY_INSTANCE_INITIALIZER;
|
|
|
|
class TracingControllerImpl : public node::tracing::TracingController {
|
|
public:
|
|
TracingControllerImpl() = default;
|
|
~TracingControllerImpl() override = default;
|
|
|
|
// 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::TimeDelta::FromMicroseconds(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);
|
|
}
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(TracingControllerImpl);
|
|
};
|
|
|
|
v8::Isolate* JavascriptEnvironment::Initialize(uv_loop_t* event_loop) {
|
|
auto* cmd = base::CommandLine::ForCurrentProcess();
|
|
|
|
// --js-flags.
|
|
std::string js_flags = cmd->GetSwitchValueASCII(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 */, 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() {
|
|
node::FreeEnvironment(env_);
|
|
}
|
|
|
|
} // namespace electron
|