
* Update to Chromium 68.0.3440.128 and Node 10.10.0
* update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches
* fix SSL_get_tlsext_status_type patch
* pass encryption_modes_supported to CdmInfo
* kNoSandbox moved into service_manager
* bump CHROME_VERSION_STRING
TODO: automatically pull in the real chrome version
* PathService -> base::PathService
* net::X509Certificate::Equals -> net::X509Certificate::EqualsExcludingChain
* use content::ChildProcessTerminationInfo
* GetHandle() -> GetProcess().Handle()
* ScopedNestableTaskAllower doesn't take an argument
* net::HttpAuthCache::ClearEntriesAddedWithin -> ClearAllEntries
* std::unique_ptr<WebContents>
* blink::WebFullscreenOptions
* OnAudioStateChanged doesn't take a WebContents
* content::RESULT_CODE_NORMAL_EXIT -> service_manager::RESULT_CODE_NORMAL_EXIT
* MessageLoopCurrent
* WasResized -> SynchronizeVisualProperties
* SetTimeStamp takes a base::TimeTicks
* ExecuteScriptInIsolatedWorld is single-script only
* DispatchNonPersistentCloseEvent takes a callback now
* expose URLRequestContextGetter::{Add,Remove}Observer
* test: remove no longer existing Chromium test deps
cc_blink_unittests has been removed in
https://chromium-review.googlesource.com/1053765
mojo_common_unittests has been removed in
https://chromium-review.googlesource.com/1028000
* SetFdLimit -> IncreaseFdLimitTo
NOTE: the behaviour of this API has changed slightly, and we should
mention that in the notes.
* MessageLoop::QuitWhenIdleClosure -> RunLoop::QuitCurrentWhenIdleClosureDeprecated
* certificate_transparency moved out of net/
pending a clearer decision about what to do with CT
in the mean time, copy CreateLogVerifiersForKnownLogs from deleted chromium source
* add secure_origin_whitelist to chrome source list
NOTE: is this something we actually want? cc @deepak1556
* DrainBackgroundTasks -> DrainTasks
* use new node options parser
* fix disable_scroll_begin_dcheck.patch
* ViewsDelegate::CreateWebContents went away
see 1031314
* kZygoteProcess moved into service_manager
* test: minor improvements to the Node spec
- reformat some parts
- better failures reporting with `expect`
- skip some tests instead of marking them as passed
* chromium removed *_posix.cc from the source filters
* test: fix :electron_tests compilation
* better crash diagnostics in ffmpeg test
* fix: enable back a DCHECK in viz::ServerSharedBitmapManager
Fixes #14327.
Backports https://chromium-review.googlesource.com/802574.
* chore: update linux sysroots
* chore: remove obsolete "install-sysroot.py" script
* test: fix frame-subscriber test on Mac
* disable OSR for now
* test: make before-input-event test more robust
* test: make run-as-node --inspect test more robust on windows
* roll node to v10.11.0
* avoid duplicate files when building a zip
* disable failing assert in beginFrameSubscription dirty-rectangle test
* experiment with is_cfi = false
* fix: build torque with x64 toolchain
Co-Authored-By: Alexey Kuzmin <github@alexeykuzmin.com>
* test: disable the "app.relaunch" test on Linux
* chore: bump node to get header tar file
* chore: bump node to fix tar.py line endings
119 lines
3.8 KiB
C++
119 lines
3.8 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 "atom/app/node_main.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "atom/app/uv_task_runner.h"
|
|
#include "atom/browser/javascript_environment.h"
|
|
#include "atom/browser/node_debugger.h"
|
|
#include "atom/common/api/atom_bindings.h"
|
|
#include "atom/common/crash_reporter/crash_reporter.h"
|
|
#include "atom/common/native_mate_converters/string16_converter.h"
|
|
#include "atom/common/node_bindings.h"
|
|
#include "base/command_line.h"
|
|
#include "base/feature_list.h"
|
|
#include "base/task_scheduler/task_scheduler.h"
|
|
#include "base/threading/thread_task_runner_handle.h"
|
|
#include "gin/array_buffer.h"
|
|
#include "gin/public/isolate_holder.h"
|
|
#include "gin/v8_initializer.h"
|
|
#include "native_mate/dictionary.h"
|
|
|
|
#include "atom/common/node_includes.h"
|
|
|
|
namespace atom {
|
|
|
|
int NodeMain(int argc, char* argv[]) {
|
|
base::CommandLine::Init(argc, argv);
|
|
|
|
int exit_code = 1;
|
|
{
|
|
// Feed gin::PerIsolateData with a task runner.
|
|
argv = uv_setup_args(argc, argv);
|
|
uv_loop_t* loop = uv_default_loop();
|
|
scoped_refptr<UvTaskRunner> uv_task_runner(new 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));
|
|
|
|
gin::V8Initializer::LoadV8Snapshot(
|
|
gin::V8Initializer::V8SnapshotFileType::kWithAdditionalContext);
|
|
gin::V8Initializer::LoadV8Natives();
|
|
|
|
// V8 requires a task scheduler apparently
|
|
base::TaskScheduler::CreateAndStartWithDefaultParams("Electron");
|
|
|
|
// Initialize gin::IsolateHolder.
|
|
JavascriptEnvironment gin_env;
|
|
|
|
// Explicitly register electron's builtin modules.
|
|
NodeBindings::RegisterBuiltinModules();
|
|
|
|
int exec_argc;
|
|
const char** exec_argv;
|
|
node::Init(&argc, const_cast<const char**>(argv), &exec_argc, &exec_argv);
|
|
|
|
node::Environment* env = node::CreateEnvironment(
|
|
node::CreateIsolateData(gin_env.isolate(), loop, gin_env.platform()),
|
|
gin_env.context(), argc, argv, exec_argc, exec_argv);
|
|
|
|
// Enable support for v8 inspector.
|
|
NodeDebugger node_debugger(env);
|
|
node_debugger.Start();
|
|
|
|
mate::Dictionary process(gin_env.isolate(), env->process_object());
|
|
#if defined(OS_WIN)
|
|
process.SetMethod("log", &AtomBindings::Log);
|
|
#endif
|
|
process.SetMethod("crash", &AtomBindings::Crash);
|
|
|
|
// Setup process.crashReporter.start in child node processes
|
|
auto reporter = mate::Dictionary::CreateEmpty(gin_env.isolate());
|
|
reporter.SetMethod("start", &crash_reporter::CrashReporter::StartInstance);
|
|
process.Set("crashReporter", reporter);
|
|
|
|
node::LoadEnvironment(env);
|
|
|
|
bool more;
|
|
do {
|
|
more = uv_run(env->event_loop(), UV_RUN_ONCE);
|
|
gin_env.platform()->DrainTasks(env->isolate());
|
|
if (more == false) {
|
|
node::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());
|
|
if (uv_run(env->event_loop(), UV_RUN_NOWAIT) != 0)
|
|
more = true;
|
|
}
|
|
} while (more == true);
|
|
|
|
exit_code = node::EmitExit(env);
|
|
node::RunAtExit(env);
|
|
gin_env.platform()->DrainTasks(env->isolate());
|
|
gin_env.platform()->CancelPendingDelayedTasks(env->isolate());
|
|
|
|
node::FreeEnvironment(env);
|
|
}
|
|
|
|
// According to "src/gin/shell/gin_main.cc":
|
|
//
|
|
// gin::IsolateHolder waits for tasks running in TaskScheduler in its
|
|
// destructor and thus must be destroyed before TaskScheduler starts skipping
|
|
// CONTINUE_ON_SHUTDOWN tasks.
|
|
base::TaskScheduler::GetInstance()->Shutdown();
|
|
|
|
v8::V8::Dispose();
|
|
|
|
return exit_code;
|
|
}
|
|
|
|
} // namespace atom
|