mirror of
https://github.com/electron/electron.git
synced 2026-01-10 07:58:08 -05:00
* chore: bump chromium in DEPS to 97.0.4678.0
* chore: bump chromium in DEPS to 97.0.4679.0
* chore: bump chromium in DEPS to 97.0.4680.0
* chore: bump chromium in DEPS to 97.0.4681.0
* chore: bump chromium in DEPS to 97.0.4682.0
* chore: update patches
* 3234737: Disable -Wunused-but-set-variable
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3234737
* 3216953: Reland "Move task-related files from base/ to base/task/"
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3216953
* 3202710: TimeDelta factory function migration.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3202710
* 3226841: Rename WCO::RenderProcessGone to PrimaryMainFrameRenderProcessGone
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3226841
* 3212165: blink/gin: changes blink to load snapshot based on runtime information
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3212165
* 3220292: Deprecate returning a GURL from GURL::GetOrigin()
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3220292
* 3231995: build: Enable -Wbitwise-instead-of-logical everywhere except iOS and Windows
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3231995
* 3205121: Remove base::DictionaryValue::GetDouble
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3205121
* 3208413: [flags] Make --js-flags settings have priority over V8 features
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3208413
* chore: bump chromium in DEPS to 97.0.4683.0
* chore: update patches
* 3188834: Combine RWHVBase GetCurrentDeviceScaleFactor/GetDeviceScaleFactor
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3188834
* chore: update process_singleton patches
* chore: bump chromium in DEPS to 97.0.4684.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4685.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4686.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4687.0
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4688.0
* chore: update patches
* 3247722: Use correct source_site_instance if navigating via context menu
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3247722
Update signature of HandleContextMenu()
* 3247722: Use correct source_site_instance if navigating via context menu
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3247722
Update signature of HandleContextMenu()
* 3223422: Remove PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE enum option
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3223422
sync pepper_plugin_support.patch with upstream
* chore: bump chromium in DEPS to 97.0.4689.0
* 3247791: ax_mac_merge: Merge AX Math attribute implementations
Xref: ax_mac_merge: Merge AX Math attribute implementations
chore: fix minor patch shear in #includes
* 3243425: Add VisibleTimeRequestTrigger helper class
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3243425
chore: fix minor patch shear in #includes
* chore: regen chromium patches
* fixup! 3247722: Use correct source_site_instance if navigating via context menu
* chore: bump chromium in DEPS to 97.0.4690.0
* 3188659: Window Placement: make GetScreenInfo(s) const
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3188659
simple sync GetScreenInfo with upstream refactor
* chore: update patches
* chore: bump chromium in DEPS to 97.0.4690.4
* chore: bump chromium in DEPS to 97.0.4692.0
* 3198073: ozone: //content: clean up from USE_X11
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3198073
Fixing patch shear. Nothing to see here.
* 3252338: Remove label images checkbox from chrome://accessibility page
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3252338
Part of our a11y patch is no longer needed due to upstream label removal
* 3258183: Remove DISALLOW_IMPLICIT_CONSTRUCTORS() definition
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3258183
Replace our use of the macro with explicitly-deleted class methods.
See https://chromium-review.googlesource.com/c/chromium/src/+/3256952
for upstream examples of this same replacement.
* chore: update patches
* 3247295: Unwind SecurityStyleExplanations
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3247295
update GetSecurityStyle() signature and impl to match upstream changes
* 3259578: media: grabs lock to ensure video output when occluded
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3259578
Add stub for new upstream virtual method OnCapturerCountChanged()
* fixup! 3247295: Unwind SecurityStyleExplanations
* 3238504: Fix up drag image is not shown from bookmark bar
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3238504
SetDragImage() no longer takes a widget argument
* 3217452: [devtools] Add getSyncInformation host binding
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3217452
Add stub for new upstream method GetSyncInformation(). Stub sends info back to caller saying that syncing is disabled.
* chore: bump chromium in DEPS to 98.0.4693.0
* chore: bump chromium in DEPS to 98.0.4694.0
* chore: bump chromium in DEPS to 98.0.4695.0
* chore: bump chromium in DEPS to 98.0.4696.0
* chore: bump chromium in DEPS to 98.0.4697.0
* chore: bump chromium in DEPS to 98.0.4699.0
* chore: bump chromium in DEPS to 98.0.4701.0
* chore: bump chromium in DEPS to 98.0.4703.0
* chore: bump chromium in DEPS to 98.0.4705.0
* chore: bump chromium in DEPS to 98.0.4706.0
* chore: update patches
* 3279210: Rename "base/macros.h" => "base/ignore_result.h"
https://chromium-review.googlesource.com/c/chromium/src/+/3279210
* 3259964: Remove all DISALLOW_COPY_AND_ASSIGNs
https://chromium-review.googlesource.com/c/chromium/src/+/3259964
* 3269029: blink/gin: sets histogram callbacks during isolate creation
https://chromium-review.googlesource.com/c/chromium/src/+/3269029
* fixup after rebase
* [content] Make ContentMainParams and MainFunctionParams move-only
https://chromium-review.googlesource.com/c/chromium/src/+/3244976
* 3255305: Stop sending the securityStateChanged event and unwind
https://chromium-review.googlesource.com/c/chromium/src/+/3255305
* [Blink] Add promise support to WebLocalFrame::RequestExecuteScript()
https://chromium-review.googlesource.com/c/chromium/src/+/3230010
* 3256162: Simplify RWHV Show and ShowWithVisibility handling
https://chromium-review.googlesource.com/c/chromium/src/+/3256162
* 3263824: ozone: //ui/base: clean up from USE_X11 1/*
https://chromium-review.googlesource.com/c/chromium/src/+/3263824
* Request or cancel RecordContentToPresentationTimeRequest during capture
https://chromium-review.googlesource.com/c/chromium/src/+/3256802
* appcache: remove BrowsingData/quota references
https://chromium-review.googlesource.com/c/chromium/src/+/3255725
* [Autofill] Don't show Autofill dropdown if overlaps with permissions
https://chromium-review.googlesource.com/c/chromium/src/+/3236729
* Rename to_different_document to should_show_loading_ui in LoadingStateChanged() callbacks
https://chromium-review.googlesource.com/c/chromium/src/+/3268574
* cleanup patch
* fixup [content] Make ContentMainParams and MainFunctionParams move-only
* 3279210: Rename "base/macros.h" => "base/ignore_result.h"
https://chromium-review.googlesource.com/c/chromium/src/+/3279210
* ozone: //chrome/browser clean up from USE_X11
https://chromium-review.googlesource.com/c/chromium/src/+/3186490
Refs: https://github.com/electron/electron/issues/31382
* chore: update support_mixed_sandbox_with_zygote.patch
* Enable -Wunused-but-set-variable.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/3234737
* fixup! ozone: //ui/base: clean up from USE_X11 1/*
* fixup! ozone: //chrome/browser clean up from USE_X11
* chore: fix deprecation warning in libuv
* chore: fixup for lint
* 3251161: Reland "Make the Clang update.py script require Python 3"
https://chromium-review.googlesource.com/c/chromium/src/+/3251161
* fixup: Enable -Wunused-but-set-variable.
* [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA
https://chromium-review.googlesource.com/c/chromium/src/+/3262369
* Replace sandbox::policy::SandboxType with mojom Sandbox enum
https://chromium-review.googlesource.com/c/chromium/src/+/3213677
* fixup: [content] Make ContentMainParams and MainFunctionParams move-only
* build: ensure angle has a full git checkout available to it
* fixup: [base][win] Rename DIR_APP_DATA to DIR_ROAMING_APP_DATA
* fixup lint
* [unseasoned-pdf] Dispatch 'afterprint' event in PDF plugin frame
https://chromium-review.googlesource.com/c/chromium/src/+/3223434
* fixup: [Autofill] Don't show Autofill dropdown if overlaps with permissions
* 3217591: Move browser UI CSS color parsing to own file part 2/2
https://chromium-review.googlesource.com/c/chromium/src/+/3217591
* Make kNoSandboxAndElevatedPrivileges only available to utilities
https://chromium-review.googlesource.com/c/chromium/src/+/3276784
* 3211575: [modules] Change ScriptOrModule to custom Struct
https://chromium-review.googlesource.com/c/v8/v8/+/3211575
* Address review feedback
* chore: update patches
* 3211575: [modules] Change ScriptOrModule to custom Struct
https://chromium-review.googlesource.com/c/v8/v8/+/3211575
* fix: unused variable compat
* chore: remove redundant patch
* fixup for 3262517: Re-enable WindowCaptureMacV2
https://chromium-review.googlesource.com/c/chromium/src/+/3262517
* chore: cleanup todo
The functions added in https://chromium-review.googlesource.com/c/chromium/src/+/3256802 are not used by offscreen rendering.
* fixup: update mas_no_private_api.patch
* 3216879: [PA] Make features::kPartitionAllocLazyCommit to be PartitionOptions::LazyCommit
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3216879 Fixes up commit b2f1aca956
* chore: cleanup support_mixed_sandbox_with_zygote.patch
* test: use window focus event instead of delay to wait for webContents focus
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
306 lines
9.7 KiB
C++
306 lines
9.7 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
||
// Use of this source code is governed by the MIT license that can be
|
||
// found in the LICENSE file.
|
||
|
||
#include "shell/app/node_main.h"
|
||
|
||
#include <map>
|
||
#include <memory>
|
||
#include <string>
|
||
#include <unordered_set>
|
||
#include <utility>
|
||
#include <vector>
|
||
|
||
#include "base/base_switches.h"
|
||
#include "base/command_line.h"
|
||
#include "base/feature_list.h"
|
||
#include "base/strings/string_util.h"
|
||
#include "base/strings/utf_string_conversions.h"
|
||
#include "base/task/thread_pool/thread_pool_instance.h"
|
||
#include "base/threading/thread_task_runner_handle.h"
|
||
#include "content/public/common/content_switches.h"
|
||
#include "electron/electron_version.h"
|
||
#include "gin/array_buffer.h"
|
||
#include "gin/public/isolate_holder.h"
|
||
#include "gin/v8_initializer.h"
|
||
#include "shell/app/uv_task_runner.h"
|
||
#include "shell/browser/javascript_environment.h"
|
||
#include "shell/common/api/electron_bindings.h"
|
||
#include "shell/common/gin_helper/dictionary.h"
|
||
#include "shell/common/node_bindings.h"
|
||
#include "shell/common/node_includes.h"
|
||
|
||
#if defined(OS_LINUX)
|
||
#include "components/crash/core/app/breakpad_linux.h"
|
||
#endif
|
||
|
||
#if defined(OS_WIN)
|
||
#include "chrome/child/v8_crashpad_support_win.h"
|
||
#endif
|
||
|
||
#if !defined(MAS_BUILD)
|
||
#include "components/crash/core/app/crashpad.h" // nogncheck
|
||
#include "shell/app/electron_crash_reporter_client.h"
|
||
#include "shell/browser/api/electron_api_crash_reporter.h"
|
||
#include "shell/common/crash_keys.h"
|
||
#endif
|
||
|
||
namespace {
|
||
|
||
// Initialize Node.js cli options to pass to Node.js
|
||
// See https://nodejs.org/api/cli.html#cli_options
|
||
int SetNodeCliFlags() {
|
||
// Options that are unilaterally disallowed
|
||
const std::unordered_set<base::StringPiece, base::StringPieceHash>
|
||
disallowed = {"--openssl-config", "--use-bundled-ca", "--use-openssl-ca",
|
||
"--force-fips", "--enable-fips"};
|
||
|
||
const auto argv = base::CommandLine::ForCurrentProcess()->argv();
|
||
std::vector<std::string> args;
|
||
|
||
// TODO(codebytere): We need to set the first entry in args to the
|
||
// process name owing to src/node_options-inl.h#L286-L290 but this is
|
||
// redundant and so should be refactored upstream.
|
||
args.reserve(argv.size() + 1);
|
||
args.emplace_back("electron");
|
||
|
||
for (const auto& arg : argv) {
|
||
#if defined(OS_WIN)
|
||
const auto& option = base::WideToUTF8(arg);
|
||
#else
|
||
const auto& option = arg;
|
||
#endif
|
||
const auto stripped = base::StringPiece(option).substr(0, option.find('='));
|
||
if (disallowed.count(stripped) != 0) {
|
||
LOG(ERROR) << "The Node.js cli flag " << stripped
|
||
<< " is not supported in Electron";
|
||
// Node.js returns 9 from ProcessGlobalArgs for any errors encountered
|
||
// when setting up cli flags and env vars. Since we're outlawing these
|
||
// flags (making them errors) return 9 here for consistency.
|
||
return 9;
|
||
} else {
|
||
args.push_back(option);
|
||
}
|
||
}
|
||
|
||
std::vector<std::string> errors;
|
||
|
||
// Node.js itself will output parsing errors to
|
||
// console so we don't need to handle that ourselves
|
||
return ProcessGlobalArgs(&args, nullptr, &errors,
|
||
node::kDisallowedInEnvironment);
|
||
}
|
||
|
||
#if defined(MAS_BUILD)
|
||
void SetCrashKeyStub(const std::string& key, const std::string& value) {}
|
||
void ClearCrashKeyStub(const std::string& key) {}
|
||
#endif
|
||
|
||
} // namespace
|
||
|
||
namespace electron {
|
||
|
||
#if defined(OS_LINUX)
|
||
void CrashReporterStart(gin_helper::Dictionary options) {
|
||
std::string submit_url;
|
||
bool upload_to_server = true;
|
||
bool ignore_system_crash_handler = false;
|
||
bool rate_limit = false;
|
||
bool compress = false;
|
||
std::map<std::string, std::string> global_extra;
|
||
std::map<std::string, std::string> extra;
|
||
options.Get("submitURL", &submit_url);
|
||
options.Get("uploadToServer", &upload_to_server);
|
||
options.Get("ignoreSystemCrashHandler", &ignore_system_crash_handler);
|
||
options.Get("rateLimit", &rate_limit);
|
||
options.Get("compress", &compress);
|
||
options.Get("extra", &extra);
|
||
options.Get("globalExtra", &global_extra);
|
||
|
||
std::string product_name;
|
||
if (options.Get("productName", &product_name))
|
||
global_extra["_productName"] = product_name;
|
||
std::string company_name;
|
||
if (options.Get("companyName", &company_name))
|
||
global_extra["_companyName"] = company_name;
|
||
api::crash_reporter::Start(submit_url, upload_to_server,
|
||
ignore_system_crash_handler, rate_limit, compress,
|
||
global_extra, extra, true);
|
||
}
|
||
#endif
|
||
|
||
v8::Local<v8::Value> GetParameters(v8::Isolate* isolate) {
|
||
std::map<std::string, std::string> keys;
|
||
#if !defined(MAS_BUILD)
|
||
electron::crash_keys::GetCrashKeys(&keys);
|
||
#endif
|
||
return gin::ConvertToV8(isolate, keys);
|
||
}
|
||
|
||
int NodeMain(int argc, char* argv[]) {
|
||
base::CommandLine::Init(argc, argv);
|
||
|
||
#if defined(OS_WIN)
|
||
v8_crashpad_support::SetUp();
|
||
#endif
|
||
|
||
#if !defined(MAS_BUILD)
|
||
ElectronCrashReporterClient::Create();
|
||
#endif
|
||
|
||
#if defined(OS_WIN) || (defined(OS_MAC) && !defined(MAS_BUILD))
|
||
crash_reporter::InitializeCrashpad(false, "node");
|
||
#endif
|
||
|
||
#if !defined(MAS_BUILD)
|
||
crash_keys::SetCrashKeysFromCommandLine(
|
||
*base::CommandLine::ForCurrentProcess());
|
||
crash_keys::SetPlatformCrashKey();
|
||
#endif
|
||
|
||
int exit_code = 1;
|
||
{
|
||
// Feed gin::PerIsolateData with a task runner.
|
||
uv_loop_t* loop = uv_default_loop();
|
||
auto uv_task_runner = base::MakeRefCounted<UvTaskRunner>(loop);
|
||
base::ThreadTaskRunnerHandle handle(uv_task_runner);
|
||
|
||
// Initialize feature list.
|
||
auto feature_list = std::make_unique<base::FeatureList>();
|
||
feature_list->InitializeFromCommandLine("", "");
|
||
base::FeatureList::SetInstance(std::move(feature_list));
|
||
|
||
// Explicitly register electron's builtin modules.
|
||
NodeBindings::RegisterBuiltinModules();
|
||
|
||
// Parse and set Node.js cli flags.
|
||
int flags_exit_code = SetNodeCliFlags();
|
||
if (flags_exit_code != 0)
|
||
exit(flags_exit_code);
|
||
|
||
node::InitializationSettingsFlags flags = node::kRunPlatformInit;
|
||
node::InitializationResult result =
|
||
node::InitializeOncePerProcess(argc, argv, flags);
|
||
|
||
if (result.early_return)
|
||
exit(result.exit_code);
|
||
|
||
gin::V8Initializer::LoadV8Snapshot(
|
||
gin::V8SnapshotFileType::kWithAdditionalContext);
|
||
|
||
// V8 requires a task scheduler.
|
||
base::ThreadPoolInstance::CreateAndStartWithDefaultParams("Electron");
|
||
|
||
// Allow Node.js to track the amount of time the event loop has spent
|
||
// idle in the kernel’s event provider .
|
||
uv_loop_configure(loop, UV_METRICS_IDLE_TIME);
|
||
|
||
// Initialize gin::IsolateHolder.
|
||
JavascriptEnvironment gin_env(loop);
|
||
|
||
v8::Isolate* isolate = gin_env.isolate();
|
||
|
||
v8::Isolate::Scope isolate_scope(isolate);
|
||
v8::Locker locker(isolate);
|
||
node::Environment* env = nullptr;
|
||
node::IsolateData* isolate_data = nullptr;
|
||
{
|
||
v8::HandleScope scope(isolate);
|
||
|
||
isolate_data = node::CreateIsolateData(isolate, loop, gin_env.platform());
|
||
CHECK_NE(nullptr, isolate_data);
|
||
|
||
uint64_t flags = node::EnvironmentFlags::kDefaultFlags |
|
||
node::EnvironmentFlags::kHideConsoleWindows;
|
||
env = node::CreateEnvironment(
|
||
isolate_data, gin_env.context(), result.args, result.exec_args,
|
||
static_cast<node::EnvironmentFlags::Flags>(flags));
|
||
CHECK_NE(nullptr, env);
|
||
|
||
node::IsolateSettings is;
|
||
node::SetIsolateUpForNode(isolate, is);
|
||
|
||
gin_helper::Dictionary process(isolate, env->process_object());
|
||
process.SetMethod("crash", &ElectronBindings::Crash);
|
||
|
||
// Setup process.crashReporter in child node processes
|
||
gin_helper::Dictionary reporter = gin::Dictionary::CreateEmpty(isolate);
|
||
#if defined(OS_LINUX)
|
||
reporter.SetMethod("start", &CrashReporterStart);
|
||
#endif
|
||
|
||
reporter.SetMethod("getParameters", &GetParameters);
|
||
#if defined(MAS_BUILD)
|
||
reporter.SetMethod("addExtraParameter", &SetCrashKeyStub);
|
||
reporter.SetMethod("removeExtraParameter", &ClearCrashKeyStub);
|
||
#else
|
||
reporter.SetMethod("addExtraParameter",
|
||
&electron::crash_keys::SetCrashKey);
|
||
reporter.SetMethod("removeExtraParameter",
|
||
&electron::crash_keys::ClearCrashKey);
|
||
#endif
|
||
|
||
process.Set("crashReporter", reporter);
|
||
|
||
gin_helper::Dictionary versions;
|
||
if (process.Get("versions", &versions)) {
|
||
versions.SetReadOnly(ELECTRON_PROJECT_NAME, ELECTRON_VERSION_STRING);
|
||
}
|
||
}
|
||
|
||
v8::HandleScope scope(isolate);
|
||
node::LoadEnvironment(env, node::StartExecutionCallback{});
|
||
|
||
env->set_trace_sync_io(env->options()->trace_sync_io);
|
||
|
||
{
|
||
v8::SealHandleScope seal(isolate);
|
||
bool more;
|
||
env->performance_state()->Mark(
|
||
node::performance::NODE_PERFORMANCE_MILESTONE_LOOP_START);
|
||
do {
|
||
uv_run(env->event_loop(), UV_RUN_DEFAULT);
|
||
|
||
gin_env.platform()->DrainTasks(isolate);
|
||
|
||
more = uv_loop_alive(env->event_loop());
|
||
if (more && !env->is_stopping())
|
||
continue;
|
||
|
||
if (!uv_loop_alive(env->event_loop())) {
|
||
EmitBeforeExit(env);
|
||
}
|
||
|
||
// Emit `beforeExit` if the loop became alive either after emitting
|
||
// event, or after running some callbacks.
|
||
more = uv_loop_alive(env->event_loop());
|
||
} while (more && !env->is_stopping());
|
||
env->performance_state()->Mark(
|
||
node::performance::NODE_PERFORMANCE_MILESTONE_LOOP_EXIT);
|
||
}
|
||
|
||
env->set_trace_sync_io(false);
|
||
|
||
exit_code = node::EmitExit(env);
|
||
|
||
node::ResetStdio();
|
||
|
||
node::Stop(env);
|
||
node::FreeEnvironment(env);
|
||
node::FreeIsolateData(isolate_data);
|
||
}
|
||
|
||
// According to "src/gin/shell/gin_main.cc":
|
||
//
|
||
// gin::IsolateHolder waits for tasks running in ThreadPool in its
|
||
// destructor and thus must be destroyed before ThreadPool starts skipping
|
||
// CONTINUE_ON_SHUTDOWN tasks.
|
||
base::ThreadPoolInstance::Get()->Shutdown();
|
||
|
||
v8::V8::Dispose();
|
||
|
||
return exit_code;
|
||
}
|
||
|
||
} // namespace electron
|