mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 5ce64b91b4d6a78c97480059f15ff6469fc0918e * chore: bump chromium in DEPS to e74c73d0000f81b3f40a513176c8d024bba57d28 * chore: bump chromium in DEPS to 501640e650d4657ba63db65fa257e4a899168de7 * chore: bump chromium in DEPS to 00db20e1bc3d77706723a87ada3c1c647a1c37b7 * chore: update patches * refactor: AddNewContents now takes a target_url Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2167732 * chore: SetHostCleanupFinalizationGroupCallback has been removed from V8 * refactor: use WebInputEvent::Namespace types directly Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2160523 * refactor: FollowRedirect takes in cors exempt headers now Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2129787 * refactor: printing::DuplexMode moved to mojo Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2162388 * refactor: use MessagePortDescriptor instead of raw mojo::MessagePipeHandles Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1952124 * chore: update patches * chore: bump chromium in DEPS to f1537676d613f3567cfb43adf577b3847fba4bc3 * chore: update patches * refactor: service_manager::BinderMapWithContext merged into mojo::BinderMap Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2174654 * chore: unused argument removed from ReadAvailableTypes in ui::Clipboard Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2173666 * chore: bump chromium in DEPS to 949888433ab935dd6125c107226a4c9d6da9bf48 * chore: update patches * update patches * chore: update sysroots * chore: bump chromium in DEPS to eaac5b5035fe189b6706e1637122e37134206059 * chore: bump chromium in DEPS to 258b54b903d33dab963adf59016691e6537f8b70 * build: update patches * refactor: cursor.mojom and cursor_types.mojom moved to //ui/base/cursor/mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172874 * chore: DesktopWindowTreeHostLinux becomes DesktopWindowTreeHostPlatform Refs: * refactor: LogErrorEventDescription moved from ui to x11 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2164245 * chore: update patches * chore: bump chromium in DEPS to bd06abcfe807d4461683479237cdd920dafa52ca * chore: bump chromium in DEPS to 1afb0891e56f1e79d204db43ca053a46d0974511 * chore: bump chromium in DEPS to 5cb0f794bf7f155bf8c0a241b94e01c9d90c2744 * chore: bump chromium in DEPS to 37327ba3303234e1a3cd3310ca11a68e81b95123 * update patches * remove ClientSideDetectionService from browser_process Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2175320 * refactor: shuttle cursor changed event to WebContentsObserver Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779 * chore: bump chromium in DEPS to 1d97904bb6936e106df13705208b73e47367c2b9 * avoid IPC crash introduced earlier in the roll Refs:b67334e781 (diff-607f4e8f7c5686aa09af98c783925babR128)* remove WebContentsView::SizeContents Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2188931 * chore: bump chromium in DEPS to 87066d1db0546a9de33952ba964e1e42f76f1dae * update patches * adapt to //content creating NetworkContexts https://chromium-review.googlesource.com/c/chromium/src/+/2195196 * WIP temporarily ignore mojo-ified PrintHostMsg_PrintPreviewFailed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195343 * add checkout_pgo_profiles to DEPS * chore: bump chromium in DEPS to a095318bec1dedf580d676f408eaeefdbd9956b1 * add blink's execution_context to electron_lib deps Refs:b67334e781#, https://chromium-review.googlesource.com/c/chromium/src/+/1952124 * update patches * update patches * refactor: use newly mojo-ified PrintPreviewFailed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195343 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: update patches * chore: remove NOTIFICATION_EXTENSIONS_READY_DEPRECATED Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2199874 * avoid a call to Profile::FromBrowserContext in printing Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195757 * chore: bump chromium in DEPS to 8f5c6a46861a991e12ffd80554b6bd41a11b0b65 * chore: bump chromium in DEPS to ab66134739ff3b6bdb8de53bbc58a97d1b7b5d8a * chore: bump chromium in DEPS to dd08df9f6c8d6198f0a7b931ca9e845e27dae033 * chore: update patches * [printing] Mojofy PrintHostMsg_PrintPreviewCancelled https://chromium-review.googlesource.com/c/chromium/src/+/2198331 * [printing] Mojofy PrintHostMsg_PrintPreviewInvalidPrinterSettings https://chromium-review.googlesource.com/c/chromium/src/+/2200556 * [printing] Mojofy PrintHostMsg_DidPrepareDocumentForPreview https://chromium-review.googlesource.com/c/chromium/src/+/2201496 * fix: inherit base network context params * fix: use message handle api specific to embedders * update patches * chore: update v8 headers * fixup! avoid a call to Profile::FromBrowserContext in printing * chore: bump chromium in DEPS to f198bc3276828d992b6202d75a9da6a8363164ea * chore: update patches * Remove cors_exempt_headers.h https://chromium-review.googlesource.com/c/chromium/src/+/2203759 * Supply speech recognition sandbox from service_sandbox_type.h https://chromium-review.googlesource.com/c/chromium/src/+/2206918 * [content] Remove unused methods from WebContents https://chromium-review.googlesource.com/c/chromium/src/+/2199113 * [XProto] Replace XAtom with x11::Atom https://chromium-review.googlesource.com/c/chromium/src/+/2202789 * chore: bump chromium in DEPS to 5df37fabaaed09f3ea511f4ef49203d8ebee7b68 * [UI] Support secondary labels in dropdown menus https://chromium-review.googlesource.com/c/chromium/src/+/2208976 * chore: update patches * refactor: GetSublabelAt => GetSecondaryLabelAt * Revert "[printing] Mojofy PrintHostMsg_DidPrepareDocumentForPreview" This reverts commit 44ed0892a0c81716229638f17253bbb2cf8f037d. https://chromium-review.googlesource.com/c/chromium/src/+/2208778 * Unnest CanonicalCookie::CookieInclusionStatus https://chromium-review.googlesource.com/c/chromium/src/+/2203171 * update print-to-pdf.html with latest html data https://bugs.chromium.org/p/chromium/issues/detail?id=1085667 * chore: bump chromium in DEPS to 5dfa8d5f706580fe983e138952553cd6af11ee8b * fix crash in x server when setting window icon * chore: update patches * Use a normal return value for WebContentsView::GetContainerBounds. https://chromium-review.googlesource.com/c/chromium/src/+/2212481 * fix build on windows * chore: bump chromium in DEPS to 9d15054f4cba060901e43deecf74002f11f47be3 * chore: update patches * [printing] Mojofy PrintHostMsg_CheckForCancel https://chromium-review.googlesource.com/c/chromium/src/+/2212181 Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
146 lines
5.5 KiB
Diff
146 lines
5.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Attard <samuel.r.attard@gmail.com>
|
|
Date: Mon, 4 May 2020 16:57:05 -0700
|
|
Subject: chore: SetHostCleanupFinalizationGroupCallback has been removed from
|
|
V8
|
|
|
|
diff --git a/src/api/environment.cc b/src/api/environment.cc
|
|
index 68ccef87356755a8a99283d55bf5492831a46ce0..7b370579d365204b2bd40a25e740bbc83726c376 100644
|
|
--- a/src/api/environment.cc
|
|
+++ b/src/api/environment.cc
|
|
@@ -12,7 +12,6 @@ using errors::TryCatchScope;
|
|
using v8::Array;
|
|
using v8::Context;
|
|
using v8::EscapableHandleScope;
|
|
-using v8::FinalizationGroup;
|
|
using v8::Function;
|
|
using v8::HandleScope;
|
|
using v8::Isolate;
|
|
@@ -77,15 +76,6 @@ static MaybeLocal<Value> PrepareStackTraceCallback(Local<Context> context,
|
|
return result;
|
|
}
|
|
|
|
-static void HostCleanupFinalizationGroupCallback(
|
|
- Local<Context> context, Local<FinalizationGroup> group) {
|
|
- Environment* env = Environment::GetCurrent(context);
|
|
- if (env == nullptr) {
|
|
- return;
|
|
- }
|
|
- env->RegisterFinalizationGroupForCleanup(group);
|
|
-}
|
|
-
|
|
void* NodeArrayBufferAllocator::Allocate(size_t size) {
|
|
if (zero_fill_field_ || per_process::cli_options->zero_fill_all_buffers)
|
|
return UncheckedCalloc(size);
|
|
@@ -228,11 +218,6 @@ void SetIsolateMiscHandlers(v8::Isolate* isolate, const IsolateSettings& s) {
|
|
s.promise_reject_callback : task_queue::PromiseRejectCallback;
|
|
isolate->SetPromiseRejectCallback(promise_reject_cb);
|
|
|
|
- auto* host_cleanup_cb = s.host_cleanup_finalization_group_callback ?
|
|
- s.host_cleanup_finalization_group_callback :
|
|
- HostCleanupFinalizationGroupCallback;
|
|
- isolate->SetHostCleanupFinalizationGroupCallback(host_cleanup_cb);
|
|
-
|
|
if (s.flags & DETAILED_SOURCE_POSITIONS_FOR_PROFILING)
|
|
v8::CpuProfiler::UseDetailedSourcePositionsForProfiling(isolate);
|
|
}
|
|
diff --git a/src/env-inl.h b/src/env-inl.h
|
|
index 5248e7062354c1deb90b58a784237e6f01335c22..e2a104c9c4562abeb579fe62c9c46ca34bf03581 100644
|
|
--- a/src/env-inl.h
|
|
+++ b/src/env-inl.h
|
|
@@ -1182,12 +1182,6 @@ void Environment::RemoveCleanupHook(void (*fn)(void*), void* arg) {
|
|
cleanup_hooks_.erase(search);
|
|
}
|
|
|
|
-inline void Environment::RegisterFinalizationGroupForCleanup(
|
|
- v8::Local<v8::FinalizationGroup> group) {
|
|
- cleanup_finalization_groups_.emplace_back(isolate(), group);
|
|
- uv_async_send(&task_queues_async_);
|
|
-}
|
|
-
|
|
size_t CleanupHookCallback::Hash::operator()(
|
|
const CleanupHookCallback& cb) const {
|
|
return std::hash<void*>()(cb.arg_);
|
|
diff --git a/src/env.cc b/src/env.cc
|
|
index 65e4bda890461f691036005252db7e61865d2493..694bfd866a4d7f43046ea97a3e97ea503fffc21b 100644
|
|
--- a/src/env.cc
|
|
+++ b/src/env.cc
|
|
@@ -30,7 +30,6 @@ using v8::ArrayBuffer;
|
|
using v8::Boolean;
|
|
using v8::Context;
|
|
using v8::EmbedderGraph;
|
|
-using v8::FinalizationGroup;
|
|
using v8::Function;
|
|
using v8::FunctionTemplate;
|
|
using v8::HandleScope;
|
|
@@ -473,7 +472,6 @@ void Environment::InitializeLibuv(bool start_profiler_idle_notifier) {
|
|
[](uv_async_t* async) {
|
|
Environment* env = ContainerOf(
|
|
&Environment::task_queues_async_, async);
|
|
- env->CleanupFinalizationGroups();
|
|
env->RunAndClearNativeImmediates();
|
|
});
|
|
uv_unref(reinterpret_cast<uv_handle_t*>(&idle_prepare_handle_));
|
|
@@ -1112,25 +1110,6 @@ void Environment::RunWeakRefCleanup() {
|
|
isolate()->ClearKeptObjects();
|
|
}
|
|
|
|
-void Environment::CleanupFinalizationGroups() {
|
|
- HandleScope handle_scope(isolate());
|
|
- Context::Scope context_scope(context());
|
|
- TryCatchScope try_catch(this);
|
|
-
|
|
- while (!cleanup_finalization_groups_.empty() && can_call_into_js()) {
|
|
- Local<FinalizationGroup> fg =
|
|
- cleanup_finalization_groups_.front().Get(isolate());
|
|
- cleanup_finalization_groups_.pop_front();
|
|
- if (!FinalizationGroup::Cleanup(fg).FromMaybe(false)) {
|
|
- if (try_catch.HasCaught() && !try_catch.HasTerminated())
|
|
- errors::TriggerUncaughtException(isolate(), try_catch);
|
|
- // Re-schedule the execution of the remainder of the queue.
|
|
- uv_async_send(&task_queues_async_);
|
|
- return;
|
|
- }
|
|
- }
|
|
-}
|
|
-
|
|
// Not really any better place than env.cc at this moment.
|
|
void BaseObject::DeleteMe(void* data) {
|
|
BaseObject* self = static_cast<BaseObject*>(data);
|
|
diff --git a/src/env.h b/src/env.h
|
|
index b67f1e4876f42ae37a49bbcb865c049f5a3ac3f5..e269c47ae3814b42fdd2792360c1acb1995e98d2 100644
|
|
--- a/src/env.h
|
|
+++ b/src/env.h
|
|
@@ -1125,9 +1125,7 @@ class Environment : public MemoryRetainer {
|
|
void AtExit(void (*cb)(void* arg), void* arg);
|
|
void RunAtExitCallbacks();
|
|
|
|
- void RegisterFinalizationGroupForCleanup(v8::Local<v8::FinalizationGroup> fg);
|
|
void RunWeakRefCleanup();
|
|
- void CleanupFinalizationGroups();
|
|
|
|
// Strings and private symbols are shared across shared contexts
|
|
// The getters simply proxy to the per-isolate primitive.
|
|
@@ -1350,8 +1348,6 @@ class Environment : public MemoryRetainer {
|
|
uint64_t thread_id_;
|
|
std::unordered_set<worker::Worker*> sub_worker_contexts_;
|
|
|
|
- std::deque<v8::Global<v8::FinalizationGroup>> cleanup_finalization_groups_;
|
|
-
|
|
static void* const kNodeContextTagPtr;
|
|
static int const kNodeContextTag;
|
|
|
|
diff --git a/src/node.h b/src/node.h
|
|
index 709d03145e3d5acdb67502110917e8147c275c60..a279cc7cc6205907eb5f9c3f6237513b2354f6be 100644
|
|
--- a/src/node.h
|
|
+++ b/src/node.h
|
|
@@ -323,8 +323,6 @@ struct IsolateSettings {
|
|
v8::PromiseRejectCallback promise_reject_callback = nullptr;
|
|
v8::AllowWasmCodeGenerationCallback
|
|
allow_wasm_code_generation_callback = nullptr;
|
|
- v8::HostCleanupFinalizationGroupCallback
|
|
- host_cleanup_finalization_group_callback = nullptr;
|
|
};
|
|
|
|
// Overriding IsolateSettings may produce unexpected behavior
|